teml

systems/x86_64-linux/desktop/boot.nix

@@ -1,7 +1,5 @@
-{ config, pkgs, namespace, ... }:
+{ config, pkgs, ... }:
 let
-  configLimit = 5;
-  # default = "@saved";
   kernel = pkgs.linuxPackages_cachyos;
   pkgsVersion = pkgs; #.unstable;
 in
@@ -36,14 +34,9 @@ in
       ];
     };
 
-    plymouth = {
-      enable = true;
-    };
-
     kernelPackages = kernel;
 
     kernelParams = [
-      "quiet"
       # needed cause ssd powersaving is broken af I guess
       "nvme_core.default_ps_max_latency_us=0"
       "pcie_aspm=off"
@@ -53,8 +46,6 @@ in
     bootspec.enable = true;
   };
 
-  zramSwap.enable = true;
-
   environment.systemPackages = with pkgsVersion; [
     edk2-uefi-shell
   ];

systems/x86_64-linux/desktop/configuration.nix

@@ -5,7 +5,6 @@
 {
   lib,
   pkgs,
-  inputs,
   ...
 }:
 let

systems/x86_64-linux/desktop/default.nix

@@ -1,33 +1,35 @@
 {     # Snowfall Lib provides a customized `lib` instance with access to your flake's library
     # as well as the libraries available from your flake's inputs.
-    lib,
-    # An instance of `pkgs` with your overlays and packages applied is also available.
-    pkgs,
-    # You also have access to your flake's inputs.
-    inputs,
+    # lib,
+    # # An instance of `pkgs` with your overlays and packages applied is also available.
+    # pkgs,
+    # # You also have access to your flake's inputs.
+    # inputs,
 
     # Additional metadata is provided by Snowfall Lib.
     namespace, # The namespace used for your flake, defaulting to "internal" if not set.
-    system, # The system architecture for this host (eg. `x86_64-linux`).
-    target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
-    format, # A normalized name for the system target (eg. `iso`).
-    virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
-    systems, # An attribute map of your defined hosts.
+    # system, # The system architecture for this host (eg. `x86_64-linux`).
+    # target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
+    # format, # A normalized name for the system target (eg. `iso`).
+    # virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
+    # systems, # An attribute map of your defined hosts.
 
     # All other arguments come from the system system.
     config,
     ...
- }:
- {
+}:
+let
+  passwordFile = config.sops.secrets."desktop/matt_password".path;
+in
+{
   imports = [
     ./boot.nix
     ./configuration.nix
     ./filesystems.nix
     ./hardware-configuration.nix
-    ./networking.nix
+    # ./networking.nix
     ./nix.nix
     ./sops.nix
-    ./users.nix
 
 
     ./specialisations/hyprland
@@ -36,5 +38,11 @@
   ${namespace} = {
     bootloader.lanzaboote.enable = true;
     desktop.gnome.enable = true;
+    network = {
+      hostName = "matt-nixos";
+    };
+    user = {
+      passwordFile = passwordFile;
+    };
   };
 }

systems/x86_64-linux/desktop/sops.nix

@@ -1,6 +1,8 @@
-{ config, ... }:
+{ config, lib, ... }:
 let
   user = "matt";
+  desktopSopsFile = (lib.snowfall.fs.get-file "secrets/desktop-secrets.yaml");
+  commonSopsFile = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
 in
 {
   # Permission modes are in octal representation (same as chmod),
@@ -18,7 +20,7 @@ in
   # Either the group id or group name representation of the secret group
   # It is recommended to get the group name from `config.users.users.<?name>.group` to avoid misconfiguration
   sops = {
-    defaultSopsFile = ../../../secrets/desktop-secrets.yaml;
+    defaultSopsFile = desktopSopsFile;
     age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
     # ------------------------------
@@ -44,34 +46,34 @@ in
         mode = "0600";
       };
       "wifi" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
       };
 
       # ------------------------------
       # SSH keys
       # ------------------------------
       "ssh-keys-public/desktop-nixos" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
         mode = "0644";
         owner = config.users.users."${user}".name;
         group = config.users.users."${user}".group;
         restartUnits = [ "sshd.service" ];
       };
       "ssh-keys-private/desktop-nixos" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
         mode = "0600";
         owner = config.users.users."${user}".name;
         group = config.users.users."${user}".group;
         restartUnits = [ "sshd.service" ];
       };
       "ssh-keys-public/desktop-nixos-root" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
         path = "/root/.ssh/id_ed25519.pub";
         mode = "0600";
         restartUnits = [ "sshd.service" ];
       };
       "ssh-keys-private/desktop-nixos-root" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
         path = "/root/.ssh/id_ed25519";
         mode = "0600";
         restartUnits = [ "sshd.service" ];
@@ -81,37 +83,37 @@ in
       # Secureboot keys
       # ------------------------------
       "secureboot/GUID" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
         path = "/etc/secureboot/GUID";
         mode = "0600";
       };
       "secureboot/keys/db-key" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
         path = "/etc/secureboot/keys/db/db.key";
         mode = "0600";
       };
       "secureboot/keys/db-pem" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
         path = "/etc/secureboot/keys/db/db.pem";
         mode = "0600";
       };
       "secureboot/keys/KEK-key" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
         path = "/etc/secureboot/keys/KEK/KEK.key";
         mode = "0600";
       };
       "secureboot/keys/KEK-pem" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
         path = "/etc/secureboot/keys/KEK/KEK.pem";
         mode = "0600";
       };
       "secureboot/keys/PK-key" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
         path = "/etc/secureboot/keys/PK/PK.key";
         mode = "0600";
       };
       "secureboot/keys/PK-pem" = {
-        sopsFile = ../../../secrets/secrets.yaml;
+        sopsFile = commonSopsFile;
         path = "/etc/secureboot/keys/PK/PK.pem";
         mode = "0600";
       };

systems/x86_64-linux/desktop/specialisations/hyprland/home/default.nix

@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 let
-  theme = import ../../../../../../modules/home/desktop/theme/nord.nix;
+  theme = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix");
   fontName = "JetBrainsMono NFM";
   fontPackage = pkgs.nerd-fonts.jetbrains-mono;
 in

systems/x86_64-linux/desktop/users.nix

@@ -1,26 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ config, namespace, ... }:
 let
-  user = "matt";
   passwordFile = config.sops.secrets."desktop/matt_password".path;
-  pkgsVersion = pkgs; #.unstable;
 in 
 {
-  users.users."${user}" = {
-    isNormalUser = lib.mkDefault true;
-    extraGroups = [
-      "wheel"
-      "keys"
-      "networkmanager"
-      "ratbagd"
-      "input"
-      "scanner"
-      "lp"
-      "video"
-      "i2c"
-    ]; # Enable ‘sudo’ for the user.
-    hashedPasswordFile = passwordFile;
-    shell = pkgsVersion.zsh;
+  ${namespace}.user = {
+    passwordFile = passwordFile;
   };
-
-  users.users.root.shell = pkgsVersion.zsh;
 }