From 54f112a4f9ae2841dfdc61b5682df2440974b159 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 22 Dec 2025 17:21:19 +0100 Subject: [PATCH 1/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/7df150f0d3857cf68dae443813b27acfb201b2d8' (2025-12-16) → 'github:nix-community/home-manager/fdec8815a86db36f42fc9c8cb2931cd8485f5aed' (2025-12-21) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c6f52ebd45e5925c188d1a20119978aa4ffd5ef6' (2025-12-15) → 'github:NixOS/nixpkgs/b3aad468604d3e488d627c0b43984eb60e75e782' (2025-12-20) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0b5b7c5..54c4bcc 100644 --- a/flake.lock +++ b/flake.lock @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1765859973, - "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=", + "lastModified": 1766292113, + "narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=", "owner": "nix-community", "repo": "home-manager", - "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8", + "rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765838191, - "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", + "lastModified": 1766201043, + "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", + "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", "type": "github" }, "original": { From c3100e4cfbc2ca4ad3483f1f2ebdd87b26156146 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 22 Dec 2025 18:48:00 +0100 Subject: [PATCH 2/4] boreal: remove software I no longer use --- hosts/boreal/home.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/hosts/boreal/home.nix b/hosts/boreal/home.nix index f7425b6..b11db21 100644 --- a/hosts/boreal/home.nix +++ b/hosts/boreal/home.nix @@ -21,9 +21,6 @@ (pkgs) # some websites only work there :( chromium - darktable - hugin - enblend-enfuse # dev rustup ; From b8c954350cf074f810ad9aea403ca4d0e324ab53 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 22 Dec 2025 18:48:00 +0100 Subject: [PATCH 3/4] modules: sddm is no longer the config wide default Make room for a GDM option as well (SDDM does not start on my NVIDIA+Wayland config) --- base/gui-programs.nix | 2 -- hosts/boreal/default.nix | 1 + hosts/talos/default.nix | 1 + modules/default.nix | 1 + modules/gdm.nix | 23 +++++++++++++++++++++++ 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 modules/gdm.nix diff --git a/base/gui-programs.nix b/base/gui-programs.nix index a3d86ab..3269b27 100644 --- a/base/gui-programs.nix +++ b/base/gui-programs.nix @@ -18,8 +18,6 @@ in { }; config = mkIf config.my.gui.enable { - my.displayManager.sddm.enable = true; - programs.gnupg.agent = { enable = true; enableSSHSupport = true; diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix index 12b56fa..65a0d30 100644 --- a/hosts/boreal/default.nix +++ b/hosts/boreal/default.nix @@ -111,5 +111,6 @@ programs.waybar.enable = true; programs.foot.enable = true; services.displayManager.sddm.wayland.enable = true; + my.displayManager.gdm.enable = true; services.power-profiles-daemon.enable = true; } diff --git a/hosts/talos/default.nix b/hosts/talos/default.nix index bf11f17..b0d77f8 100644 --- a/hosts/talos/default.nix +++ b/hosts/talos/default.nix @@ -154,6 +154,7 @@ }; # 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 ec72f4c..29a6e45 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,5 +1,6 @@ {...}: { imports = [ + ./gdm.nix ./sddm.nix ./secrets ./wakeonwlan.nix diff --git a/modules/gdm.nix b/modules/gdm.nix new file mode 100644 index 0000000..2bca452 --- /dev/null +++ b/modules/gdm.nix @@ -0,0 +1,23 @@ +{ + 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; + }; + }; +} From f7a71896d2353eef84a08858e98c17ffdd5140dc Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 22 Dec 2025 18:48:00 +0100 Subject: [PATCH 4/4] boreal: cleanup old config Switch to Gnome since SDDM refuses to display anything. --- hosts/boreal/default.nix | 11 ++--------- hosts/boreal/home.nix | 8 ++++---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix index 65a0d30..1a86d9c 100644 --- a/hosts/boreal/default.nix +++ b/hosts/boreal/default.nix @@ -29,8 +29,6 @@ ntfs = true; }; - services.xserver.windowManager.i3.enable = true; - services.btrfs = { autoScrub = { enable = true; @@ -96,7 +94,7 @@ hardware = { bluetooth = { enable = true; - powerOnBoot = false; + powerOnBoot = true; }; nvidia = { open = true; @@ -104,13 +102,8 @@ }; }; - environment.systemPackages = with pkgs; [foot waybar wofi]; - - programs.hyprland.enable = true; - programs.hyprlock.enable = true; - programs.waybar.enable = true; programs.foot.enable = true; - services.displayManager.sddm.wayland.enable = true; my.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; services.power-profiles-daemon.enable = true; } diff --git a/hosts/boreal/home.nix b/hosts/boreal/home.nix index b11db21..7b3e955 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;