fixes

flake.lock

@@ -1063,11 +1063,11 @@
     },
     "nixpkgs_13": {
       "locked": {
-        "lastModified": 1756542300,
+        "lastModified": 1756787288,
-        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
+        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
+        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
         "type": "github"
       },
       "original": {

flake.nix

@@ -266,7 +266,7 @@
 
         # Add mjallen-lib to the flake outputs
         overlays = {
-          mjallen-lib = final: prev: {
+          mjallen-lib = _final: _prev: {
             mjallen-lib = (import ./lib { inherit inputs; }).mjallen-lib;
           };
         };

homes/aarch64-linux/matt@macbook-pro-nixos/default.nix

@@ -23,7 +23,7 @@ in
   home.stateVersion = "23.11";
 
   mjallen = {
-    desktop.hyprland = {
+    programs.hyprland = {
       enable = true;
       primaryDisplay = "eDP-1";
 

lib/examples/default.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ ... }:
 {
   # Import all examples
   sops = import ./sops.nix;

lib/examples/file-utils.nix

@@ -10,7 +10,8 @@ let
     scanSystems
     filterNixOSSystems
     filterDarwinSystems
-    scanHomes;
+    scanHomes
+    ;
 in
 {
   # Example of reading a file
@@ -20,7 +21,7 @@ in
   fileExists = pathExists ./example.txt;
 
   # Example of safely importing a file
-  myConfig = safeImport ./my-config.nix {};
+  myConfig = safeImport ./my-config.nix { };
 
   # Example of scanning a directory
   directoryContents = scanDir ./modules;
@@ -51,7 +52,8 @@ in
         inherit system;
         modules = [
           { networking.hostName = hostname; }
-        ] ++ importModulesRecursive ./modules/nixos;
+        ]
+        ++ importModulesRecursive ./modules/nixos;
       };
     }
   ) nixosSystems;

lib/examples/home-sops.nix

@@ -1,6 +1,11 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
-  inherit (lib.mjallen.module) mkModule mkOpt mkBoolOpt;
+  inherit (lib.mjallen.module) mkModule mkOpt;
 in
 mkModule {
   name = "sops";
@@ -8,7 +13,7 @@ mkModule {
   options = {
     defaultSopsFile = mkOpt lib.types.path null "Default sops file.";
 
-    sshKeyPaths = mkOpt (lib.types.listOf lib.types.str) [] "SSH Key paths to use.";
+    sshKeyPaths = mkOpt (lib.types.listOf lib.types.str) [ ] "SSH Key paths to use.";
   };
   config = {
     home.packages = with pkgs; [

lib/examples/sops.nix

@@ -10,7 +10,9 @@ mkModule {
 
     generateAgeKey = mkBoolOpt true "Whether to automatically generate an age key if one doesn't exist.";
 
-    ageKeyPath = mkOpt (lib.types.nullOr lib.types.str) null "Custom path to the age key file. If null, will use the default path.";
+    ageKeyPath =
+      mkOpt (lib.types.nullOr lib.types.str) null
+        "Custom path to the age key file. If null, will use the default path.";
 
     sshKeyPaths = mkOpt (lib.types.listOf lib.types.str) [
       "/etc/ssh/ssh_host_ed25519_key"
@@ -25,9 +27,11 @@ mkModule {
       age = {
         inherit (config.mjallen.sops) generateAgeKey;
 
-        keyFile = if config.mjallen.sops.ageKeyPath != null 
+        keyFile =
-                  then config.mjallen.sops.ageKeyPath
+          if config.mjallen.sops.ageKeyPath != null then
-                  else "${config.users.users.${config.mjallen.user.name}.home}/.config/sops/age/keys.txt";
+            config.mjallen.sops.ageKeyPath
+          else
+            "${config.users.users.${config.mjallen.user.name}.home}/.config/sops/age/keys.txt";
 
         sshKeyPaths = config.mjallen.sops.sshKeyPaths;
       };

lib/examples/system-utils.nix

@@ -5,7 +5,8 @@ let
     mkNixpkgsConfig
     mkHomeConfigs
     mkHomeManagerConfig
-    mkSpecialArgs;
+    mkSpecialArgs
+    ;
 in
 {
   # Example of creating NixOS configurations
@@ -32,7 +33,12 @@ in
 
         # Create home-manager configuration
         homeManagerConfig = mkHomeManagerConfig {
-          inherit extendedLib inputs system matchingHomes;
+          inherit
+            extendedLib
+            inputs
+            system
+            matchingHomes
+            ;
           isNixOS = true;
         };
       in
@@ -55,7 +61,8 @@ in
             {
               nixpkgs = {
                 inherit system;
-              } // mkNixpkgsConfig inputs.self;
+              }
+              // mkNixpkgsConfig inputs.self;
             }
 
             # Import home-manager module
@@ -66,7 +73,8 @@ in
 
             # Import all nixos modules recursively
             ../${system}/${hostname}
-          ] ++ (extendedLib.mjallen.file.importModulesRecursive ../modules/nixos);
+          ]
+          ++ (extendedLib.mjallen.file.importModulesRecursive ../modules/nixos);
         };
       }
     ) nixosSystems;
@@ -79,7 +87,14 @@ in
     in
     inputs.nixpkgs.lib.mapAttrs' (
       name:
-      { system, username, hostname, userAtHost, path, ... }:
+      {
+        system,
+        username,
+        hostname,
+        userAtHost,
+        path,
+        ...
+      }:
       let
         # Create extended lib with mjallen-lib
         extendedLib = mkExtendedLib inputs.self inputs.nixpkgs;
@@ -93,7 +108,12 @@ in
           };
 
           extraSpecialArgs = {
-            inherit inputs hostname username system;
+            inherit
+              inputs
+              hostname
+              username
+              system
+              ;
             inherit (inputs) self;
             lib = extendedLib;
           };
@@ -104,7 +124,8 @@ in
 
             # Import the home configuration
             path
-          ] ++ (extendedLib.mjallen.file.importModulesRecursive ../modules/home);
+          ]
+          ++ (extendedLib.mjallen.file.importModulesRecursive ../modules/home);
         };
       }
     ) allHomes;

