data/user.nix

@@ -1,4 +1,4 @@
 {...}: {
   email = "janis@nirgendwo.xyz";
-  username = "user";
+  username = "alice";
 }

home/default.nix

@@ -31,16 +31,7 @@ in {
     enableZshIntegration = true;
   };
 
-  xdg = {
+  xdg.systemDirs.data = ["${pkgs.nordvpn}/share"];
-    systemDirs.data = ["${pkgs.nordvpn}/share"];
-    portal = {
-      enable = true;
-      extraPortals = with pkgs; [
-        xdg-desktop-portal-wlr
-        xdg-desktop-portal-gtk
-      ];
-    };
-  };
 
   gtk = {
     enable = true;
@@ -119,7 +110,6 @@ in {
       ripgrep
       killall
       x11_ssh_askpass
-      xdg-utils
       vanilla-dmz
       (discord.override {withVencord = true;})
       bitwarden-desktop

home/emacs.nix

@@ -6,8 +6,6 @@ let
     ref = "main";
     rev = "41f5c3340a0232ea1c0e0bb44b0609b2956c3fe9";
   };
-
-emacs = pkgs.emacs-git-pgtk;
 in {
   # TODO: turn this into a FHS or package so these dependencies don't have to be
   # accessible from the global namespace.
@@ -50,9 +48,6 @@ in {
     hunspellDicts.de-de
     hunspellDicts.da-dk
 
-    # jinx from emacsPackages
-    emacsPackages.jinx
-
 # language servers
 		pkgs.unstable.rust-analyzer
 		nixd];
@@ -62,15 +57,32 @@ in {
   #     source = emacs-config;
   #   };
   # };
-  services.emacs = {
-    enable = true;
-    package = emacs;
-  };
   programs.emacs = {
     enable = true;
-    package = emacs;
+    package = pkgs.emacs-git-pgtk;
     extraPackages = (epkgs: with epkgs; [
       jinx
     ]);
+   #   pkgs.nixd
+   #   (treesit-grammars.with-grammars (grammars: with grammars; [
+   #     tree-sitter-bash
+   #     tree-sitter-nix
+   #     tree-sitter-toml
+   #     tree-sitter-elisp
+   #     tree-sitter-rust
+   #     tree-sitter-cpp
+   #     tree-sitter-c
+   #     tree-sitter-zig
+   #     tree-sitter-elisp
+   #     tree-sitter-markdown
+   #   ]))
+   #   (with pkgs; 
+   #     (hunspellWithDicts [
+   #       hunspellDicts.en-gb-ise
+   #       hunspellDicts.en-gb-large
+   #       hunspellDicts.de-de
+   #       hunspellDicts.da-dk
+   #     ]))
+   # ]);
   };
 }

home/syncthing.nix

@@ -1,6 +1,10 @@
-{pkgs, ...}: {
+{pkgs, ...}:
+let
+  user = import ../data/user.nix {};
+in {
   services.syncthing = {
     enable = true;
+    tray.enable = true;
 
     guiAddress = "0.0.0.0:8384";
 

hosts/desktop/default.nix

@@ -1,6 +1,6 @@
 {lib, pkgs, config, modulesPath, ...}: {
   imports = [
-    # ./nvme-raid.nix
+    ./disks.nix
     ../../options.nix
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
@@ -14,119 +14,38 @@
 "HDMI-A-1" = { pos = "1920 0"; };
   };
 
-
-  fileSystems = {
-    "/boot" = {
-      device = "/dev/disk/by-uuid/EF81-FDEB";
-      fsType = "vfat";
-      options =  [ "uid=0" "gid=0" "fmask=0077" "dmask=0077" ];
-    };
-    "/" = {
-      device = "/dev/mapper/crypt0";
-      fsType = "btrfs";
-      options = [ "subvol=@root" "noatime" "compress=zstd" ];
-    };
-    "/mnt/rootfs" = {
-      device = "/dev/mapper/crypt0";
-      fsType = "btrfs";
-      options = [ "noatime" "compress=zstd" ];
-    };
-    "/home" = {
-      device = "/dev/mapper/crypt0";
-      fsType = "btrfs";
-      options = [ "subvol=@home" "noatime" "compress=zstd" ];
-    };
-    "/var/games" = {
-      device = "/dev/mapper/crypt0";
-      fsType = "btrfs";
-      options = [ "subvol=@games" "noatime" "compress=zstd" ];
-    };
-    "/var/code" = {
-      device = "/dev/mapper/crypt0";
-      fsType = "btrfs";
-      options = [ "subvol=@code" "noatime" "compress=zstd" ];
-    };
-    "/var/log" = {
-      device = "/dev/mapper/crypt0";
-      fsType = "btrfs";
-      options = [ "subvol=@log" "noatime" "compress=zstd" ];
-    };
-    "/persist" = {
-      device = "/dev/mapper/crypt0";
-      fsType = "btrfs";
-      options = [ "subvol=@persist" "noatime" "compress=zstd" ];
-    };
-    "/nix" = {
-      device = "/dev/mapper/crypt0";
-      fsType = "btrfs";
-      options = [ "subvol=@nix" "noatime" "compress=zstd" ];
-    };
-    "/var/.snapshots" = {
-      device = "/dev/mapper/crypt0";
-      fsType = "btrfs";
-      options = [ "subvol=@snapshots" "noatime" "compress=zstd" ];
-    };
-    "/swap" = {
-      device = "/dev/mapper/crypt0";
-      fsType = "btrfs";
-      options = [ "subvol=@swap" ];
-    };
-  };
-
-  swapDevices = [
-    {
-      device = "/swap/swapfile";
-    }
-  ];
-
   boot = {
+
     kernelParams = [
       "quiet"
       "splash"
       "boot.shell_on_fail"
       "udev.log_priority=3"
       "rd.systemd.show_status=auto"
-      "mem_sleep_default=deep"
-      "resume_offset=533760"
     ];
 
-    resumeDevice = "/dev/disk/by-uuid/c6442c5b-119b-4eba-82b3-0b9b89aab03f";
 
     kernelModules = [ "kvm-intel" ];
     extraModulePackages = [ ];
 
     consoleLogLevel = 3;
     initrd = {
-      systemd.enable = true;
-      luks = {
-        devices = {
-          "crypt0" = {
-            device = "/dev/disk/by-uuid/7b5d31a2-0cc9-41a4-8ce4-d6b3a4c83f6a";
-            allowDiscards = true;
-          };
-          "crypt1" = {
-            device = "/dev/disk/by-uuid/bf7f6c09-ee13-4cb6-b56c-defd910b8265";
-            allowDiscards = true;
-          };
-        };
-      };
-
       verbose =  false;
+
+      kernelModules = ["amdgpu" ];
       availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
-      # kernelModules = ["amdgpu" ];
     };
 
-    plymouth.enable = true;
+    plymouth = {
-    # plymouth = {
+      enable = true;
-    #   enable = true;
+      theme = "rings";
-    #   theme = "rings";
+      themePackages =  with pkgs; [
-    #   themePackages =  with pkgs; [
+        (adi1090x-plymouth-themes.override {
-    #     (adi1090x-plymouth-themes.override {
+          selected_themes = ["rings"];
-    #       selected_themes = ["rings"];
+        }
-    #     }
+        )
-    #     )
+      ];
-    #   ];
+    };
-    # };
   };
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/desktop/nvme-raid.nix

@@ -1,108 +0,0 @@
-{
-  disko.devices = {
-    disk = {
-      nvme1 = {
-        type = "disk";
-        device = "/dev/nvme1n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            crypt0 = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "crypt1";
-                extraOpenArgs = [
-                  "--allow-discards"
-                ];
-                settings = {crypttabExtraOpts = ["tpm2-device=auto" "token-timeout=10"];};
-              };
-            };
-          };
-        };
-      };
-
-      nvme0 = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              label = "nixboot";
-              name = "ESP";
-              type = "EF00";
-              size = "1G";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-
-            crypt0 = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "crypt0";
-                extraOpenArgs = [
-                  "--allow-discards"
-                ];
-                settings = {crypttabExtraOpts = ["tpm2-device=auto" "token-timeout=10"];};
-                content = {
-                  type = "btrfs";
-                  extraArgs = [
-                    "-L" "nixos" "-f"
-                    "-d single -m raid1"
-                    "/dev/mapper/crypt1"
-                  ];
-		  mountpoint = "/mnt/rootfs";
-                  mountOptions = ["compress=zstd" "noatime"];
-                  subvolumes = {
-                    "@root" = {
-                      mountpoint = "/";
-                      mountOptions = ["subvol=@root" "compress=zstd" "noatime"];
-                    };
-                    "@home" = {
-                      mountpoint = "/home";
-                      mountOptions = ["subvol=@home" "compress=zstd" "noatime"];
-                    };
-                    "@games" = {
-                      mountpoint = "/var/games";
-                      mountOptions = ["subvol=@games" "compress=zstd" "noatime"];
-                    };
-                    "@code" = {
-                      mountpoint = "/var/code";
-                      mountOptions = ["subvol=@code" "compress=zstd" "noatime"];
-                    };
-                    "@nix" = {
-                      mountpoint = "/nix";
-                      mountOptions = ["subvol=@nix" "compress=zstd" "noatime"];
-                    };
-                    "@persist" = {
-                      mountpoint = "/persist";
-                      mountOptions = ["subvol=@persist" "compress=zstd" "noatime"];
-                    };
-                    "@log" = {
-                      mountpoint = "/var/log";
-                      mountOptions = ["subvol=@log" "compress=zstd" "noatime"];
-                    };
-                    "@snapshots" = {
-                      mountpoint = "/var/.snapshots";
-                      mountOptions = ["subvol=@snapshots" "compress=zstd" "noatime"];
-                    };
-                    "@swap" = {
-                      mountpoint = "/swap";
-                      swap.swapfile.size = "64G";
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}

system/default.nix

@@ -22,17 +22,7 @@
     "flakes"
   ];
 
-  system = {
+  system.stateVersion = "25.05";
-    stateVersion = "25.05";
-    activationScripts = {
-      rfkill-unblock = {
-        text = ''
-          rfkill unblock all
-        '';
-        deps = [];
-      };
-      };
-  };
 
   boot = {
     loader = {
@@ -42,7 +32,7 @@
     };
 
     # kernelModules = [];
-    # kernelPackages = pkgs.linuxPackages_zen;
+    kernelPackages = pkgs.linuxPackages_zen;
   };
 
   hardware = {
@@ -151,33 +141,33 @@
       dnsovertls = "true";
     };
 
-    # thermald.enable = true;
+    thermald.enable = true;
-    # tlp = {
+    tlp = {
-    #   enable = true;
+      enable = true;
-    #   settings = {
+      settings = {
-    #     START_CHARGE_THRESH_BAT0 = 50;
+        START_CHARGE_THRESH_BAT0 = 50;
-    #     STOP_CHARGE_THRESH_BAT0 = 85;
+        STOP_CHARGE_THRESH_BAT0 = 85;
-    #   };
+      };
-    # };
+    };
-    # auto-cpufreq = {
+    auto-cpufreq = {
-    #   enable = true;
+      enable = true;
-    #   settings = {
+      settings = {
-    #     battery = {
+        battery = {
-    #       governor = "powersave"; # Set the CPU governor to powersave.
+          governor = "powersave"; # Set the CPU governor to powersave.
-    #       energy_performance_preference = "powersave";
+          energy_performance_preference = "powersave";
-    #       turbo = "never";
+          turbo = "never";
 
-    #       # enable_thresholds = true;
+          # enable_thresholds = true;
-    #       # start_threshold = 50;
+          # start_threshold = 50;
-    #       # stop_threshold = 90;
+          # stop_threshold = 90;
-    #     };
+        };
 
-    #     charger = {
+        charger = {
-    #       governor = "performance"; # Set the CPU governor to performance when charging.
+          governor = "performance"; # Set the CPU governor to performance when charging.
-    #       turbo = "auto";
+          turbo = "auto";
-    #     };
+        };
-    #   };
+      };
-    # };
+    };
 
     pipewire = {
       enable = true;