diff --git a/base/gui-programs.nix b/base/gui-programs.nix index 3269b27..a3d86ab 100644 --- a/base/gui-programs.nix +++ b/base/gui-programs.nix @@ -18,6 +18,8 @@ in { }; config = mkIf config.my.gui.enable { + my.displayManager.sddm.enable = true; + programs.gnupg.agent = { enable = true; enableSSHSupport = true; diff --git a/flake.lock b/flake.lock index 54c4bcc..0b5b7c5 100644 --- a/flake.lock +++ b/flake.lock @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1766292113, - "narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=", + "lastModified": 1765859973, + "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed", + "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1766201043, - "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "type": "github" }, "original": { diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix index 1a86d9c..12b56fa 100644 --- a/hosts/boreal/default.nix +++ b/hosts/boreal/default.nix @@ -29,6 +29,8 @@ ntfs = true; }; + services.xserver.windowManager.i3.enable = true; + services.btrfs = { autoScrub = { enable = true; @@ -94,7 +96,7 @@ hardware = { bluetooth = { enable = true; - powerOnBoot = true; + powerOnBoot = false; }; nvidia = { open = true; @@ -102,8 +104,12 @@ }; }; + environment.systemPackages = with pkgs; [foot waybar wofi]; + + programs.hyprland.enable = true; + programs.hyprlock.enable = true; + programs.waybar.enable = true; programs.foot.enable = true; - my.displayManager.gdm.enable = true; - services.desktopManager.gnome.enable = true; + services.displayManager.sddm.wayland.enable = true; services.power-profiles-daemon.enable = true; } diff --git a/hosts/boreal/home.nix b/hosts/boreal/home.nix index 7b3e955..f7425b6 100644 --- a/hosts/boreal/home.nix +++ b/hosts/boreal/home.nix @@ -8,10 +8,10 @@ # Keyboard settings & i3 settings my.home.x.enable = true; - #my.home.x.i3.enable = true; - #my.home.x.i3bar.temperature.chip = "k10temp-pci-*"; - #my.home.x.i3bar.temperature.inputs = ["Tccd1"]; - #my.home.x.i3bar.networking.throughput_interfaces = ["enp8s0" "wlp4s0"]; + my.home.x.i3.enable = true; + my.home.x.i3bar.temperature.chip = "k10temp-pci-*"; + my.home.x.i3bar.temperature.inputs = ["Tccd1"]; + my.home.x.i3bar.networking.throughput_interfaces = ["enp8s0" "wlp4s0"]; my.home.emacs.enable = true; my.theme = config.home-manager.users.alarsyo.my.themes.solarizedLight; @@ -21,6 +21,9 @@ (pkgs) # some websites only work there :( chromium + darktable + hugin + enblend-enfuse # dev rustup ; diff --git a/hosts/talos/default.nix b/hosts/talos/default.nix index b0d77f8..bf11f17 100644 --- a/hosts/talos/default.nix +++ b/hosts/talos/default.nix @@ -154,7 +154,6 @@ }; # Enable the KDE Plasma Desktop Environment. - my.displayManager.sddm.enable = true; services.desktopManager.plasma6.enable = true; services.desktopManager.cosmic.enable = true; services.power-profiles-daemon.enable = true; diff --git a/modules/default.nix b/modules/default.nix index 29a6e45..ec72f4c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,6 +1,5 @@ {...}: { imports = [ - ./gdm.nix ./sddm.nix ./secrets ./wakeonwlan.nix diff --git a/modules/gdm.nix b/modules/gdm.nix deleted file mode 100644 index 2bca452..0000000 --- a/modules/gdm.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - inherit - (lib) - mkEnableOption - mkIf - ; - - cfg = config.my.displayManager.gdm; -in { - options.my.displayManager.gdm.enable = mkEnableOption "GDM setup"; - - config = mkIf cfg.enable { - services.displayManager.gdm = { - enable = true; - wayland = true; - }; - }; -}