chore: merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Ahwx 2025-04-17 20:31:59 +02:00
commit 80eb665ffd
4 changed files with 32 additions and 30 deletions

View file

@ -1,4 +1,10 @@
{ inputs, pkgs, config, lib, ... }: {
inputs,
pkgs,
config,
lib,
...
}:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
@ -9,7 +15,7 @@
# Enable fancy boot animations # Enable fancy boot animations
boot.plymouth.enable = true; boot.plymouth.enable = true;
powerManagement = { powerManagement = {
enable = true; enable = true;
# powertop.enable = true; # powertop.enable = true;
@ -17,12 +23,12 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
fwupd # Update firmware for Framework Laptop 13 fwupd # Update firmware for Framework Laptop 13
]; ];
liv = { liv = {
laptop.enable = true; laptop.enable = true;
desktop.enable = true; desktop.enable = false;
creative.enable = true; creative.enable = true;
amdgpu.enable = true; amdgpu.enable = true;
}; };
@ -33,19 +39,23 @@
networking.hostName = "sakura"; networking.hostName = "sakura";
boot = { boot = {
kernelParams = [ "mem_sleep_default=deep" "acpi_osi=\"!Windows 2020\"" ]; kernelParams = [
kernelModules = ["acpi_call"]; "mem_sleep_default=deep"
"acpi_osi=\"!Windows 2020\""
];
kernelModules = [ "acpi_call" ];
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
loader = { loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
systemd-boot.configurationLimit = 10; systemd-boot.configurationLimit = 10;
}; };
extraModulePackages = with config.boot.kernelPackages; extraModulePackages =
with config.boot.kernelPackages;
[ [
acpi_call acpi_call
cpupower cpupower
] ]
++ [pkgs.cpupower-gui]; ++ [ pkgs.cpupower-gui ];
}; };
} }

View file

@ -1,4 +1,7 @@
{ {
# Causes issues for now :p # Causes issues for now :p
# virtualisation.vmware.host.enable = true; virtualisation = {
# vmware.host.enable = true;
waydroid.enable = true;
};
} }

View file

@ -122,7 +122,8 @@
gaps_in = 5; gaps_in = 5;
gaps_out = 10; gaps_out = 10;
border_size = 2; border_size = 2;
"col.active_border" = "rgb(cda5ef) rgb(cda5ef) 45deg"; # "col.active_border" = "rgb(cda5ef) rgb(cda5ef) 45deg";
"col.active_border" = "rgb(ffffff) rgb(ffffff) 45deg";
"col.inactive_border" = "0x00000000"; "col.inactive_border" = "0x00000000";
no_border_on_floating = false; no_border_on_floating = false;
}; };
@ -315,31 +316,20 @@
# windowrule # windowrule
windowrule = [ windowrule = [
"float,imv"
"center,imv"
"size 1200 725,imv"
"float,mpv"
"center,mpv"
"tile,Aseprite"
"size 1200 725,mpv"
"float,title:^(float_kitty)$" "float,title:^(float_kitty)$"
"center,title:^(float_kitty)$" "center,title:^(float_kitty)$"
"size 950 600,title:^(float_kitty)$" "size 950 600,title:^(float_kitty)$"
"float,audacious" "idleinhibit focus,title:(mpv)$"
"workspace 8 silent, audacious" "float,title:^(udiskie)$"
"tile, neovide"
"idleinhibit focus,mpv"
"float,udiskie"
"float,title:^(Transmission)$"
"float,title:^(Volume Control)$" "float,title:^(Volume Control)$"
"float,title:^(Librewolf Sharing Indicator)$" "float,title:^(Librewolf Sharing Indicator)$"
"move 0 0,title:^(Librewolf Sharing Indicator)$" "move 0 0,title:^(Librewolf Sharing Indicator)$"
"size 700 450,title:^(Volume Control)$" "size 700 450,title:^(Volume Control)$"
"move 40 55%,title:^(Volume Control)$" "move 40 55%,title:^(Volume Control)$"
"workspace 10, thunderbird" "workspace 10, title:^(thunderbird)$"
"workspace 8, nheko" "workspace 8, title:^(nheko)$"
"workspace 8, element-desktop" "workspace 8, title:^(element-desktop)$"
"workspace 9, spotify" "workspace 9, title:^(spotify)$"
]; ];
# windowrulev2 # windowrulev2
@ -350,7 +340,6 @@
"pin, title:^(Picture-in-Picture)$" "pin, title:^(Picture-in-Picture)$"
"opacity 1.0 override 1.0 override, title:^(.*imv.*)$" "opacity 1.0 override 1.0 override, title:^(.*imv.*)$"
"opacity 1.0 override 1.0 override, title:^(.*mpv.*)$" "opacity 1.0 override 1.0 override, title:^(.*mpv.*)$"
"opacity 1.0 override 1.0 override, class:(Aseprite)"
"opacity 1.0 override 1.0 override, class:(Unity)" "opacity 1.0 override 1.0 override, class:(Unity)"
"idleinhibit focus, class:^(mpv)$" "idleinhibit focus, class:^(mpv)$"
"idleinhibit fullscreen, class:^(librewolf)$" "idleinhibit fullscreen, class:^(librewolf)$"

View file

@ -77,7 +77,7 @@
# WEATHER # WEATHER
label { label {
monitor = monitor =
text = cmd[update:1000] echo "$(bash /home/${username}/.local/bin/weather.sh)" text = cmd[update:6000000] echo "$(bash /home/${username}/.local/bin/weather.sh)"
color = rgba(255, 255, 255, 1) color = rgba(255, 255, 255, 1)
font_size = 10 font_size = 10
font_family = JetBrains Mono Nerd Font Mono ExtraBold font_family = JetBrains Mono Nerd Font Mono ExtraBold