diff --git a/home/colors.nix b/home/colors.nix index 863a3c2..e6b77de 100644 --- a/home/colors.nix +++ b/home/colors.nix @@ -190,39 +190,37 @@ in package = pkgs.adwaita-icon-theme; size = 24; }; - gtk2.extraConfig = '' style "custom-dark" { - # Background, foreground, and base colors for different states bg[NORMAL] = "#${c.base00}" bg[PRELIGHT] = "#${c.base02}" bg[ACTIVE] = "#${c.base01}" bg[SELECTED] = "#${c.base0D}" - bg[INSENSITIVE] = "#${c.base01}" - + bg[INSENSITIVE] = "#${c.base01}" fg[NORMAL] = "#${c.base05}" fg[PRELIGHT] = "#${c.base06}" fg[ACTIVE] = "#${c.base07}" fg[SELECTED] = "#${c.base07}" fg[INSENSITIVE] = "#${c.base03}" - + base[NORMAL] = "#${c.base01}" base[PRELIGHT] = "#${c.base02}" base[ACTIVE] = "#${c.base0D}" base[SELECTED] = "#${c.base0D}" base[INSENSITIVE] = "#${c.base00}" - + text[NORMAL] = "#${c.base05}" text[PRELIGHT] = "#${c.base06}" text[ACTIVE] = "#${c.base07}" text[SELECTED] = "#${c.base07}" text[INSENSITIVE] = "#${c.base03}" - } - # Apply the style to all widgets - widget_class "*" style "custom-dark" - - gtk-application-prefer-dark-theme="true" - ''; + + } + + widget_class "*" style "custom-dark" + + gtk-application-prefer-dark-theme="true" + ''; gtk3.extraConfig = { gtk-application-prefer-dark-theme = true; @@ -251,7 +249,8 @@ in qt = { enable = true; - platformTheme.name = "gtk"; + #platformTheme.name = "gtk"; + platformTheme.name = "gtk3"; style.name = "gtk2"; }; diff --git a/home/swayidle.nix b/home/swayidle.nix index 017acec..6a44ae8 100644 --- a/home/swayidle.nix +++ b/home/swayidle.nix @@ -24,11 +24,11 @@ ]; events = [ - { - event = "before-sleep"; - #command = "swaylock"; - command = "gtklock"; - } + #{ + # event = "before-sleep"; + # #command = "swaylock"; + # command = "gtklock"; + #} ]; extraArgs = [ "-w" ]; diff --git a/hosts/legolas/configuration.nix b/hosts/legolas/configuration.nix index 0fb1cf3..143f7c8 100644 --- a/hosts/legolas/configuration.nix +++ b/hosts/legolas/configuration.nix @@ -26,6 +26,7 @@ ../../modules/tailscale.nix ../../modules/podman.nix ../../modules/steam.nix + ../../modules/xdg.nix ../../modules/bluetooth.nix ../../modules/powerprofiles.nix ../../modules/develPackages.nix diff --git a/hosts/legolas/hardware-configuration.nix b/hosts/legolas/hardware-configuration.nix index 25f9415..a808437 100644 --- a/hosts/legolas/hardware-configuration.nix +++ b/hosts/legolas/hardware-configuration.nix @@ -43,6 +43,16 @@ }; }; + + services.logind.lidSwitch = "suspend-then-hibernate"; + powerManagement.enable = true; + swapDevices = [ + { + device = "/swapfile"; + size = 98 * 1024; # 32GB in MB + } + ]; + fileSystems."/boot" = { device = "/dev/disk/by-label/NIXBOOT"; fsType = "vfat"; diff --git a/modules/develPackages.nix b/modules/develPackages.nix index 62aa71f..b9d8706 100644 --- a/modules/develPackages.nix +++ b/modules/develPackages.nix @@ -6,6 +6,7 @@ }: { environment.systemPackages = with pkgs; [ + aider-chat-full zip unzip @@ -44,6 +45,7 @@ jupyter python312Full python312Packages.uv + python312Packages.ipykernel #dotnet-sdk_8 #dotnet-sdk_9 diff --git a/modules/gunalx.nix b/modules/gunalx.nix index dbaa1a1..76860d4 100644 --- a/modules/gunalx.nix +++ b/modules/gunalx.nix @@ -14,7 +14,8 @@ "tss" "networking" "podman" - ]; # Enable ‘sudo’ for the user. + "pipewire" + ]; packages = with pkgs; [ ]; }; } diff --git a/modules/sound.nix b/modules/sound.nix index 4b330f7..970116e 100644 --- a/modules/sound.nix +++ b/modules/sound.nix @@ -12,6 +12,9 @@ security.rtkit.enable = lib.mkDefault true; services.pipewire = lib.mkDefault { enable = true; + systemWide = true; + + audio.enable = true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; diff --git a/modules/xdg.nix b/modules/xdg.nix new file mode 100644 index 0000000..8e6e034 --- /dev/null +++ b/modules/xdg.nix @@ -0,0 +1,40 @@ +{ + pkgs, + lib, + config, + ... +}: +{ + + environment.systemPackages = [ + pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-gnome + pkgs.xdg-desktop-portal + ]; + + xdg = { + autostart.enable = true; + menus.enable= true; + icons.enable= true; + sounds.enable= true; + portal = { + enable = true; + xdgOpenUsePortal = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + xdg-desktop-portal-gnome + xdg-launch + xdg-ninja + xdg-utils + ]; + configPackages = with pkgs; [ + gnome-session + niri + ]; + }; + terminal-exec.enable = true; + }; +}