Initial vps1 config migration

Flake lock file updates:

• Updated input 'agenix':
    'github:ryantm/agenix/d0d4ad5be611da43da04321f49684ad72d705c7e' (2023-12-22)
  → 'github:ryantm/agenix/457669db4259ff69d1ac1183aaa6000420940c1f' (2023-12-23)
• Updated input 'agenix/darwin':
    'github:lnl7/nix-darwin/87b9d090ad39b25b2400029c64825fc2a8868943' (2023-01-09)
  → 'github:lnl7/nix-darwin/4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d' (2023-11-24)
• Updated input 'agenix/home-manager':
    'github:nix-community/home-manager/32d3e39c491e2f91152c84f8ad8b003420eab0a1' (2023-04-22)
  → 'github:nix-community/home-manager/3bfaacf46133c037bb356193bd2f1765d9dc82c1' (2023-12-20)
• Updated input 'agenix/nixpkgs':
    'github:NixOS/nixpkgs/a08d6979dd7c82c4cef0dcc6ac45ab16051c1169' (2023-03-01)
  → 'github:NixOS/nixpkgs/54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6' (2023-12-19)
• Added input 'agenix/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Updated input 'home-manager':
    'github:nix-community/home-manager/0c2353d5d930c3d93724df6858aef064a31b3c00' (2023-12-20)
  → 'github:nix-community/home-manager/d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224' (2023-12-23)

README.md

@@ -7,7 +7,7 @@ System and user configuration for NixOS-based systems.
 | **Shell:** | zsh |
 | **DE:** | GNOME |
 | **Theme:** | adwaita |
-| **Terminal:** | gnome-console |
+| **Terminal:** | Console |
 
 ## Quick start
 1. Copy SSH keypair and `known_hosts` to `~/.ssh`

flake.lock

@@ -1,13 +1,76 @@
 {
   "nodes": {
+    "agenix": {
+      "inputs": {
+        "darwin": "darwin",
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1703371241,
+        "narHash": "sha256-f7ZcabJ5iAH2IRfVuI55xSPZ9TbegFzvFxoKtIPNEn8=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "457669db4259ff69d1ac1183aaa6000420940c1f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1700795494,
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "deploy-rs": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs_2",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1703087360,
+        "narHash": "sha256-0VUbWBW8VyiDRuimMuLsEO4elGuUw/nc2WDeuO1eN1M=",
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "rev": "b709d63debafce9f5645a5ba550c9e0983b3d1f7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "type": "github"
+      }
+    },
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1686524487,
-        "narHash": "sha256-o53fws/jwhLfxiYfTyYpKSGi61d5LHzGgSCkt3DNGRI=",
+        "lastModified": 1703023593,
+        "narHash": "sha256-M+Cw6vh7xCDmIhyVuEPNmaNVUwpmdFQq8zlsXZTKees=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "83b5b96b0ff5f30543b4e6137e268bcf9933c328",
+        "rev": "bad853333d9021e7012adb9b8fbfe7a7003f26bc",
         "type": "github"
       },
       "original": {
@@ -16,47 +79,216 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
+          "agenix",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1687647567,
-        "narHash": "sha256-Ua90LZYJO7/7KW/KK/AqijhIekd+wxPwbVKXuBYzJeQ=",
+        "lastModified": 1703113217,
+        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6ca1e16eb3016c94b7ac16699e1d4158bd4e39a4",
+        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703367386,
+        "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-23.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1702453208,
+        "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1687729501,
-        "narHash": "sha256-mTLkMePoHUWvTCf3NuKbeYEea/tsikSIKBWwb9OfRr4=",
+        "lastModified": 1703013332,
+        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "35130d4b4f0b8c50ed2aceb909a538c66c91d4a0",
+        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1702272962,
+        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1703068421,
+        "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "type": "indirect"
       }
     },
     "root": {
       "inputs": {
+        "agenix": "agenix",
+        "deploy-rs": "deploy-rs",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "home-manager": "home-manager_2",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs_3",
+        "secrets": "secrets",
+        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
+      }
+    },
+    "secrets": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1702936962,
+        "narHash": "sha256-uIZ2uPE26JKJ58463ejHMiAOpqBwflyN6tCmZ89vaSQ=",
+        "ref": "refs/heads/master",
+        "rev": "c6db5c3ba8bff0e618fc3e31c9680863c5e53800",
+        "revCount": 5,
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "thunderbird-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1701889124,
+        "narHash": "sha256-K+6oh7+J6RDBFkxphY/pzf0B+q5+IY54ZMKZrFSKXlc=",
+        "owner": "rafaelmardojai",
+        "repo": "thunderbird-gnome-theme",
+        "rev": "966e9dd54bd2ce9d36d51cd6af8c3bac7a764a68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "thunderbird-gnome-theme",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -1,79 +1,97 @@
 {
-  description = "NixOS/Darwin system configuration";
+  description = "NixOS system configuration";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.05";
+    nixpkgs.url = "nixpkgs/nixos-23.11";
+    agenix.url = "github:ryantm/agenix";
+    deploy-rs.url = "github:serokell/deploy-rs";
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     firefox-gnome-theme = {
       url = "github:rafaelmardojai/firefox-gnome-theme";
       flake = false;
     };
+    nixos-hardware.url = "github:NixOS/nixos-hardware";
+    secrets = {
+      url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
+      flake = false;
+    };
+    thunderbird-gnome-theme = {
+      url = "github:rafaelmardojai/thunderbird-gnome-theme";
+      flake = false;
+    };
   };
 
-  outputs = inputs @ { self, nixpkgs, home-manager, ... }:
+  outputs = inputs @ { self, nixpkgs, agenix, deploy-rs, home-manager, nixos-hardware, secrets, ... }:
     let