lib/system/common.nix

@@ -3,9 +3,13 @@ let
   inherit (inputs.nixpkgs.lib) filterAttrs mapAttrs';
 in
 {
-  mkExtendedLib = flake: nixpkgs: nixpkgs.lib.extend (final: prev: {
+  mkExtendedLib =
-    mjallen = flake.mjallen-lib;
+    flake: nixpkgs:
-  });
+    nixpkgs.lib.extend (
+      _final: _prev: {
+        mjallen = flake.mjallen-lib;
+      }
+    );
 
   mkNixpkgsConfig = flake: {
     overlays = builtins.attrValues flake.overlays;

modules/home/sops/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  namespace,
   ...
 }:
 let

modules/nixos/boot/common/default.nix

@@ -1,35 +1,69 @@
 {
+  config,
   pkgs,
   system,
   lib,
+  namespace,
   ...
 }:
+with lib;
 let
+  inherit (lib.${namespace}) mkOpt mkBoolOpt;
+  cfg = config.${namespace}.boot.common;
   isArm = ("aarch64-linux" == system) || ("aarch64-darwin" == system);
 in
 {
-  boot = {
+  options.${namespace}.boot.common = {
-    kernelParams = [
+    enable = mkBoolOpt true "Enable common boot stuff";
-      "quiet"
-    ];
 
-    binfmt = lib.mkIf isArm {
+    yubikeyEncryption = mkBoolOpt false "Enable Yubikey root encryption";
-      registrations."x86_64-linux" = {
+
-        magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00'';
+    yubikeyGracePeriod = mkOpt types.int 180 "Time to wait for yubikey in seconds";
-        mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+  };
-        openBinary = true;
+
-        interpreter = "${lib.getExe pkgs.box64}";
+  config = mkIf cfg.enable {
-        preserveArgvZero = true;
+    boot = {
-        matchCredentials = true;
+      kernelParams = [
-        fixBinary = false;
+        "quiet"
+      ];
+
+      binfmt = lib.mkIf isArm {
+        registrations."x86_64-linux" = {
+          magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00'';
+          mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+          openBinary = true;
+          interpreter = "${lib.getExe pkgs.box64}";
+          preserveArgvZero = true;
+          matchCredentials = true;
+          fixBinary = false;
+        };
+      };
+
+      supportedFilesystems = [ "bcachefs" ];
+
+      consoleLogLevel = lib.mkForce 3;
+      bootspec.enable = (!isArm);
+
+      initrd = {
+        luks = mkIf cfg.yubikeyEncryption {
+          devices = {
+            "${config.disko.devices.disk.main.content.partitions.root.name}" = {
+              yubikey = {
+                storage = {
+                  device = "/dev/disk/by-label/${config.disko.devices.disk.main.content.partitions.root.name}";
+                  fsType = config.${namespace}.hardware.disko.filesystem;
+                  path = "/";
+                };
+                slot = 2;
+                twoFactor = false;
+                gracePeriod = yubikeyGracePeriod;
+              };
+            };
+          };
+        };
       };
     };
 
-    supportedFilesystems = [ "bcachefs" ];
+    zramSwap.enable = lib.mkDefault true;
-
-    consoleLogLevel = lib.mkForce 3;
-    bootspec.enable = (!isArm);
   };
-
-  zramSwap.enable = lib.mkDefault true;
 }

modules/nixos/boot/systemd-boot/default.nix

@@ -1,4 +1,9 @@
-{ config, lib, namespace, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
 with lib;
 let
   inherit (lib.${namespace}) mkOpt;

modules/nixos/desktop/hyprland/options.nix

@@ -1,4 +1,9 @@
-{ lib, pkgs, namespace, ... }:
+{
+  lib,
+  pkgs,
+  namespace,
+  ...
+}:
 with lib;
 let
   inherit (lib.${namespace}) mkOpt;
@@ -14,9 +19,9 @@ in
     enable = mkEnableOption "enable hyprland desktop environment";
 
     wallpaperSource = mkOpt (types.enum [
-        "bing"
+      "bing"
-        "nasa"
+      "nasa"
-      ]) "bing" "Source for the wallpaper (bing or nasa)";
+    ]) "bing" "Source for the wallpaper (bing or nasa)";
 
     wallpaper = mkOpt types.path "/var/lib/wallpapers/current.jpg" "Path to the wallpaper folder";
 

modules/nixos/desktop/hyprland/wallpapers/default.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, namespace, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  namespace,
+  ...
+}:
 let
   cfg = config.${namespace}.desktop.hyprland;
 

modules/nixos/disko/x86_64-linux/default.nix

@@ -58,6 +58,7 @@ let
 
   # BCacheFS root partition configuration
   bcachefsRoot = {
+    name = "bcachefs-root";
     size = "100%";
     content = {
       type = "bcachefs";

modules/nixos/hardware/raspberry-pi/default.nix

@@ -23,20 +23,18 @@ in
 
   config = lib.mkIf cfg.enable {
     # Common Raspberry Pi packages
-    environment.systemPackages =
+    environment.systemPackages = with pkgs; [
-      with pkgs;
+      i2c-tools
-      [
+      libraspberrypi
-        i2c-tools
+      raspberrypi-eeprom
-        libraspberrypi
+      raspberrypifw
-        raspberrypi-eeprom
+      raspberrypiWirelessFirmware
-        raspberrypifw
+      raspberrypi-armstubs
-        raspberrypiWirelessFirmware
+      erofs-utils
-        raspberrypi-armstubs
+      fex
-        erofs-utils
+      squashfuse
-        fex
+      squashfsTools
-        squashfuse
+    ];
-        squashfsTools
-      ];
 
     # Common Bluetooth configuration
     systemd.services.btattach = {

modules/nixos/impermanence/default.nix

@@ -19,29 +19,33 @@ in
     };
 
     # extraDirectories = mkOpt (types.listOf types.path) [ ] "Extra directory paths to add to impermanence";
-    extraDirectories = mkOpt (types.listOf (types.either types.str (types.submodule {
+    extraDirectories = mkOpt (types.listOf (
-      options = {
+      types.either types.str (
-        directory = mkOption {
+        types.submodule {
-          type = types.str;
+          options = {
-          description = "Directory path";
+            directory = mkOption {
-        };
+              type = types.str;
-        user = mkOption {
+              description = "Directory path";
-          type = types.str;
+            };
-          default = "root";
+            user = mkOption {
-          description = "Directory owner";
+              type = types.str;
-        };
+              default = "root";
-        group = mkOption {
+              description = "Directory owner";
-          type = types.str;
+            };
-          default = "root";
+            group = mkOption {
-          description = "Directory group";
+              type = types.str;
-        };
+              default = "root";
-        mode = mkOption {
+              description = "Directory group";
-          type = types.str;
+            };
-          default = "u=rwx,g=rx,o=";
+            mode = mkOption {
-          description = "Directory permissions";
+              type = types.str;
-        };
+              default = "u=rwx,g=rx,o=";
-      };
+              description = "Directory permissions";
-    }))) [ ] "Extra directory paths to add to impermanence";
+            };
+          };
+        }
+      )
+    )) [ ] "Extra directory paths to add to impermanence";
     extraFiles = mkOpt (types.listOf types.path) [ ] "Extra file paths to add to impermanence";
   };
 
@@ -79,10 +83,12 @@ in
           group = "jallen-nas";
           mode = "u=rwx,g=rx,o=rx";
         }
-      ] ++ cfg.extraDirectories;
+      ]
+      ++ cfg.extraDirectories;
       files = [
         "/etc/machine-id"
-      ] ++ cfg.extraFiles;
+      ]
+      ++ cfg.extraFiles;
     };
 
     security.sudo.extraConfig = ''

