From 31a90dc1003234ed1f1d1eb14f48a669aded4735 Mon Sep 17 00:00:00 2001 From: Bun Date: Sat, 8 Mar 2025 15:56:41 -0500 Subject: [PATCH 1/3] Only enable XDG folders on desktops --- modules/home/settings/xdg/folders/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/settings/xdg/folders/default.nix b/modules/home/settings/xdg/folders/default.nix index 6a08592..37f3c97 100644 --- a/modules/home/settings/xdg/folders/default.nix +++ b/modules/home/settings/xdg/folders/default.nix @@ -1,7 +1,7 @@ { config, ... }: { xdg.userDirs = { - enable = true; + enable = config.home.desktop.enable; createDirectories = true; desktop = null; music = null; From 1b9fc444bb4c1187b8a093fa6efd777c9b231efd Mon Sep 17 00:00:00 2001 From: Bun Date: Sat, 8 Mar 2025 16:11:12 -0500 Subject: [PATCH 2/3] Update Kitty kernel --- hosts/kitty/boot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/kitty/boot/default.nix b/hosts/kitty/boot/default.nix index 9c9d43a..5117fce 100644 --- a/hosts/kitty/boot/default.nix +++ b/hosts/kitty/boot/default.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { boot = { - kernelPackages = pkgs.linuxPackages_5_10; + kernelPackages = pkgs.linuxPackages_5_15; swraid = { enable = true; mdadmConf = "MAILADDR contact@nixfox.ca"; From fa78231265b6fe4745af2166a48ae5d109cf7a61 Mon Sep 17 00:00:00 2001 From: Bun Date: Sat, 8 Mar 2025 17:34:36 -0500 Subject: [PATCH 3/3] Update Redmond to current standards --- hosts/redmond/boot/default.nix | 2 +- hosts/redmond/disko/default.nix | 25 +++++++++---------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/hosts/redmond/boot/default.nix b/hosts/redmond/boot/default.nix index b23818a..8be768d 100644 --- a/hosts/redmond/boot/default.nix +++ b/hosts/redmond/boot/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { boot = { kernelPackages = pkgs.linuxPackages_latest; diff --git a/hosts/redmond/disko/default.nix b/hosts/redmond/disko/default.nix index b96ab51..dd1a1ff 100644 --- a/hosts/redmond/disko/default.nix +++ b/hosts/redmond/disko/default.nix @@ -62,18 +62,14 @@ mountOptions = [ "compress=zstd" "noatime" ]; }; - # Impermanence - "/persist" = { - mountpoint = "/persist"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/persist/.snapshots" = { }; - - "/${config.sysusers.main}" = { - mountpoint = "/persist/home/${config.sysusers.main}"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/${config.sysusers.main}/.snapshots" = { }; + # Impermanence + "/persist" = { + mountpoint = "/persist"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; + "/persist/.snapshots" = { }; + "/persist/home/${config.sysusers.main}" = { }; + "/persist/home/${config.sysusers.main}/.snapshots" = { }; }; }; }; @@ -90,8 +86,5 @@ }; # Needed for impermanence - fileSystems = { - "/persist".neededForBoot = true; - "/persist/home/${config.sysusers.main}".neededForBoot = true; - }; + fileSystems."/persist".neededForBoot = true; }