-      inherit (lib) attrValues;
-      inherit (lib.my) mapModules mapModulesRec;
-
-      system = "x86_64-linux";
-
-      mkPkgs = pkgs: extraOverlays:
-        import pkgs {
-          inherit system;
-          config.allowUnfree = true;
-          overlays = extraOverlays ++ (lib.attrValues self.overlays);
+      nixpkgsForSystem = system: inputs.nixpkgs;
+      overlays = [
+        agenix.overlays.default
+        (import ./overlays/gnome.nix)
+      ];
+      commonModules = [
+        agenix.nixosModules.age
+        home-manager.nixosModule
+        ./modules
+      ];
+      nixosSystem = { system, name, extraModules ? [] }:
+        let
+          nixpkgs = nixpkgsForSystem system;
+          lib = (import nixpkgs { inherit overlays system; }).lib;
+        in
+        inputs.nixpkgs.lib.nixosSystem {
+          inherit lib system;
+          specialArgs = { modulesPath = toString (nixpkgs + "/nixos/modules"); inherit inputs; };
+          baseModules = import (nixpkgs + "/nixos/modules/module-list.nix");
+          modules = commonModules ++ [
+            ({ config, ... }:
+              {
+                nixpkgs.pkgs = import nixpkgs {
+                  inherit overlays system;
+                  config.allowUnfree = true;
+                };
+                networking.hostName = name;
+                nix = {
+                  extraOptions = "experimental-features = nix-command flakes";
+                };
+              })
+            ./hosts/${name}
+          ] ++ extraModules;
         };
-      pkgs = mkPkgs nixpkgs [];
-
-      lib = nixpkgs.lib.extend (self: super: {
-        my = import ./lib {
-          inherit pkgs inputs;
-          lib = self;
-        };
-      });
-    in {
-      lib = lib.my;
-
+    in
+    {
       nixosConfigurations = {
-        atlas = nixpkgs.lib.nixosSystem {
-          modules = [
-            inputs.home-manager.nixosModules.home-manager
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
-            (import ./modules)
-            ./hosts/atlas
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
-        eos = nixpkgs.lib.nixosSystem {
-          modules = [
-            inputs.home-manager.nixosModules.home-manager
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
-            (import ./modules)
-            ./hosts/eos
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
-        helios = nixpkgs.lib.nixosSystem {
-          modules = [
-            inputs.home-manager.nixosModules.home-manager
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
-            (import ./modules)
-            ./hosts/helios
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
-        odyssey = nixpkgs.lib.nixosSystem {
-          modules = [
-            inputs.home-manager.nixosModules.home-manager
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
-            (import ./modules)
-            ./hosts/odyssey
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
+        atlas = nixosSystem { system = "x86_64-linux"; name = "atlas"; };
+        eos = nixosSystem { system = "x86_64-linux"; name = "eos"; };
+        helios = nixosSystem { system = "x86_64-linux"; name = "helios"; };
+        odyssey = nixosSystem { system = "x86_64-linux"; name = "odyssey"; };
+        pi = nixosSystem { system = "aarch64-linux"; name = "pi"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
+        vps1 = nixosSystem { system = "x86_64-linux"; name = "vps1"; };
       };
-  };
+
+      deploy.nodes = {
+        pi = {
+          hostname = "10.0.1.191";
+          sshUser = "jordan";
+          user = "root";
+
+          profiles.system = {
+            user = "root";
+            path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pi;
+          };
+        };
+        vps1 = {
+          magicRollback = true;
+          autoRollback = true;
+          hostname = "vps1.mesh.vimium.net";
+          profiles.system = {
+            user = "root";
+            path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.vps1;
+      };
+
+      # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
+    };
 }
+

hosts/atlas/default.nix

@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib.my;
 {
   imports = [
     ./hardware-configuration.nix
@@ -25,7 +24,10 @@ with lib.my;
 
   modules = {
     desktop = {
-      apps.qbittorrent.enable = true;
+      apps = {
+        qbittorrent.enable = true;
+        thunderbird.enable = true;
+      };
       browsers = {
         firefox.enable = true;
       };
@@ -33,6 +35,7 @@ with lib.my;
         raster.enable = true;
         vector.enable = true;
       };
+      office.libreoffice.enable = true;
     };
     dev = {
       node.enable = true;

hosts/atlas/hardware-configuration.nix

@@ -1,70 +1,66 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.initrd.supportedFilesystems = [ "zfs" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.kernelParams = [ "elevator=none" ];
-  boot.extraModulePackages = [ ];
-  boot.supportedFilesystems = [ "zfs" ];
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.kernelModules = [ ];
+    initrd.supportedFilesystems = [ "zfs" ];
+    kernelModules = [ "kvm-intel" ];
+    kernelParams = [ "elevator=none" ];
+    extraModulePackages = [ ];
+    supportedFilesystems = [ "zfs" ];
+  };
 
-  fileSystems."/" =
-    { device = "rpool/system/root";
-      fsType = "zfs";
-    };
+  fileSystems."/" = {
+    device = "rpool/system/root";
+    fsType = "zfs";
+  };
 
-  fileSystems."/home" =
-    { device = "rpool/user/home";
-      fsType = "zfs";
-    };
+  fileSystems."/home" = {
+    device = "rpool/user/home";
+    fsType = "zfs";
+  };
 
-  fileSystems."/nix" =
-    { device = "rpool/local/nix";
-      fsType = "zfs";
-    };
+  fileSystems."/nix" = {
+    device = "rpool/local/nix";
+    fsType = "zfs";
+  };
 
-  fileSystems."/tmp" =
-    { device = "rpool/local/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/tmp" = {
+    device = "rpool/local/tmp";
+    fsType = "zfs";
+  };
 
-  fileSystems."/var" =
-    { device = "rpool/system/var";
-      fsType = "zfs";
-    };
+  fileSystems."/var" = {
+    device = "rpool/system/var";
+    fsType = "zfs";
+  };
 
-  fileSystems."/var/log" =
-    { device = "rpool/system/var/log";
-      fsType = "zfs";
-    };
+  fileSystems."/var/log" = {
+    device = "rpool/system/var/log";
+    fsType = "zfs";
+  };
 
-  fileSystems."/var/tmp" =
-    { device = "rpool/system/var/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/var/tmp" = {
+    device = "rpool/system/var/tmp";
+    fsType = "zfs";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/00B2-0384";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/00B2-0384";
+    fsType = "vfat";
+  };
 
   swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/desktop.nix

@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 {
   time.timeZone = "Europe/London";
 
@@ -46,15 +44,33 @@ with lib.my;
     neovim
   ];
 
-  nix.settings = {
-    auto-optimise-store = true;
-    substituters = [
-      "http://odyssey.mesh.vimium.net"
-      "https://cache.nixos.org"
-    ];
-    trusted-public-keys = [
-      "odyssey.mesh.vimium.net:ZhQhjscPWjoN4rlZwoMELznEiBnZ9O26iyGA27ibilQ="
-    ];
+  system.autoUpgrade = {
+    enable = true;
+    flake = "git+ssh://git@git.vimium.com/jordan/nix-config.git";
+    randomizedDelaySec = "10min";
+  };
+
+  nix = {
+    settings = {
+      connect-timeout = 5;
+      log-lines = 25;
+      min-free = 128000000;
+      max-free = 1000000000;
+      fallback = true;
+      auto-optimise-store = true;
+      substituters = [
+        "http://odyssey.mesh.vimium.net"
+        "https://cache.nixos.org"
+      ];
+      trusted-public-keys = [
+        "odyssey.mesh.vimium.net:ZhQhjscPWjoN4rlZwoMELznEiBnZ9O26iyGA27ibilQ="
+      ];
+    };
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "-d --delete-older-than 7d";
+    };
   };
 
   modules.desktop.gnome.enable = true;

hosts/eos/default.nix

@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib.my;
 {
   imports = [
     ./hardware-configuration.nix

hosts/eos/hardware-configuration.nix

@@ -1,71 +1,65 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.initrd.supportedFilesystems = [ "zfs" ];
-  boot.kernelModules = [ ];
-  boot.kernelParams = [ "elevator=none" ];
-  boot.extraModulePackages = [ ];
-  boot.supportedFilesystems = [ "zfs" ];
+  boot = {
+    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
+    initrd.kernelModules = [ ];
+    initrd.supportedFilesystems = [ "zfs" ];
+    kernelModules = [ ];
+    kernelParams = [ "elevator=none" ];
+    extraModulePackages = [ ];
+    supportedFilesystems = [ "zfs" ];
+  };
 
-  fileSystems."/" =
-    { device = "rpool/system/root";
-      fsType = "zfs";
-    };
+  fileSystems."/" = {
+    device = "rpool/system/root";
+    fsType = "zfs";
+  };
 
-  fileSystems."/home" =
-    { device = "rpool/user/home";
-      fsType = "zfs";
-    };
+  fileSystems."/home" = {
+    device = "rpool/user/home";
+    fsType = "zfs";
+  };
 
-  fileSystems."/nix" =
-    { device = "rpool/local/nix";
-      fsType = "zfs";
-    };
+  fileSystems."/nix" = {
+    device = "rpool/local/nix";
+    fsType = "zfs";
+  };
 
-  fileSystems."/tmp" =
-    { device = "rpool/local/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/tmp" = {
+    device = "rpool/local/tmp";
+    fsType = "zfs";
+  };
 
-  fileSystems."/var" =
-    { device = "rpool/system/var";
-      fsType = "zfs";
-    };
+  fileSystems."/var" = {
+    device = "rpool/system/var";
+    fsType = "zfs";
+  };
 
-  fileSystems."/var/log" =
-    { device = "rpool/system/var/log";
-      fsType = "zfs";
-    };
+  fileSystems."/var/log" = {
+    device = "rpool/system/var/log";
+    fsType = "zfs";
+  };
 
-  fileSystems."/var/tmp" =
-    { device = "rpool/system/var/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/var/tmp" = {
+    device = "rpool/system/var/tmp";
+    fsType = "zfs";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/28E6-5509";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/28E6-5509";
+    fsType = "vfat";
+  };
 
   swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/helios/default.nix

@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib.my;
 {
   imports = [
     ./hardware-configuration.nix
@@ -8,7 +7,6 @@ with lib.my;
   ];
 
   boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/sda";
   boot.loader.grub.zfsSupport = true;
 

hosts/helios/hardware-configuration.nix

@@ -1,65 +1,61 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "zfs" ];
-  boot.initrd.kernelModules = [ ];
-  boot.initrd.supportedFilesystems = [ "zfs" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.kernelParams = [ "elevator=none" ];
-  boot.extraModulePackages = [ ];
-  boot.supportedFilesystems = [ "zfs" ];
+  boot = {
+    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "zfs" ];
+    initrd.kernelModules = [ ];
+    initrd.supportedFilesystems = [ "zfs" ];
+    kernelModules = [ "kvm-intel" ];
+    kernelParams = [ "elevator=none" ];
+    extraModulePackages = [ ];
+    supportedFilesystems = [ "zfs" ];
+  };
 
-  fileSystems."/" =
-    { device = "rpool/system/root";
-      fsType = "zfs";
-    };
+  fileSystems."/" = {
+    device = "rpool/system/root";
+    fsType = "zfs";
+  };
 
-  fileSystems."/home" =
-    { device = "rpool/user/home";
-      fsType = "zfs";
-    };
+  fileSystems."/home" = {
+    device = "rpool/user/home";
+    fsType = "zfs";
+  };
 
-  fileSystems."/nix" =
-    { device = "rpool/local/nix";
-      fsType = "zfs";
-    };
+  fileSystems."/nix" = {
+    device = "rpool/local/nix";
+    fsType = "zfs";
+  };
 
-  fileSystems."/tmp" =
-    { device = "rpool/local/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/tmp" = {
+    device = "rpool/local/tmp";
+    fsType = "zfs";
+  };
 
-  fileSystems."/var/log" =
-    { device = "rpool/system/var/log";
-      fsType = "zfs";
-    };
+  fileSystems."/var/log" = {
+    device = "rpool/system/var/log";
+    fsType = "zfs";
+  };
 
-  fileSystems."/var/tmp" =
-    { device = "rpool/system/var/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/var/tmp" = {
+    device = "rpool/system/var/tmp";
+    fsType = "zfs";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/sda1";
-      fsType = "ext2";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/sda1";
+    fsType = "ext2";
+  };
 
   swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/odyssey/0001-Update-device-ID-for-PreSonus-1824c.patch

@@ -0,0 +1,71 @@
+From daebf42bd955f6f8d971af967c675e4e339cb0b2 Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sun, 12 Nov 2023 12:13:39 +0000
+Subject: [PATCH] Update device ID for PreSonus 1824c
+
+---
+ sound/usb/format.c       | 4 ++--
+ sound/usb/mixer_quirks.c | 2 +-
+ sound/usb/mixer_s1810c.c | 2 +-
+ sound/usb/quirks.c       | 4 ++--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/sound/usb/format.c b/sound/usb/format.c
+index ab5fed9f55b6..da50a4782414 100644
+--- a/sound/usb/format.c
++++ b/sound/usb/format.c
+@@ -378,8 +378,8 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip,
+ 
+ 		for (rate = min; rate <= max; rate += res) {
+ 
+-			/* Filter out invalid rates on Presonus Studio 1810c */
+-			if (chip->usb_id == USB_ID(0x194f, 0x010c) &&
++			/* Filter out invalid rates on Presonus Studio 1824c */
++			if (chip->usb_id == USB_ID(0x194f, 0x010d) &&
+ 			    !s1810c_valid_sample_rate(fp, rate))
+ 				goto skip_rate;
+ 
+diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
+index 898bc3baca7b..c3135459c38c 100644
+--- a/sound/usb/mixer_quirks.c
++++ b/sound/usb/mixer_quirks.c
+@@ -3445,7 +3445,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
+ 		err = snd_rme_controls_create(mixer);
+ 		break;
+ 
+-	case USB_ID(0x194f, 0x010c): /* Presonus Studio 1810c */
++	case USB_ID(0x194f, 0x010d): /* Presonus Studio 1824c */
+ 		err = snd_sc1810_init_mixer(mixer);
+ 		break;
+ 	case USB_ID(0x2a39, 0x3fb0): /* RME Babyface Pro FS */
+diff --git a/sound/usb/mixer_s1810c.c b/sound/usb/mixer_s1810c.c
+index fac4bbc6b275..5bc2e66d452c 100644
+--- a/sound/usb/mixer_s1810c.c
++++ b/sound/usb/mixer_s1810c.c
+@@ -552,7 +552,7 @@ int snd_sc1810_init_mixer(struct usb_mixer_interface *mixer)
+ 		return 0;
+ 
+ 	dev_info(&dev->dev,
+-		 "Presonus Studio 1810c, device_setup: %u\n", chip->setup);
++		 "Presonus Studio 1824c, device_setup: %u\n", chip->setup);
+ 	if (chip->setup == 1)
+ 		dev_info(&dev->dev, "(8out/18in @ 48kHz)\n");
+ 	else if (chip->setup == 2)
+diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
+index ab2b938502eb..b86832edaaa0 100644
+--- a/sound/usb/quirks.c
++++ b/sound/usb/quirks.c
+@@ -1551,8 +1551,8 @@ int snd_usb_apply_interface_quirk(struct snd_usb_audio *chip,
+ 	/* fasttrackpro usb: skip altsets incompatible with device_setup */
+ 	if (chip->usb_id == USB_ID(0x0763, 0x2012))
+ 		return fasttrackpro_skip_setting_quirk(chip, iface, altno);
+-	/* presonus studio 1810c: skip altsets incompatible with device_setup */
+-	if (chip->usb_id == USB_ID(0x194f, 0x010c))
++	/* presonus studio 1824c: skip altsets incompatible with device_setup */
++	if (chip->usb_id == USB_ID(0x194f, 0x010d))
+ 		return s1810c_skip_setting_quirk(chip, iface, altno);
+ 
+ 
+-- 
+2.42.0
+

hosts/odyssey/audio.nix

@@ -0,0 +1,45 @@
+{ config, pkgs, ... }:
+let
+  snd-usb-audio-module = pkgs.callPackage ./snd-usb-audio.nix {
+    kernel = config.boot.kernelPackages.kernel;
+  };
+  upmixConfig = ''
+    stream.properties = {
+      channelmix.upmix = true
+      channelmix.upmix-method = psd
+    }
+  '';
+in {
+  boot.extraModulePackages = [
+    (snd-usb-audio-module.overrideAttrs (_: {
+      patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
+    }))
+  ];
+
+  environment.etc = {
+    "pipewire/pipewire.conf.d/surround.conf".text = ''
+      context.modules = [
+        {
+          name = libpipewire-module-loopback
+          args = {
+            node.description = "Genelec 4.1 Surround"
+            capture.props = {
+              node.name = "Genelec_Speakers"
+              media.class = "Audio/Sink"
+              audio.position = [ FL FR SL SR LFE ]
+            }
+            playback.props = {
+              node.name = "playback.Genelec_Speakers"
+              audio.position = [ AUX0 AUX1 AUX3 AUX4 AUX5 ]
+              target.object = "alsa_output.usb-PreSonus_Studio_1824c_SC4E21110775-00.multichannel-output"
+              stream.dont-remix = true
+              node.passive = true
+            }
+          }
+        }
+      ]
+    '';
+    "pipewire/pipewire-pulse.conf.d/40-upmix.conf".text = upmixConfig;
+    "pipewire/client-rt.conf.d/40-upmix.conf".text = upmixConfig;
+  };
+ } 

hosts/odyssey/default.nix

@@ -1,9 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
-with lib.my;
 {
   imports = [
     ./hardware-configuration.nix
+    ./audio.nix
     ../desktop.nix
   ];
 
@@ -16,7 +16,6 @@ with lib.my;
 
   networking.hostName = "odyssey";
   networking.hostId = "c5e68d78";
-
   networking.networkmanager.enable = true;
 
   nix.package = pkgs.nixFlakes;
@@ -25,11 +24,19 @@ with lib.my;
   '';
 
   virtualisation.libvirtd.enable = true;
+  virtualisation.lxd.enable = true;
+  # Work around https://github.com/NixOS/nixpkgs/issues/263359
+  networking.firewall.trustedInterfaces = [ "lxdbr0" "virbr0" ];
 
   users.defaultUserShell = pkgs.zsh;
 
   system.stateVersion = "22.11";
 
+  services.journald.extraConfig = ''
+    SystemMaxUse=4G
+    MaxRetentionSec=90day
+  '';
+
   services.nix-serve = {
     enable = true;
     secretKeyFile = "/var/cache-priv-key.pem";
@@ -45,13 +52,46 @@ with lib.my;
     };
   };
 
+  age.secrets."passwords/services/borg/odyssey-passphrase" = {
+    file = "${inputs.secrets}/passwords/services/borg/odyssey-passphrase.age";
+  };
+
+  services.borgmatic = {
+    enable = true;
+    settings = {
+      source_directories = [
+        "/home/jordan/Documents"
+      ];
+      repositories = [
+        { label = "borgbase"; path = "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo"; }
+      ];
+      storage = {
+        encryption_passcommand = "cat ${config.age.secrets."passwords/services/borg/odyssey-passphrase".path}";
+        ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";
+      };
+      retention = {
+        keep_daily = 7;
+        keep_weekly = 4;
+        keep_monthly = 6;
+      };
+    };
+  };
+
+  # Without this override, `cat` is unavailable for `encryption_passcommand`
+  systemd.services.borgmatic.confinement.fullUnit = true;
+
   modules = {
     desktop = {
       apps.qbittorrent.enable = true;
       browsers = {
         firefox.enable = true;
       };
+      gaming.emulators = {
+        ps2.enable = true;
+        psp.enable = true;
+      };
       media.graphics = {
+        modeling.enable = true;
         raster.enable = true;
         vector.enable = true;
       };
@@ -65,6 +105,7 @@ with lib.my;
     };
     editors = {
       neovim.enable = true;
+      vscode.enable = true;
     };
     security = {
       gpg.enable = true;

hosts/odyssey/hardware-configuration.nix

@@ -1,69 +1,68 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-  boot.supportedFilesystems = [ "ntfs" ];
-
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = true;
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.kernelModules = [ ];
+    initrd.supportedFilesystems = [ "zfs" ];
+    kernelModules = [ "kvm-intel" ];
+    kernelPackages = pkgs.linuxPackages;
+    supportedFilesystems = [ "ntfs" ];
+    binfmt.emulatedSystems = [ "aarch64-linux" ];
   };
+
+  hardware = {
+    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    nvidia = {
+      modesetting.enable = true;
+      powerManagement.enable = true;
+    };
+  };
+
   services.xserver.videoDrivers = [ "nvidia" ];
 
-  fileSystems."/" =
-    { device = "rpool/system/root";
-      fsType = "zfs";
-    };
+  fileSystems."/" = {
+    device = "rpool/system/root";
+    fsType = "zfs";
+  };
 
-  fileSystems."/home" =
-    { device = "rpool/user/home";
-      fsType = "zfs";
-    };
+  fileSystems."/home" = {
+    device = "rpool/user/home";
+    fsType = "zfs";
+  };
 
-  fileSystems."/var" =
-    { device = "rpool/system/var";
-      fsType = "zfs";
-    };
+  fileSystems."/var" = {
+    device = "rpool/system/var";
+    fsType = "zfs";
+  };
 
-  fileSystems."/tmp" =
-    { device = "rpool/local/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/tmp" = {
+    device = "rpool/local/tmp";
+    fsType = "zfs";
+  };
 
-  fileSystems."/var/log" =
-    { device = "rpool/system/var/log";
-      fsType = "zfs";
-    };
+  fileSystems."/var/log" = {
+    device = "rpool/system/var/log";
+    fsType = "zfs";
+  };
 
-  fileSystems."/var/tmp" =
-    { device = "rpool/system/var/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/var/tmp" = {
+    device = "rpool/system/var/tmp";
+    fsType = "zfs";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/E63E-8E75";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/E63E-8E75";
+    fsType = "vfat";
+  };
 
   swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/odyssey/snd-usb-audio.nix

@@ -0,0 +1,36 @@
+{ pkgs, lib, kernel ? pkgs.linuxPackages_latest.kernel }:
+
+pkgs.stdenv.mkDerivation {
+  pname = "snd-usb-audio";
+  inherit (kernel) src version postPatch nativeBuildInputs;
+
+  kernel_dev = kernel.dev;
+  kernelVersion = kernel.modDirVersion;
+
+  modulePath = "sound/usb";
+
+  buildPhase = ''
+    BUILT_KERNEL=$kernel_dev/lib/modules/$kernelVersion/build
+
+    cp $BUILT_KERNEL/Module.symvers .
+    cp $BUILT_KERNEL/.config        .
+    cp $kernel_dev/vmlinux          .
+
+    make "-j$NIX_BUILD_CORES" modules_prepare
+    make "-j$NIX_BUILD_CORES" M=$modulePath modules
+  '';
+
+  installPhase = ''
+    make \
+      INSTALL_MOD_PATH="$out" \
+      XZ="xz -T$NIX_BUILD_CORES" \
+      M="$modulePath" \
+      modules_install
+  '';
+
+  meta = {
+    description = "USB Sound kernel module";
+    license = lib.licenses.gpl2;
+  };
+}
+

hosts/pi/README.md

@@ -0,0 +1,18 @@
+# Pi
+
+## Overview
+Raspberry Pi 4
+
+## Specs
+* SoC - Broadcom BCM2711
+* CPU - ARM Cortex-A72 @ 1.8 GHz
+* Memory - 8 GB LPDDR4
+
+### Disks
+Device | Partitions _(filesystem, usage)_
+--- | ---
+SD card | `/dev/mmcblk0` (ext4, NixOS Root)
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `pi.mesh.vimium.net`.

hosts/pi/default.nix

@@ -0,0 +1,147 @@
+{ config, lib, pkgs, inputs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    ../server.nix
+  ];
+
+  networking.hostId = "731d1660";
+
+  hardware = {
+    raspberry-pi."4" = {
+      apply-overlays-dtmerge.enable = true;
+      audio.enable = false;
+      fkms-3d.enable = false;
+      xhci.enable = false;
+    };
+    deviceTree = {
+      enable = true;
+      overlays = [
+        { name = "hifiberry-digi-pro"; dtboFile = "${pkgs.device-tree_rpi.overlays}/hifiberry-digi-pro.dtbo"; }
+      ];
+    };
+    firmware = with pkgs; [
+      firmwareLinuxNonfree
+      wireless-regdb
+    ];
+  };
+
+  sound.enable = true;
+
+  age.secrets."passwords/networks.age" = {
+    file = "${inputs.secrets}/passwords/networks.age";
+  };
+
+  networking = {
+    wireless = {
+      enable = true;
+      interfaces = [ "wlan0" ];
+      environmentFile = config.age.secrets."passwords/networks.age".path;
+      networks = {
+        "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
+      };
+    };
+  };
+
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    systemWide = true;
+  };
+
+  virtualisation.oci-containers = {
+    backend = "podman";
+    containers.homeassistant = {
+      volumes = [ "home-assistant:/config" ];
+      environment.TZ = config.time.timeZone;
+      image = "ghcr.io/home-assistant/home-assistant:stable";
+      extraOptions = [
+        "--network=host"
+        "--device=/dev/ttyUSB0:/dev/ttyUSB0"
+      ];
+    };
+  };
+
+  services.mosquitto = {
+    enable = true;
+    listeners = [{
+      port = 1883;
+      settings = {
+        allow_anonymous = true;
+      };
+    }];
+  };
+
+  age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
+    file = "${inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
+    path = "${config.services.zigbee2mqtt.dataDir}/secret.yaml";
+    owner = "zigbee2mqtt";
+    group = "zigbee2mqtt";
+  };
+
+  services.zigbee2mqtt = {
+    enable = true;
+    dataDir = "/var/lib/zigbee2mqtt";
+    settings = {
+      homeassistant = true;
+      frontend = true;
+      device_options = {
+        retain = true;
+      };
+      serial = {
+        port = "/dev/serial/by-id/usb-Silicon_Labs_Sonoff_Zigbee_3.0_USB_Dongle_Plus_0001-if00-port0";
+      };
+      advanced = {
+        channel = 20;
+        network_key = "!secret.yaml network_key";
+        pan_id = 13001;
+        ext_pan_id = [ 79 1 73 47 250 136 124 222 ];
+      };
+      mqtt = {
+        version = 5;
+        server = "mqtt://localhost:1883";
+      };
+    };
+  };
+
+  age.secrets."passwords/services/borg/pi-passphrase" = {
+    file = "${inputs.secrets}/passwords/services/borg/pi-passphrase.age";
+  };
+
+  services.borgmatic = {
+    enable = true;
+    settings = {
+      source_directories = [
+        "/var/lib/mosquitto"
+        "/var/lib/zigbee2mqtt"
+      ];
+      repositories = [
+        { label = "borgbase"; path = "ssh://qcw86s11@qcw86s11.repo.borgbase.com/./repo"; }
+      ];
+      storage = {
+        encryption_passcommand = "cat ${config.age.secrets."passwords/services/borg/pi-passphrase".path}";
+        ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";
+      };
+      retention = {
+        keep_daily = 7;
+        keep_weekly = 4;
+        keep_monthly = 6;
+      };
+    };
+  };
+
+  # Without this override, `cat` is unavailable for `encryption_passcommand`
+  systemd.services.borgmatic.confinement.fullUnit = true;
+
+  environment.systemPackages = with pkgs; [
+    libraspberrypi
+    raspberrypi-eeprom
+  ];
+
+  system.stateVersion = "22.11";
+}
+

hosts/pi/hardware-configuration.nix

@@ -0,0 +1,31 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [
+    (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
+  ];
+
+  boot = {
+    # Stop ZFS kernel being built
+    supportedFilesystems = lib.mkForce [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ];
+    tmp.cleanOnBoot = true;
+  };
+
+  # Fix missing modules
+  # https://github.com/NixOS/nixpkgs/issues/154163
+  nixpkgs.overlays = [
+    (final: super: {
+      makeModulesClosure = x:
+        super.makeModulesClosure (x // { allowMissing = true; });
+    })
+  ];
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+      options = [ "noatime" ];
+    };
+  };
+}
+

hosts/server.nix

@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 {
   time.timeZone = "Europe/London";
 
@@ -20,6 +18,8 @@ with lib.my;
 
   console.keyMap = "uk";
 
+  documentation.enable = false;
+
   services.openssh = {
     enable = true;
     settings = {
@@ -34,6 +34,17 @@ with lib.my;
     neovim
   ];
 
+  nix = {
+    settings = {
+      auto-optimise-store = true;
+    };
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "-d --delete-older-than 7d";
+    };
+  };
+
   modules.networking.tailscale = {
     enable = true;
     restrictSSH = false;

hosts/vps1/README.md

@@ -0,0 +1,17 @@
+# vps1
+
+## Overview
+VPS hosted in OVH.
+
+## Specs
+* CPU - ??
+* Memory - ??
+
+### Disks
+Device | Partitions _(filesystem, usage)_
+--- | ---
+NVMe | `/dev/sda1` (ext4, NixOS Root)
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `vps1.mesh.vimium.net`.

hosts/vps1/default.nix

@@ -0,0 +1,195 @@
+{ config, lib, pkgs, inputs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    ../server.nix
+  ];
+
+  networking = {
+    hostId = "???";
+    hostName = "vps1";
+    domain = "mesh.vimium.net";
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [
+        22    # SSH
+        8448  # Matrix federation
+        80    # HTTP
+        443   # HTTPS
+        5349  # STUN TLS
+        5350  # STUN TLS alt
+      ];
+      allowedUDPPortRanges = [
+        { from = 49152; to = 49999; } # TURN relay
+      ];
+    };
+  };
+
+  users.users = {
+    git = {
+      isSystemUser = true;
+      useDefaultShell = true;
+      group =  "git";
+      extraGroups = [ "gitea" ];
+      home = config.services.gitea.stateDir;
+    };
+    jellyfin = {
+      isSystemUser = true;
+      group = "jellyfin";
+      shell = "/bin/sh";
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaaS+KMAEAymZhIJGC4LK8aMhUzhpmloUgvP2cxeBH4 jellyfin"
+      ];
+    };
+    root = {
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
+      ];
+    };
+  };
+
+  users.groups = {
+    git = { };
+    jellyfin = { };
+  };
+
+  age.secrets."passwords/services/borg/vps1-passphrase" = {
+    file = "${inputs.secrets}/passwords/services/borg/vps1-passphrase.age";
+  };
+
+  services.borgmatic = {
+    enable = true;
+    settings = {
+      source_directories = [
+        "/home"
+        "/var/lib"
+        "/var/www"
+      ];
+      repositories = [
+        { label = "borgbase"; path = "ssh://p91y8oh7@p91y8oh7.repo.borgbase.com/./repo"; }
+      ];
+      storage = {
+        encryption_passcommand = "cat ${config.age.secrets."passwords/services/borg/vps1-passphrase".path}";
+        ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";
+      };
+      retention = {
+        keep_daily = 7;
+        keep_weekly = 4;
+        keep_monthly = 6;
+      };
+    };
+  };
+
+  # Without this override, `cat` is unavailable for `encryption_passcommand`
+  systemd.services.borgmatic.confinement.fullUnit = true;
+
+  age.secrets."passwords/services/coturn/shared-secret" = {
+    file = "${inputs.secrets}/passwords/services/coturn/shared-secret.age";
+  };
+
+  services.coturn = {
+    enable = true;
+    lt-cred-mech = true;
+    use-auth-secret = true;
+    static-auth-secret = "???";
+    realm = "turn.vimium.com";
+    relay-ips = [
+      "198.244.190.160"
+    ];
+    no-tcp-relay = true;
+    extraConfig = ''
+      cipher-list="HIGH"
+      no-loopback-peers
+      no-multicast-peers
+    '';
+    secure-stun = true;
+    cert = "/var/lib/acme/turn.vimium.com/fullchain.pem";
+    pkey = "/var/lib/acme/turn.vimium.com/key.pem";
+    min-port = 49152;
+    max-port = 49999;
+  };
+
+  services.gitea = rec {
+    package = pkgs.gitea;
+    enable = true;
+    user = "git";
+    appName = "Vimium Git";
+    stateDir = "/var/lib/gitea";
+    repositoryRoot = "${stateDir}/repositories";
+    database = {
+      type = "sqlite3";
+      inherit user;
+      path = "${stateDir}/gitea.db";
+    };
+    lfs = {
+      enable = true;
+      contentDir = "${stateDir}/lfs";
+    };
+    settings = {
+      server = {
+        SSH_USER = "git";
+        SSH_DOMAIN = "git.vimium.com";
+        SSH_PORT = lib.head config.services.openssh.ports;
+        OFFLINE_MODE = true;
+        PROTOCOL = "http+unix";
+        DOMAIN = config.networking.domain;
+        ROOT_URL = "https://git.vimium.com/";
+      };
+      service.DISABLE_REGISTRATION = true;
+      session.COOKIE_SECURE = true;
+      log.ROOT_PATH = "${stateDir}/log";
+      ui = {
+        THEMES = "gitea,arc-green,github-dark,bthree-dark";
+        DEFAULT_THEME = "github-dark";
+      };
+      actions.ENABLED = true;
+      indexer = {
+        REPO_INDEXER_ENABLED = true;
+      };
+      packages.CHUNKED_UPLOAD_PATH = lib.mkForce "${stateDir}/data/tmp/package-upload";
+    };
+  };
+
+  services.headscale = {
+    enable = true;
+    port = 8080;
+    settings = {
+      server_url = "https://headscale.vimium.net";
+      dns_config = {
+        base_domain = "vimium.net";
+      };
+      logtail.enabled = false;
+    };
+  };
+
+  services.matrix-synapse = {
+    enable = true;
+    settings = {
+      database.name = "sqlite3";
+      enable_registration = false;
+      server_name = "vimium.com";
+      turn_shared_secret = "???";
+      turn_uris = [
+        "turn:turn.vimium.com:5349?transport=udp"
+        "turn:turn.vimium.com:5350?transport=udp"
+        "turn:turn.vimium.com:5349?transport=tcp"
+        "turn:turn.vimium.com:5350?transport=tcp"
+      ];
+    };
+  };
+
+  services.tailscale.enable = true;
+  networking.firewall = {
+    checkReversePath = "loose";
+    trustedInterfaces = [ "tailscale0" ];
+    allowedUDPPorts = [ config.services.tailscale.port ];
+  };
+
+  environment.systemPackages = with pkgs; [
+    config.services.headscale.package
+  ];
+
+  system.stateVersion = "22.11";
+}
+

hosts/vps1/hardware-configuration.nix

@@ -0,0 +1,26 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
+      kernelModules = [ "nvme" ];
+    };
+    loader.grub.device = "/dev/sda";
+    tmp.cleanOnBoot = true;
+  };
+
+  zramSwap.enable = true;
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/sda1";
+      fsType = "ext4";
+    };
+  };
+}
+

lib/attrs.nix

@@ -1,26 +0,0 @@
-{ lib, ... }:
-
-with builtins;
-with lib;
-rec {
-  # attrsToList
-  attrsToList = attrs:
-    mapAttrsToList (name: value: { inherit name value; }) attrs;
-
-  # mapFilterAttrs ::
-  #   (name -> value -> bool)
-  #   (name -> value -> { name = any; value = any; })
-  #   attrs
-  mapFilterAttrs = pred: f: attrs: filterAttrs pred (mapAttrs' f attrs);
-
-  # Generate an attribute set by mapping a function over a list of values.
-  genAttrs' = values: f: listToAttrs (map f values);
-
-  # anyAttrs :: (name -> value -> bool) attrs
-  anyAttrs = pred: attrs:
-    any (attr: pred attr.name attr.value) (attrsToList attrs);
-
-  # countAttrs :: (name -> value -> bool) attrs
-  countAttrs = pred: attrs:
-    count (attr: pred attr.name attr.value) (attrsToList attrs);
-}

lib/default.nix

@@ -1,19 +0,0 @@
-
-{ inputs, lib, pkgs, ... }:
-
-let
-  inherit (lib) makeExtensible attrValues foldr;
-  inherit (modules) mapModules;
-
-  modules = import ./modules.nix {
-    inherit lib;
-    self.attrs = import ./attrs.nix { inherit lib; self = {}; };
-  };
-
-  mylib = makeExtensible (self:
-    with self; mapModules ./.
-      (file: import file { inherit self lib pkgs inputs; }));
-in
-mylib.extend
-  (self: super:
-    foldr (a: b: a // b) {} (attrValues super))

lib/modules.nix

@@ -1,53 +0,0 @@
-{ self, lib, ... }:
-
-let
-  inherit (builtins) attrValues readDir pathExists concatLists;
-  inherit (lib) id mapAttrsToList filterAttrs hasPrefix hasSuffix nameValuePair removeSuffix;
-  inherit (self.attrs) mapFilterAttrs;
-in
-rec {
-  mapModules = dir: fn:
-    mapFilterAttrs
-      (n: v:
-        v != null &&
-        !(hasPrefix "_" n))
-      (n: v:
-        let path = "${toString dir}/${n}"; in
-        if v == "directory" && pathExists "${path}/default.nix"
-        then nameValuePair n (fn path)
-        else if v == "regular" &&
-                n != "default.nix" &&
-                hasSuffix ".nix" n
-        then nameValuePair (removeSuffix ".nix" n) (fn path)
-        else nameValuePair "" null)
-      (readDir dir);
-
-  mapModules' = dir: fn:
-    attrValues (mapModules dir fn);
-
-  mapModulesRec = dir: fn:
-    mapFilterAttrs
-      (n: v:
-        v != null &&
-        !(hasPrefix "_" n))
-      (n: v:
-        let path = "${toString dir}/${n}"; in
-        if v == "directory"
-        then nameValuePair n (mapModulesRec path fn)
-        else if v == "regular" && n != "default.nix" && hasSuffix ".nix" n
-        then nameValuePair (removeSuffix ".nix" n) (fn path)
-        else nameValuePair "" null)
-      (readDir dir);
-
-  mapModulesRec' = dir: fn:
-    let
-      dirs =
-        mapAttrsToList
-          (k: _: "${dir}/${k}")
-          (filterAttrs
-            (n: v: v == "directory" && !(hasPrefix "_" n))
-            (readDir dir));
-      files = attrValues (mapModules dir id);
-      paths = files ++ concatLists (map (d: mapModulesRec' d id) dirs);
-    in map fn paths;
-}

lib/nixos.nix

@@ -1,25 +0,0 @@
-{ inputs, lib, pkgs, ... }:
-
-with lib;
-with lib.my;
-let sys = "x86_64-linux";
-in {
-  mkHost = path: attrs @ { system ? sys, ... }:
-    nixosSystem {
-      inherit system;
-      specialArgs = { inherit lib inputs system; };
-      modules = [
-        {
-          nixpkgs.pkgs = pkgs;
-          networking.hostName = mkDefault (removeSuffix ".nix" (baseNameOf path));
-        }
-        (filterAttrs (n: v: !elem n [ "system" ]) attrs)
-        ../.   # /default.nix
-        (import path)
-      ];
-    };
-
-  mapHosts = dir: attrs @ { system ? system, ... }:
-    mapModules dir
-      (hostPath: mkHost hostPath attrs);
-}

lib/options.nix

@@ -1,35 +0,0 @@
-{ lib, ... }:
-
-let
-  inherit (lib) mkOption types;
-in
-rec {
-  mkOpt = type: default:
-    mkOption { inherit type default; };
-
-  mkOpt' = type: default: description:
-    mkOption { inherit type default description; };
-
-  mkBoolOpt = default: mkOption {
-    inherit default;
-    type = types.bool;
-    example = true;
-  };
-
-  mkStringOpt = default: mkOption {
-    inherit default;
-    type = types.lines;
-    example = "";
-  };
-
-  mkListOfStringOpt = default: mkOption {
-    inherit default;
-    type = types.listOf types.lines;
-    example = [ "a" "b" "c" ];
-  };
-
-  mkPath = path:
-    if path != null
-    then toString path
-    else "";
-}

modules/default.nix

@@ -5,6 +5,7 @@
     ./desktop/mimeapps.nix
     ./desktop/apps/qbittorrent.nix
     ./desktop/apps/slack.nix
+    ./desktop/apps/thunderbird.nix
     ./desktop/apps/zoom.nix
     ./desktop/browsers/firefox.nix
     ./desktop/gaming/emulators.nix
@@ -12,6 +13,7 @@
     ./desktop/gaming/steam.nix
     ./desktop/media/graphics.nix
     ./desktop/media/recording.nix
+    ./desktop/office/libreoffice.nix
     ./dev/cc.nix
     ./dev/java.nix
     ./dev/lua.nix

modules/desktop/apps/qbittorrent.nix

@@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.apps.qbittorrent;
 in {
   options.modules.desktop.apps.qbittorrent = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       qbittorrent
     ];
   };
-}
+}

modules/desktop/apps/slack.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.apps.slack;
 in {
   options.modules.desktop.apps.slack = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       slack
     ];

modules/desktop/apps/thunderbird.nix

@@ -0,0 +1,33 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let cfg = config.modules.desktop.apps.thunderbird;
+in {
+  options.modules.desktop.apps.thunderbird = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+  
+  config = lib.mkIf cfg.enable {
+    home.file.".thunderbird/Default/chrome/thunderbird-gnome-theme".source = inputs.thunderbird-gnome-theme;
+
+    home.programs.thunderbird = {
+      enable = true;
+      profiles.Default = {
+        isDefault = true;
+        userChrome = ''
+          @import "thunderbird-gnome-theme/userChrome.css";
+        '';
+        userContent = ''
+          @import "thunderbird-gnome-theme/userContent.css";
+        '';
+        settings = {
+          ## GNOME theme
+          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+          "svg.context-properties.content.enabled" = true;
+        };
+      };
+    };
+  };
+}

modules/desktop/apps/zoom.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.apps.zoom;
 in {
   options.modules.desktop.apps.zoom = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       zoom-us
     ];

modules/desktop/browsers/firefox.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, inputs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.browsers.firefox;
 in {
   options.modules.desktop.browsers.firefox = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;
 
     home.programs.firefox = {
@@ -26,10 +27,11 @@ in {
         '';
         settings = {
           ## GNOME theme
-          "toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Enable customChrome.cs
+          "toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Enable customChrome.css
           "browser.uidensity" = 0; # Set UI density to normal
           "svg.context-properties.content.enabled" = true; # Enable SVG context-propertes
           "browser.theme.dark-private-windows" = false; # Disable private window dark theme
+          "widget.gtk.rounded-bottom-corners.enabled" = true; # Enable rounded bottom window corners
 
           ## Preferences
           "browser.ctrlTab.sortByRecentlyUsed" = true;

modules/desktop/gaming/emulators.nix

@@ -1,34 +1,59 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gaming.emulators;
 in {
   options.modules.desktop.gaming.emulators = {
-    ds.enable       = mkBoolOpt false;
-    gb.enable       = mkBoolOpt false;
-    gba.enable      = mkBoolOpt false;
-    gamecube.enable = mkBoolOpt false;
-    ps2.enable      = mkBoolOpt false;
-    ps3.enable      = mkBoolOpt false;
-    psp.enable      = mkBoolOpt false;
-    snes.enable     = mkBoolOpt false;
-    wii.enable      = mkBoolOpt false;
+    ds.enable       = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    gb.enable       = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    gba.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    gamecube.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    ps2.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    ps3.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    psp.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    snes.enable     = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    wii.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
   config = {
     user.packages = with pkgs; [
-      (mkIf cfg.ps2.enable pcsx2)
-      (mkIf cfg.ps3.enable rpcs3)
-      (mkIf cfg.psp.enable ppsspp)
-      (mkIf cfg.ds.enable desmume)
-      (mkIf (cfg.gba.enable ||
+      (lib.mkIf cfg.ps2.enable pcsx2)
+      (lib.mkIf cfg.ps3.enable rpcs3)
+      (lib.mkIf cfg.psp.enable ppsspp)
+      (lib.mkIf cfg.ds.enable desmume)
+      (lib.mkIf (cfg.gba.enable ||
              cfg.gb.enable  ||
              cfg.snes.enable)
         higan)
-      (mkIf (cfg.wii.enable ||
+      (lib.mkIf (cfg.wii.enable ||
              cfg.gamecube.enable)
         dolphin-emu)
     ];
   };
-}
+}

modules/desktop/gaming/lutris.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gaming.lutris;
 in {
   options.modules.desktop.gaming.lutris = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       lutris
       vulkan-loader

modules/desktop/gaming/steam.nix

@@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gaming.steam;
 in {
   options.modules.desktop.gaming.steam = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     programs.steam.enable = true;
 
     systemd.extraConfig = "DefaultLimitNOFILE=1048576";
   };
-}
+}

modules/desktop/gnome.nix

@@ -1,45 +1,52 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gnome;
 in {
   options.modules.desktop.gnome = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.xserver = {
       enable = true;
       displayManager.gdm.enable = true;
       desktopManager.gnome.enable = true;
     };
 
+    services.flatpak.enable = true;
+
     programs.dconf.enable = true;
     dconf.settings = {
       "org/gnome/shell" = {
         disable-user-extensions = false;
         enabled-extensions = [
-          "another-window-session-manager@gmail.com"
+          # "another-window-session-manager@gmail.com"
           "blur-my-shell@aunetx"
           "burn-my-windows@schneegans.github.com"
-          "desktop-cube@schneegans.github.com"
-          "desktop-zoom@colin.kinlo.ch"
+          # "desktop-cube@schneegans.github.com"
+          # "desktop-zoom@colin.kinlo.ch"
           "espresso@coadmunkee.github.com"
+          # "flypie@schneegans.github.com"
           # "forge@jmmaranan.com"
           "hue-lights@chlumskyvaclav@gmail.com"
           "just-perfection-desktop@just-perfection"
+          # "pano@elhan.io"
+          # "paperwm@hedning:matrix.org"
+          # "search-light@icedman.github.com"
           "space-bar@luchrioh"
           # "smart-auto-move@khimaros.com"
           # "systemd-manager@hardpixel.eu"
           # "tailscale-status@maxgallup.github.com"
-          "tiling-assistant@leleat-on-github"
+          # "tiling-assistant@leleat-on-github"
+          "Vitals@CoreCoding.com"
           # "wsmatrix@martin.zurowietz.de"
         ];
         favorite-apps = [
           "firefox.desktop"
           "org.gnome.Nautilus.desktop"
-          "org.gnome.Console.desktop"
         ];
       };
       "org/gnome/shell/extensions/another-window-session-manager" = {
@@ -67,6 +74,9 @@ in {
           "com.obsproject.Studio.desktop"
         ];
       };
+      "org/gnome/shell/extensions/paperwm" = {
+        use-default-background = true;
+      };
       "org/gnome/shell/extensions/forge" = {
         window-gap-size = 8;
         window-gap-hidden-on-single = false;
@@ -89,8 +99,8 @@ in {
         window-gap = 8;
       };
       "org/gnome/desktop/background" = {
-        picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.webp";
-        picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.webp";
+        picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.jpg";
+        picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.jpg";
       };
       "org/gtk/settings/file-chooser" = {
         show-hidden = true;
@@ -137,13 +147,15 @@ in {
       };
     };
 
-    fonts.fonts = with pkgs; [
+    fonts.packages = with pkgs; [
       noto-fonts
       ubuntu_font_family
     ];
 
     user.packages = with pkgs; [
       celluloid
+      fragments
+      mission-center
     ];
 
     environment.systemPackages = with pkgs; [
@@ -160,18 +172,24 @@ in {
       gnomeExtensions.desktop-cube
       gnomeExtensions.desktop-zoom
       gnomeExtensions.espresso
+      gnome44Extensions."flypie@schneegans.github.com"
       # gnomeExtensions.forge
       # gnomeExtensions.gsnap
       gnomeExtensions.hue-lights
       gnomeExtensions.just-perfection
       # gnomeExtensions.mutter-primary-gpu
+      gnomeExtensions.pano
+      gnomeExtensions.paperwm
       # gnomeExtensions.pip-on-top
+      gnomeExtensions.rounded-window-corners
+      gnomeExtensions.search-light
       gnomeExtensions.smart-auto-move
       gnomeExtensions.space-bar
       gnomeExtensions.systemd-manager
       gnomeExtensions.tailscale-status
       gnomeExtensions.tiling-assistant
       # gnomeExtensions.todotxt
+      gnomeExtensions.vitals
       # gnomeExtensions.window-is-ready-remover
       # gnomeExtensions.worksets
       # gnomeExtensions.workspace-matrix
@@ -182,7 +200,9 @@ in {
       tokei
       tree
       wl-clipboard
-    ];
+    ] ++ (if config.virtualisation.podman.enable then [
+      pods
+    ] else []);
 
     home.services.gpg-agent.pinentryFlavor = "gnome3";
   };

modules/desktop/media/graphics.nix

@@ -1,21 +1,28 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.media.graphics;
 in {
   options.modules.desktop.media.graphics = {
-    modeling.enable = mkBoolOpt false;
-    raster.enable   = mkBoolOpt false;
-    vector.enable   = mkBoolOpt false;
+    modeling.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    raster.enable   = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    vector.enable   = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
   config = {
     user.packages = with pkgs; [
-      (mkIf cfg.modeling.enable blender)
-      (mkIf cfg.raster.enable gimp)
-      (mkIf cfg.raster.enable krita)
-      (mkIf cfg.vector.enable inkscape)
+      (lib.mkIf cfg.modeling.enable blender)
+      (lib.mkIf cfg.raster.enable gimp)
+      (lib.mkIf cfg.raster.enable krita)
+      (lib.mkIf cfg.vector.enable inkscape)
     ];
   };
-}
+}

modules/desktop/media/recording.nix

@@ -1,12 +1,16 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.desktop.media.recording;
 in {
   options.modules.desktop.media.recording = {
-    audio.enable = mkBoolOpt false;
-    video.enable = mkBoolOpt false;
+    audio.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    video.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
   config = {
@@ -21,4 +25,4 @@ in {
         obs-studio
       ] else []);
   };
-}
+}

modules/desktop/mimeapps.nix

@@ -1,17 +1,18 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let
   cfg = config.modules.desktop.mimeapps;
   avApp = "io.github.celluloid_player.Celluloid.desktop";
   imageApp = "org.gnome.eog.desktop";
 in {
   options.modules.desktop.mimeapps = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     xdg.mime.defaultApplications = {
       # Audio/video
       "audio/x-vorbis+ogg" = avApp;

modules/desktop/office/libreoffice.nix

@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.desktop.office.libreoffice;
+in {
+  options.modules.desktop.office.libreoffice = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      libreoffice
+    ];
+  };
+}

modules/dev/cc.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.cc;
 in {
   options.modules.dev.cc = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       clang
       gcc
@@ -17,4 +18,4 @@ in {
       llvmPackages.libcxx
     ];
   };
-}
+}

modules/dev/java.nix

@@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.java;
 in {
   options.modules.dev.java = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       jdk
     ];
   };
-}
+}

modules/dev/lua.nix

@@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.lua;
 in {
   options.modules.dev.lua = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       lua
     ];
   };
-}
+}

modules/dev/node.nix

@@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.node;
 in {
   options.modules.dev.node = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       nodejs_latest
     ];
   };
-}
+}

modules/dev/python.nix

@@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.python;
 in {
   options.modules.dev.python = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       python310
     ];
   };
-}
+}

modules/dev/rust.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.rust;
 in {
   options.modules.dev.rust = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       rustc
       rustup
@@ -16,4 +17,4 @@ in {
       rust-bindgen
     ];
   };
-}
+}

modules/dev/scala.nix

@@ -1,18 +1,19 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.scala;
 in {
   options.modules.dev.scala = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       jdk
       sbt
       scala
     ];
   };
-}
+}

modules/dev/shell.nix

@@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.shell;
 in {
   options.modules.dev.shell = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       shellcheck
     ];
   };
-}
+}

modules/dev/zig.nix

@@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.dev.zig;
 in {
   options.modules.dev.zig = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       zig
     ];
   };
-}
+}

modules/editors/neovim/default.nix

@@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let
   cfg = config.modules.editors.neovim;
   dev = config.modules.dev;
 in {
   options.modules.editors.neovim = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
       (neovim.override {
         configure = {

modules/editors/vscode.nix

@@ -1,16 +1,49 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.editors.vscode;
 in {
   options.modules.editors.vscode = {
-    enable = mkBoolOpt false;
-  };
-
-  config = mkIf cfg.enable {
-    home.programs.vscode = {
-      enable = true;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
     };
   };
-}
+
+  config = lib.mkIf cfg.enable {
+    environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+    home.programs.vscode = {
+      enable = true;
+      extensions = with pkgs.vscode-extensions; [
+        asvetliakov.vscode-neovim
+        brettm12345.nixfmt-vscode
+        coolbear.systemd-unit-file
+        editorconfig.editorconfig
+        golang.go
+        graphql.vscode-graphql-syntax
+        mattn.lisp
+        # mkhl.direnv
+        ms-python.vscode-pylance
+        ms-vscode.cpptools
+        ms-vscode.hexeditor
+        piousdeer.adwaita-theme
+        # redhat.java
+        # sumneko.lua
+      ];
+      userSettings = {
+        "editor.renderLineHighlight" = "none";
+        "extensions.experimental.affinity" = {
+          "asvetliakov.vscode-neovim" = 1;
+        };
+        "files.autoSave" = "off";
+        "window.autoDetectColorScheme" = true;
+        "window.commandCenter" = true;
+        "window.titleBarStyle" = "custom";
+        "workbench.iconTheme" = null;
+        "workbench.preferredDarkColorTheme" = "Adwaita Dark";
+        "workbench.preferredLightColorTheme" = "Adwaita Light";
+        "workbench.tree.indent" = 12;
+      };
+    };
+  };
+}

modules/networking/tailscale.nix

@@ -1,15 +1,19 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.networking.tailscale;
 in {
   options.modules.networking.tailscale = {
-    enable = mkBoolOpt false;
-    restrictSSH = mkBoolOpt true;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    restrictSSH = lib.mkOption {
+      default = true;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.tailscale.enable = true;
     services.openssh.openFirewall = !cfg.restrictSSH;
     networking.firewall = {

modules/options.nix

@@ -1,21 +1,20 @@
-{ config, options, lib, home-manager, ... }:
+{ config, options, lib, home-manager, inputs, ... }:
 
 with lib;
-with lib.my;
 {
   options = with types; {
-    user = mkOpt attrs { };
+    user = mkOption { type = attrs; default = { }; };
 
     home = {
-      configFile  = mkOpt' attrs { } "Files to place in $XDG_CONFIG_HOME";
-      dataFile    = mkOpt' attrs { } "Files to place in $XDG_DATA_HOME";
-      file        = mkOpt' attrs { } "Files to place directly in $HOME";
-      packages    = mkOpt' attrs { } "User-level installed packages";
-      programs    = mkOpt' attrs { } "Programs managed directly from home-manager";
-      services    = mkOpt' attrs { } "Services managed directly from home-manager";
+      configFile  = mkOption { type = attrs; default = { }; description = "Files to place in $XDG_CONFIG_HOME"; };
+      dataFile    = mkOption { type = attrs; default = { }; description = "Files to place in $XDG_DATA_HOME"; };
+      file        = mkOption { type = attrs; default = { }; description = "Files to place directly in $HOME"; };
+      packages    = mkOption { type = attrs; default = { }; description = "User-level installed packages"; };
+      programs    = mkOption { type = attrs; default = { }; description = "Programs managed directly from home-manager"; };
+      services    = mkOption { type = attrs; default = { }; description = "Services managed directly from home-manager"; };
     };
 
-    dconf.settings = mkOpt' attrs { } "dconf settings to enable";
+    dconf.settings = mkOption { type = attrs; default = { }; description = "dconf settings to enable"; };
 
     env = mkOption {
       type = attrsOf (oneOf [ str path (listOf (either str path)) ]);
@@ -30,18 +29,20 @@ with lib.my;
   };
 
   config = {
+    age.secrets."passwords/users/jordan".file = "${inputs.secrets}/passwords/users/jordan.age";
     user =
       let user = builtins.getEnv "USER";
           name = if elem user [ "" "root" ] then "jordan" else user;
       in {
         inherit name;
         isNormalUser = true;
-        extraGroups = [ "networkmanager" "wheel" ];
+        extraGroups = [ "networkmanager" "wheel" "lxd" ];
         description = "Jordan Holt";
         useDefaultShell = true;
         openssh.authorizedKeys.keys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
         ];
+        hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
         home = "/home/${name}";
         group = "users";
         uid = 1000;
@@ -69,8 +70,6 @@ with lib.my;
 
     users.users.${config.user.name} = mkAliasDefinitions options.user;
 
-    nixpkgs.config.allowUnfree = true;
-
     environment.extraInit =
       concatStringsSep "\n"
         (mapAttrsToList (n: v: "export ${n}=\"${v}\"") config.env);

modules/security/gpg.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.security.gpg;
 in {
   options.modules.security.gpg = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.programs.gpg = {
       enable = true;
     };
@@ -18,4 +19,4 @@ in {
       enableSshSupport = true;
     };
   };
-}
+}

modules/security/pass.nix

@@ -1,17 +1,18 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.security.pass;
 in {
   options.modules.security.pass = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.programs.password-store = {
       enable = true;
       package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
     };
   };
-}
+}

modules/shell/git/default.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.shell.git;
 in {
   options.modules.shell.git = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.programs.git = {
       enable = true;
       aliases = {
@@ -35,4 +36,4 @@ in {
       "git/ignore".source = ./ignore;
     };
   };
-}
+}

modules/shell/zsh/default.nix

@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-with lib.my;
 let cfg = config.modules.shell.zsh;
 in {
   options.modules.shell.zsh = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     users.defaultUserShell = pkgs.zsh;
 
     programs.zsh = {

overlays/gnome.nix

@@ -3,8 +3,8 @@ self: super:
   gnome = super.gnome.overrideScope' (gself: gsuper: {
     mutter = gsuper.mutter.overrideAttrs (oldAttrs: {
       src = super.fetchurl {
-        url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-44/mutter-triple-buffering-v4-44.tar.gz";
-        sha256 = "Xgiu1ifgPijXPq6rYfPX81Nq97jw9m/hoWTKAgC3aeI=";
+        url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-45/mutter-triple-buffering-v4-45.tar.gz";
+        sha256 = "tN+zQ5brk+hc+louIipqPV/Bqft42ghKOzjZZMj5Q8A=";
       };
     });
   });