modules/nixos/network/default.nix

@@ -21,16 +21,19 @@ let
             autoconnect-priority = profile.priority;
             interface-name = cfg.ipv4.interface;
           };
-          ipv4 = 
+          ipv4 = {
-            {
+            method = cfg.ipv4.method;
-              method = cfg.ipv4.method;
+          }
-            } // (if (cfg.ipv4.method == "auto") then { }
+          // (
-          else
+            if (cfg.ipv4.method == "auto") then
-            {
+              { }
-              address = cfg.ipv4.address;
+            else
-              gateway = cfg.ipv4.gateway;
+              {
-              dns = cfg.ipv4.dns;
+                address = cfg.ipv4.address;
-            });
+                gateway = cfg.ipv4.gateway;
+                dns = cfg.ipv4.dns;
+              }
+          );
           ipv6 = {
             addr-gen-mode = "stable-privacy";
             method = "auto";

modules/nixos/network/options.nix

@@ -53,30 +53,40 @@ in
 
       powersave = mkBoolOpt false "Whether to enable WiFi power saving.";
 
-      profiles = mkOpt (types.attrsOf (
+      profiles =
-          types.submodule {
+        mkOpt
-            options = {
+          (types.attrsOf (
-              ssid = mkOpt types.str "" "SSID of the WiFi network.";
+            types.submodule {
+              options = {
+                ssid = mkOpt types.str "" "SSID of the WiFi network.";
 
-              type = mkOpt types.str "wifi" "type of the network.(wifi/ethernet)";
+                type = mkOpt types.str "wifi" "type of the network.(wifi/ethernet)";
 
-              autoconnect = mkBoolOpt true "autoconnect to this connection";
+                autoconnect = mkBoolOpt true "autoconnect to this connection";
 
-              autoconnect-retries = mkOpt types.int (-1) "The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden)";
+                autoconnect-retries =
+                  mkOpt types.int (-1)
+                    "The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden)";
 
-              priority = mkOpt types.int 0 "connection priority in range -999 to 999. The higher number means higher priority.";
+                priority =
+                  mkOpt types.int 0
+                    "connection priority in range -999 to 999. The higher number means higher priority.";
 
-              psk = mkOpt types.str "$PSK" "PSK environment variable for the WiFi password.";
+                psk = mkOpt types.str "$PSK" "PSK environment variable for the WiFi password.";
 
-              keyMgmt = mkOpt types.str "sae" "Key management type (e.g., sae, wpa-psk).";
+                keyMgmt = mkOpt types.str "sae" "Key management type (e.g., sae, wpa-psk).";
+              };
+            }
+          ))
+          {
+            "Joey's Jungle 6G" = {
+              priority = -900;
+            };
+            "Joey's Jungle 5G" = {
+              priority = -999;
             };
           }
-        ))
+          "network profiles.";
-        {
-          "Joey's Jungle 6G" = { priority = -900; };
-          "Joey's Jungle 5G" = { priority = -999; };
-        }
-        "network profiles.";
     };
 
     hostId = mkOpt types.str "" "Host ID for ZFS and other services.";

modules/nixos/power/default.nix

@@ -1,4 +1,9 @@
-{ config, lib, namespace, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
 with lib;
 let
   inherit (lib.${namespace}) mkOpt;

modules/nixos/security/tpm/default.nix

@@ -1,4 +1,9 @@
-{ config, lib, namespace, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
 with lib;
 let
   # inherit (lib.${namespace}) mkOpt;

modules/nixos/services/samba/default.nix

@@ -1,4 +1,9 @@
-{ lib, config, namespace, ... }:
+{
+  lib,
+  config,
+  namespace,
+  ...
+}:
 with lib;
 let
   cfg = config.${namespace}.samba;

modules/nixos/sops/options.nix

@@ -28,7 +28,10 @@ with lib;
       type = types.listOf types.str;
       default = [ "/etc/ssh/ssh_host_ed25519_key" ];
       description = "List of SSH key paths to use for age decryption.";
-      example = [ "/etc/ssh/ssh_host_ed25519_key" "/etc/ssh/ssh_host_rsa_key" ];
+      example = [
+        "/etc/ssh/ssh_host_ed25519_key"
+        "/etc/ssh/ssh_host_rsa_key"
+      ];
     };
 
     validateSopsFiles = mkOption {

systems/aarch64-linux/macbook-pro-nixos/default.nix

@@ -3,14 +3,6 @@
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
 { pkgs, namespace, ... }:
-let
-  # Displays
-  display = {
-    input = "eDP-1";
-    resolution = "3456x2234";
-    refreshRate = "60.00000";
-  };
-in
 {
   imports = [
     ./boot.nix
@@ -46,39 +38,47 @@ in
         distrobox
       ];
     };
-    programs = {
+
+    desktop = {
       hyprland = {
         enable = true;
-        primaryDisplay = "eDP-1";
+        wallpaperSource = "nasa";
-
-        display1 = {
-          input = "eDP-1";
-          resolution = "3456x2234";
-          refreshRate = "60.00000";
-        };
-
-        wallpaper = [
-          "${display.input}, /run/wallpaper.jpg"
-        ];
-
-        monitor = [
-          "${display.input},${display.resolution}@${display.refreshRate},0x0,1.25,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
-        ];
-
-        workspace = [
-          "name:firefox, monitor:${display.input}, default:false, special, class:(.*firefox.*)"
-          "name:discord, monitor:${display.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
-          "name:steam, monitor:${display.input}, default:false, special, class:(.*[Ss]team.*)"
-        ];
-
-        windowRule = [
-          "size 2160 3356, tag:horizonrdp"
-        ];
       };
+      gnome.enable = false;
     };
+    # programs = {
+    #   hyprland = {
+    #     enable = true;
+    #     primaryDisplay = "eDP-1";
+
+    #     display1 = {
+    #       input = "eDP-1";
+    #       resolution = "3456x2234";
+    #       refreshRate = "60.00000";
+    #     };
+
+    #     wallpaper = [
+    #       "${display.input}, /run/wallpaper.jpg"
+    #     ];
+
+    #     monitor = [
+    #       "${display.input},${display.resolution}@${display.refreshRate},0x0,1.25,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
+    #     ];
+
+    #     workspace = [
+    #       "name:firefox, monitor:${display.input}, default:false, special, class:(.*firefox.*)"
+    #       "name:discord, monitor:${display.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
+    #       "name:steam, monitor:${display.input}, default:false, special, class:(.*[Ss]team.*)"
+    #     ];
+
+    #     windowRule = [
+    #       "size 2160 3356, tag:horizonrdp"
+    #     ];
+    #   };
+    # };
     network = {
       hostName = "macbook-pro-nixos";
-      wifi.enable = false;
+      networkmanager.enable = false;
       iwd = {
         enable = true;
         settings = {
@@ -106,8 +106,9 @@ in
   nixpkgs.config.allowUnsupportedSystem = true;
 
   virtualisation = {
-    containers.enable = true;
+    waydroid.enable = false;
-    podman.enable = true;
+    # - CONFIG_ANDROID_BINDER_IPC is not enabled!
+    # - CONFIG_ANDROID_BINDERFS is not enabled
   };
 
   # List packages installed in system profile. To search, run:

systems/aarch64-linux/macbook-pro-nixos/services.nix

@@ -65,10 +65,14 @@
     };
 
     logind = {
-      lidSwitch = "suspend";
+      settings = {
-      lidSwitchExternalPower = "ignore";
+        Login = {
-      powerKey = "suspend";
+          HandleLidSwitchExternalPower = "ignore";
-      powerKeyLongPress = "poweroff";
+          HandleLidSwitch = "suspend";
+          HandlePowerKeyLongPress = "poweroff";
+          HandlePowerKey = "suspend";
+        };
+      };
     };
 
     # Enable Flatpak

systems/aarch64-linux/pi4/default.nix

@@ -56,7 +56,7 @@
         allowedTCPPorts = [ 53 ];
         allowedUDPPorts = [ 53 ];
       };
-      networkmanger = {
+      networkmanager = {
         profiles = {
           "static-enabcm6e4ei0" = {
             type = "ethernet";

systems/x86_64-linux/steamdeck/default.nix

@@ -29,16 +29,6 @@
     };
     network = {
       hostName = "steamdeck";
-      wifi = {
-        enable = true;
-        powersave = false;
-        profiles = {
-          "Joey's Jungle 5G" = {
-            ssid = "Joey's Jungle 5G";
-            keyMgmt = "sae";
-          };
-        };
-      };
     };
   };
 }