nixos-pc: added unsloth-desktop

.gitea/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: ci
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  check-flake:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: cachix/install-nix-action@v31
+        with:
+          extra_nix_config: |
+            experimental-features = nix-command flakes
+            accept-flake-config = true
+
+      - name: check formatting
+        run: nix fmt -- --check
+
+      - name: statix linting check
+        run: nix run nixpkgs#statix -- check .
+
+      - name: evaluate all configurations
+        run: nix flake check --no-build --all-systems
+
+      - name: build packages
+        run: nix build --no-link .#heidisql .#aseprite-thumbnailer-kde
+

.gitignore

@@ -1,6 +1,6 @@
 **/result
 
-# Devenv
+# devenv
 .devenv*
 devenv.local.nix
 devenv.local.yaml
@@ -10,3 +10,6 @@ devenv.local.yaml
 
 # pre-commit
 .pre-commit-config.yaml
+
+# llm harness junk
+.pi

README.md

@@ -0,0 +1,46 @@
+# NixOS Flake Configuration
+
+Personal NixOS configuration, managed as a flake. Deploys to NixOS, macOS (nix-darwin), and home-manager.
+
+## Machines
+
+| Hostname | Nix Target | Purpose |
+|------|----|-------------|
+| **nero** | NixOS | Personal desktop - KDE, gaming (Steam), VR (WiVRn), Flatpak apps |
+| **vergil** | NixOS | Server - Jellyfin, Pi-hole, nginx, remote build node |
+| **pdw-frankiel** | NixOS | Work desktop - KDE, flatpak apps |
+| **franks-macbook-pro** | macOS (nix-darwin) | General-purpose laptop |
+
+## Directory Structure
+
+```
+flake.nix
+hosts/                 <- Host specific confirugration, each host gets its own subdirectory matching it's hostname.
+  shared/              <- Shared components specific to hosts (Trusted SSH keys, shared pkgs, disk layouts).
+features/              <- Portable software feature modules (KDE, Podman, Wine, vim, etc.).
+home/                  <- Home-manager configuration and drop-in config files.
+packages/              <- Custom pkgs outside of nixpkgs or external flakes.
+secrets/               <- SOPS secret store
+assets/                <- Static assets like graphics.
+keys/                  <- SSH and GPG public keys.
+```
+
+### Building and useful commands
+
+```bash
+# Build and switch.
+sudo nixos-rebuild switch --flake .#<HOSTNAME>
+
+# Build and switch if using nix-darwin.
+sudo darwin-rebuild switch --flake .#<HOSTNAME>
+
+# Build but do not switch.
+nix build .#nixosConfigurations.nero.config.system.build.toplevel
+
+# Format all .nix files.
+nixfmt
+```
+
+## Secrets
+
+Secrets are managed with SOPS. The `secrets/` directory contains encrypted files that get decrypted at build time (or when using `sops edit secrets/<NAME>.yaml`. **Never** commit the decrypted versions. In order to successfully build a configuration with secrets, place the correct private age key file in `/persist/sops/age/keys.txt` with the file mask of `0400` prior to building. You can also drop in the `keys.txt` file using nixos-anywhere or other deployment tools. In order to edit sops encrypted files without being root, place the same key file in the user's home directory at `$HOME/.config/sops/age/keys.txt` with the file mask of `0400`. Ensure that you **always** edit secret files with `sops edit secrets/<NAME>.yaml` and that you don't accidentally commit unencrypted secrets.

features/kde.nix

@@ -20,6 +20,7 @@
     };
 
     kdeconnect.enable = true;
+    kde-pim.enable = false;
   };
 
   environment = {
@@ -39,6 +40,8 @@
 
     sessionVariables = {
       SSH_ASKPASS_REQUIRE = "prefer";
+      KWIN_DRM_NO_TRIPLE_BUFFERING = "1";
+      KWIN_ALLOW_VULKAN_MGPU_COPIES = "1";
     };
   };
 }

features/keyd.nix

@@ -0,0 +1,19 @@
+{ _, ... }:
+{
+  services.keyd = {
+    enable = true;
+
+    keyboards = {
+      default = {
+        ids = [ "*" ];
+
+        settings = {
+          main = {
+            capslock = "leftcontrol";
+            insert = "S-insert";
+          };
+        };
+      };
+    };
+  };
+}

features/podman.nix

@@ -0,0 +1,8 @@
+{ _, ... }:
+{
+  virtualisation.podman = {
+    enable = true;
+    dockerCompat = true;
+    defaultNetwork.settings.dns_enabled = true;
+  };
+}

features/sops.nix

@@ -6,12 +6,13 @@ let
 in
 {
   sops = {
-    defaultSopsFile = ../.sops.yaml;
-
     age = {
       sshKeyPaths = [ ];
       keyFile =
-        if pkgs.stdenv.isDarwin then "/usr/local/sops/age/keys.txt" else "/persist/sops/age/keys.txt";
+        if pkgs.stdenv.hostPlatform.isDarwin then
+          "/usr/local/sops/age/keys.txt"
+        else
+          "/persist/sops/age/keys.txt";
     };
 
     secrets = {

features/users.nix

@@ -1,7 +1,12 @@
-{ config, ... }:
+{
+  config,
+  pkgs,
+  ...
+}:
 {
   users = {
     mutableUsers = false;
+    defaultUserShell = pkgs.bash;
 
     users.frank = {
       isNormalUser = true;
@@ -12,6 +17,7 @@
 
       extraGroups = [
         "wheel"
+        "networkmanager"
       ];
     };
   };

features/wine.nix

@@ -6,6 +6,7 @@
     magicOrExtension = "MZ";
     interpreter = lib.getExe pkgs.wineWow64Packages.full;
     wrapInterpreterInShell = false;
+    fixBinary = true;
   };
 
   environment = {

flake.lock

@@ -4,31 +4,27 @@
       "inputs": {
         "corefonts": "corefonts",
         "crane": "crane",
-        "elemental-wine-source": "elemental-wine-source",
-        "fenix": "fenix",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "git-hooks": "git-hooks",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2",
-          "nixpkgs"
-        ],
-        "nixpkgs-wine": "nixpkgs-wine",
         "on-linux": "on-linux",
         "plugin-loader-src": "plugin-loader-src",
-        "plugin-loader-v030-src": "plugin-loader-v030-src",
+        "treefmt-nix": "treefmt-nix",
-        "treefmt-nix": "treefmt-nix"
+        "windows-rs": "windows-rs",
+        "wintypes_shim": "wintypes_shim"
       },
       "locked": {
-        "lastModified": 1791817262,
+        "lastModified": 1792710311,
-        "narHash": "sha256-emQQYtsQu2xpHKwDnyCu3ZiNRhJeQ/QqHeFV5wAixlg=",
+        "narHash": "sha256-Uyd6UpHOZ6ly18cIlWz6HBIw5TfV4lCqVpcr01Lzer0=",
-        "owner": "Meo98",
+        "owner": "mrshmllow",
-        "repo": "affinity-nix-fork",
+        "repo": "affinity-nix",
-        "rev": "266d3ebf76da365f6431bddc493338d1978bb340",
+        "rev": "69c5cb42a7dd596027183776d82bf206d732fc91",
         "type": "github"
       },
       "original": {
-        "owner": "Meo98",
+        "owner": "mrshmllow",
-        "repo": "affinity-nix-fork",
+        "repo": "affinity-nix",
         "type": "github"
       }
     },
@@ -55,11 +51,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792597217,
+        "lastModified": 1793743605,
-        "narHash": "sha256-jawxmQ7cZb15Wo1swnc8cLJy63d+1ocDSPX7vafP6w8=",
+        "narHash": "sha256-P0mEatSGxafaOJq0U2KCXHdLOEVceTx35nFxOp0bBEU=",
         "owner": "kem-a",
         "repo": "AppManager",
-        "rev": "6119148ab8705f21cb1c5abd7b2e506926fbfd4d",
+        "rev": "c42aaeabbc52d24c6be52a38b30057e89507ca9d",
         "type": "github"
       },
       "original": {
@@ -75,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792553252,
+        "lastModified": 1793686912,
-        "narHash": "sha256-3J6IUv6O7YWfFtcy8HmdgQojFvbvHH27WapR1ZYkPbY=",
+        "narHash": "sha256-nnLCzs010xF4pU7UyqcY8M9CNcLmGs6I+1FvCtnCcv4=",
         "owner": "Hy4ri",
         "repo": "cheatengine-flake",
-        "rev": "00d6b8308ce5b6d9dfce0c0dd8f7e676dc15e27b",
+        "rev": "81eb884d5a67eba90c5c690f79d381a1270ce990",
         "type": "github"
       },
       "original": {
@@ -106,11 +102,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1778106249,
+        "lastModified": 1792350552,
-        "narHash": "sha256-cM/AuKy5tMhwOOQIbha8ZRRMHVfNf7cv2aljIw+qoCg=",
+        "narHash": "sha256-292lvpvxTGKryKxh3/3tcIVi85CwYGdl4oOi113Sob8=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "6d015ea29630b7ad2402841386da2cb617a470a7",
+        "rev": "e675a36b7377bebe41d548388a2501cbb16d380d",
         "type": "github"
       },
       "original": {
@@ -119,47 +115,6 @@
         "type": "github"
       }
     },
-    "elemental-wine-source": {
-      "flake": false,
-      "locked": {
-        "host": "gitlab.winehq.org",
-        "lastModified": 1722747031,
-        "narHash": "sha256-XVhz9p2kgFBoJ376vg8OaFXxcMEjAe9AK1hk0I1rb1Q=",
-        "owner": "ElementalWarrior",
-        "repo": "wine",
-        "rev": "a7c9b19e1a26cf49c63a7c19189a3e2bbe2c6ac2",
-        "type": "gitlab"
-      },
-      "original": {
-        "host": "gitlab.winehq.org",
-        "owner": "ElementalWarrior",
-        "ref": "affinity-photo3-wine9.13-part3",
-        "repo": "wine",
-        "type": "gitlab"
-      }
-    },
-    "fenix": {
-      "inputs": {
-        "nixpkgs": [
-          "affinity-nix",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1777969788,
-        "narHash": "sha256-8sr3w0KyQ0K7TEd8pYwYrxiDk0GZ4A7iIcl1lsxlzVM=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "3abc2d5559f4dc30c710ab152abcb4cb60b561ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "locked": {
         "lastModified": 1751685974,
@@ -190,22 +145,6 @@
       }
     },
     "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_4": {
       "locked": {
         "lastModified": 1733328505,
         "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@@ -223,24 +162,6 @@
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
-      "locked": {
-        "lastModified": 1777988971,
-        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
-      },
       "locked": {
         "lastModified": 1790898470,
         "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=",
@@ -315,15 +236,14 @@
     "git-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1776796298,
+        "lastModified": 1791909798,
-        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
+        "narHash": "sha256-VAhpCOmrun/KXimYfR8NM88bciKCui7CqHHhThSzgag=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
+        "rev": "1ba1dbfe28738c9a71c266be6efa5b89e75491a9",
         "type": "github"
       },
       "original": {
@@ -332,53 +252,6 @@
         "type": "github"
       }
     },
-    "git-hooks_2": {
-      "inputs": {
-        "flake-compat": [
-          "nix-gaming",
-          "flake-compat"
-        ],
-        "nixpkgs": [
-          "nix-gaming",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1790500375,
-        "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "affinity-nix",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -386,11 +259,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792668857,
+        "lastModified": 1793757180,
-        "narHash": "sha256-chUrnAqBhBLvXBUsLFxFYBIl8c0GWp06wdjmAMS8l+U=",
+        "narHash": "sha256-gyV7AtCwLnOImcrfSETP4J3Ie96bz19DY47B7m7Y3HM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cb7de2c7e589afe7531d4832c71ad4df144624ea",
+        "rev": "b787c48e2ec57a9d098f5c2721882a3bc1e16f97",
         "type": "github"
       },
       "original": {
@@ -421,45 +294,6 @@
         "type": "github"
       }
     },
-    "millennium": {
-      "inputs": {
-        "millennium-src": "millennium-src",
-        "nixpkgs": "nixpkgs_3",
-        "nixpkgs-bun": "nixpkgs-bun"
-      },
-      "locked": {
-        "dir": "packages/nix",
-        "lastModified": 1792357572,
-        "narHash": "sha256-2krnWSUcN06EYtUKqFxkbSIQP6NAfhMOrgnxZXB+dcc=",
-        "owner": "SteamClientHomebrew",
-        "repo": "Millennium",
-        "rev": "f7a356f6789bc7d23f44bfbcdd95c71f0385cc1a",
-        "type": "github"
-      },
-      "original": {
-        "dir": "packages/nix",
-        "owner": "SteamClientHomebrew",
-        "repo": "Millennium",
-        "type": "github"
-      }
-    },
-    "millennium-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1792357406,
-        "narHash": "sha256-We8OIJP/5q0nv2RVHQYfjRaHK6ZQuSM88eKa9BezUPk=",
-        "owner": "SteamClientHomebrew",
-        "repo": "Millennium",
-        "rev": "88fb7c16d04d162cb3e94beedb11a51705ec03fb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SteamClientHomebrew",
-        "repo": "Millennium",
-        "rev": "88fb7c16d04d162cb3e94beedb11a51705ec03fb",
-        "type": "github"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -467,11 +301,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792667976,
+        "lastModified": 1793418699,
-        "narHash": "sha256-qlW9xfM0TFDIU6wGTXfTZ2xSgvgOlV89YHdvfjQ+e0Q=",
+        "narHash": "sha256-+RpTlcdh9KqZ+ZiLkNSTvibQWm935EcIdBzRPCTFsrQ=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "38cf0abb072c30fff68da0e3f516fc8a7cfb8fc0",
+        "rev": "ff0e21a414d4547183396da1b44a66f2577b65e9",
         "type": "github"
       },
       "original": {
@@ -496,36 +330,13 @@
         "type": "github"
       }
     },
-    "nix-gaming": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "flake-parts": "flake-parts_2",
-        "git-hooks": "git-hooks_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1792469825,
-        "narHash": "sha256-yZzRSNogTrbYjLNHiRMphZGIVcTHbXWSID37oPBbrEw=",
-        "owner": "fufexan",
-        "repo": "nix-gaming",
-        "rev": "0405c59de63e8b74d11dcc420f65ead938ea6ec6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "fufexan",
-        "repo": "nix-gaming",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770073757,
+        "lastModified": 1787631388,
-        "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=",
+        "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "47472570b1e607482890801aeaf29bfb749884f6",
+        "rev": "ac6b2166e7a9375683b8e98f860f273222337b16",
         "type": "github"
       },
       "original": {
@@ -535,22 +346,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-bun": {
-      "locked": {
-        "lastModified": 1790822859,
-        "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
-        "type": "github"
-      }
-    },
     "nixpkgs-darwin-x64": {
       "locked": {
         "lastModified": 1788334797,
@@ -568,21 +363,6 @@
       }
     },
     "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1777168982,
-        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib_2": {
       "locked": {
         "lastModified": 1790477367,
         "narHash": "sha256-oujbxmVKDhci2E4EM3KyAbRUgp5/IsCoiA/LfEF7OOk=",
@@ -597,25 +377,9 @@
         "type": "github"
       }
     },
-    "nixpkgs-wine": {
-      "locked": {
-        "lastModified": 1735834308,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
-        "type": "github"
-      }
-    },
     "nixpkgs-xr": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
         "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
@@ -625,11 +389,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1792380357,
+        "lastModified": 1793768445,
-        "narHash": "sha256-deMmYXMlf7BnA2qSDk3gFqVjBQeBnW8689/qG3aUPAc=",
+        "narHash": "sha256-jMMSzsfPFmsX4d6YEDZqHF2BpJmuSMiMaeyqhHA6vZ8=",
         "owner": "nix-community",
         "repo": "nixpkgs-xr",
-        "rev": "8d169c67d1e73b8721711b3750ef75ba205e7fe1",
+        "rev": "5243cdffccd2b40b76e5116ad498bbbcb629a84f",
         "type": "github"
       },
       "original": {
@@ -640,11 +404,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1770107345,
+        "lastModified": 1791048980,
-        "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=",
+        "narHash": "sha256-KgItSKML8Xvte0B7/uGnBDsYzSnnKHcOaiUbgWBXLXw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4",
+        "rev": "a7868a727837f3c09cee2ce0ca671c76b1589fed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1790149054,
+        "narHash": "sha256-FfjXg6mAzKQBCY+7V9keGWOXG4DV2Eym/qA987lFl8A=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "8825bebf6324e0579d012936eff73379af284b6d",
         "type": "github"
       },
       "original": {
@@ -654,26 +434,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1790769526,
-        "narHash": "sha256-6j4yqqBUvIbBn29k0y/2jqlv/YJd8CRkTBYhfm5Z/8c=",
-        "rev": "c9fe7d12cd78d1adcd12dd15e24432dde5b155a0",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1082837.c9fe7d12cd78/nixexprs.tar.zst?lastModified=1790769526&rev=c9fe7d12cd78d1adcd12dd15e24432dde5b155a0"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst"
-      }
-    },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1792502884,
+        "lastModified": 1793726008,
-        "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=",
+        "narHash": "sha256-jQp1wKvbwWdLBASTXkSi/VYmDJ5AbBi1WvcMt9HWJC8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe",
+        "rev": "1d060086d60cb76a40cf37109f979d88a5bd6396",
         "type": "github"
       },
       "original": {
@@ -716,11 +483,11 @@
     "on-linux": {
       "flake": false,
       "locked": {
-        "lastModified": 1772699425,
+        "lastModified": 1787435510,
-        "narHash": "sha256-xhqkN2I5r+Ty2k8HEsLg5e8Eaazb0Qyioqjs87BQOnY=",
+        "narHash": "sha256-ENn1Xh+JR+6ITt3oe4DC0EiTT2b6PErPQTFPkYQRJBA=",
         "owner": "seapear",
         "repo": "AffinityOnLinux",
-        "rev": "a0c4421946709c24c3f371fcbf15a45b814f188c",
+        "rev": "4dd5635eab8502bd4653e2e478478af04ff84449",
         "type": "github"
       },
       "original": {
@@ -768,23 +535,6 @@
         "type": "github"
       }
     },
-    "plugin-loader-v030-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1775508798,
-        "narHash": "sha256-cD2G3M83wCEXVMMl9YoHMLxPIvbXeESgQTkXiM+lzns=",
-        "owner": "noahc3",
-        "repo": "AffinityPluginLoader",
-        "rev": "bd93bbf9f84735d8ba6538596620bbe8d8b90efd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "noahc3",
-        "ref": "v0.3.0",
-        "repo": "AffinityPluginLoader",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "affinity-nix": "affinity-nix",
@@ -793,10 +543,8 @@
         "cheatengine": "cheatengine",
         "home-manager": "home-manager",
         "lazyvim": "lazyvim",
-        "millennium": "millennium",
         "nix-darwin": "nix-darwin",
         "nix-flatpak": "nix-flatpak",
-        "nix-gaming": "nix-gaming",
         "nixpkgs": "nixpkgs_4",
         "nixpkgs-xr": "nixpkgs-xr",
         "pi": "pi",
@@ -805,23 +553,6 @@
         "xivlauncher-rb": "xivlauncher-rb"
       }
     },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1777924689,
-        "narHash": "sha256-9Z0puLyCSYvtYhP1IZMxC05DSgwA+5rE99jsv1KErc4=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "91c7c2c4ca6a0520cfbf97e369e4fb7bf0b63b7a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
     "scopebuddy": {
       "inputs": {
         "nixpkgs": [
@@ -849,11 +580,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792308394,
+        "lastModified": 1793657466,
-        "narHash": "sha256-r4G33ygU307QCwyngAS6E9BMhnCRPyZrL7UxRCMrqo0=",
+        "narHash": "sha256-GoOvpdsjO5hqZuO6T6ok9u6sJEjO0iPli2zRr9oNUNw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a1438ca361b05d1e70854d5495abcb34fdf6ff47",
+        "rev": "b18e01ce148eb3efff5de2f2d3181ca53b2b2a54",
         "type": "github"
       },
       "original": {
@@ -909,14 +640,14 @@
     },
     "treefmt-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1775636079,
+        "lastModified": 1791885023,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c",
         "type": "github"
       },
       "original": {
@@ -946,6 +677,39 @@
         "type": "github"
       }
     },
+    "windows-rs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1771531570,
+        "narHash": "sha256-UmhpbCd3+0We7JiXFXgcS8jWMnZI2NRqPOs+UOsjrUc=",
+        "owner": "microsoft",
+        "repo": "windows-rs",
+        "rev": "628f84c51645217c7a06a20774ea1275dc7270ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "microsoft",
+        "repo": "windows-rs",
+        "rev": "628f84c51645217c7a06a20774ea1275dc7270ca",
+        "type": "github"
+      }
+    },
+    "wintypes_shim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1750396180,
+        "narHash": "sha256-E3go8SmUkAWrxQnr852WQB0huzdkO7CWiuB8Q2QyMZ4=",
+        "owner": "ElementalWarrior",
+        "repo": "wine-wintypes.dll-for-affinity",
+        "rev": "f8a2d42ba3abc5dcdc584daa6728a2fa019be72e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ElementalWarrior",
+        "repo": "wine-wintypes.dll-for-affinity",
+        "type": "github"
+      }
+    },
     "xivlauncher-core-src": {
       "flake": false,
       "locked": {

flake.nix

@@ -1,6 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    affinity-nix.url = "github:mrshmllow/affinity-nix";
 
     sops-nix = {
       url = "github:Mic92/sops-nix";
@@ -17,20 +18,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    millennium = {
-      url = "github:SteamClientHomebrew/Millennium?dir=packages/nix";
-    };
-
     scopebuddy = {
       url = "github:HikariKnight/ScopeBuddy";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nix-gaming = {
-      url = "github:fufexan/nix-gaming";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     nixpkgs-xr = {
       url = "github:nix-community/nixpkgs-xr";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -41,11 +33,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    affinity-nix = {
-      url = "github:Meo98/affinity-nix-fork";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     nix-flatpak = {
       url = "github:gmodena/nix-flatpak/?ref=latest";
     };
@@ -81,13 +68,12 @@
       self,
       nixpkgs,
       nixpkgs-xr,
+      affinity-nix,
       nix-darwin,
       nix-flatpak,
       home-manager,
-      affinity-nix,
       sops-nix,
       affinity-thumbnailer-kde,
-      millennium,
       cheatengine,
       xivlauncher-rb,
       ...
@@ -104,8 +90,56 @@
       trusted-users-configuration = { nix, config, ... }: {
         nix.settings.trusted-users = [ config.users.users.frank.name ];
       };
+
+      systems = [
+        "x86_64-linux"
+        "aarch64-darwin"
+      ];
+
+      forAllSystems = nixpkgs.lib.genAttrs systems;
+
+      packagesFor =
+        system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+        nixpkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
+          heidisql = pkgs.callPackage ./packages/heidisql/package.nix { };
+          aseprite-thumbnailer-kde = pkgs.callPackage ./packages/aseprite-thumbnailer-kde/package.nix { };
+        };
+
+      formatterFor =
+        system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+        pkgs.writeShellApplication {
+          name = "nixfmt";
+          runtimeInputs = [ pkgs.nixfmt ];
+          text = ''
+            flags=()
+            paths=()
+            for arg in "$@"; do
+              case "$arg" in
+                -*) flags+=("$arg") ;;
+                *) paths+=("$arg") ;;
+              esac
+            done
+            if [ "''${#paths[@]}" -eq 0 ]; then
+              if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+                mapfile -t paths < <(git ls-files '*.nix')
+              else
+                mapfile -t paths < <(find . -name '*.nix' -not -path './.devenv/*')
+              fi
+            fi
+            nixfmt "''${flags[@]}" "''${paths[@]}"
+          '';
+        };
     in
     {
+      packages = forAllSystems packagesFor;
+
+      formatter = forAllSystems formatterFor;
       nixosConfigurations = {
         nero = nixpkgs.lib.nixosSystem {
           specialArgs = { inherit inputs; };

home/frank.nix

@@ -11,7 +11,33 @@
     ../features/home-env.nix
   ];
 
-  home.shellAliases = import ../features/aliases.nix { inherit pkgs; };
+  home = {
+    stateVersion = "26.05";
+    shellAliases = import ../features/aliases.nix { inherit pkgs; };
+    packages = with pkgs; [ ticker ];
+
+    file = {
+      ".ticker.yaml".text = ''
+        show-summary: true
+        show-tags: true
+        show-fundamentals: true
+        show-separator: true
+        show-positions: true
+        interval: 5
+        currency: USD
+        currency-summary-only: false
+        watchlist:
+          - AAPL
+          - GOOG
+          - INTC
+          - AMD
+          - MSFT
+          - ^IXIC
+          - ^GSPC
+          - ^DJI
+      '';
+    };
+  };
 
   xdg =
     if pkgs.stdenv.hostPlatform.isDarwin then
@@ -111,11 +137,25 @@
       enable = true;
       enableDefaultConfig = false;
 
-      settings."*" = {
+      settings = {
-        IdentityFile = [
+        "*" = {
-          osConfig.sops.secrets."personal_ssh_key_ed25519".path
+          IdentityFile = [
-          osConfig.sops.secrets."work_ssh_key_rsa".path
+            osConfig.sops.secrets."personal_ssh_key_ed25519".path
-        ];
+            osConfig.sops.secrets."work_ssh_key_rsa".path
+          ];
+        };
+
+        "daguerro.net" = {
+          User = "almalinux";
+        };
+
+        "panel.daguerro.net" = {
+          User = "floturcocantsee";
+        };
+
+        "voffice.picerne.com" = {
+          User = "pdcadmin";
+        };
       };
     };
 
@@ -133,23 +173,6 @@
         '';
       };
 
-      plugins = {
-        colorscheme = ''
-          return {
-            {
-              "LazyVim/LazyVim",
-              opts = { colorscheme = "tokyonight-day" },
-            },
-            {
-              "folke/tokyonight.nvim",
-              lazy = false,
-              priority = 1000,
-              opts = { style = "day" },
-            },
-          }
-        '';
-      };
-
       extras = {
         lang = {
           nix.enable = true;
@@ -198,6 +221,4 @@
       hinting = "slight";
     };
   };
-
-  home.stateVersion = "26.05";
 }

hosts/nero/configuration.nix

@@ -9,19 +9,13 @@
     ../shared/nixos-pc.nix
     ../../features/kde.nix
     ../../features/flatpak.nix
+    ../../features/keyd.nix
   ];
 
   nixpkgs.overlays = [
-    inputs.millennium.overlays.default
     inputs.cheatengine.overlays.default
   ];
 
-  boot = {
-    kernelParams = [
-      "video=DP-2:1152x864@75"
-    ];
-  };
-
   networking.hostName = "nero";
 
   services = {
@@ -31,6 +25,10 @@
 
     flatpak = {
       packages = [
+        {
+          appId = "org.comfy.ComfyDesktop";
+          origin = "flatpark";
+        }
         {
           appId = "com.discordapp.Discord";
           origin = "flathub";
@@ -47,10 +45,6 @@
           appId = "com.vysp3r.ProtonPlus";
           origin = "flathub";
         }
-        {
-          appId = "org.ghidra_sre.Ghidra";
-          origin = "flathub";
-        }
         {
           appId = "io.github.ryubing.Ryujinx";
           origin = "flathub";
@@ -74,7 +68,6 @@
 
     steam = {
       enable = true;
-      package = pkgs.millennium-steam;
       remotePlay.openFirewall = true;
       extraPackages = [ pkgs.hidapi ];
     };
@@ -107,20 +100,12 @@
     ];
   };
 
-  virtualisation.docker.daemon.settings.features.cdi = true;
-
   environment = {
-    sessionVariables = {
-      AVALONIA_SCREEN_SCALE_FACTORS = "HDMI-A-1=2.0;DP-1=2.0;DP-2=2.0;DP-3=2.0";
-    };
-
     systemPackages = with pkgs; [
       mangohud
       gamescope
       gamescope-wsi
       cheatengine
-      lsfg-vk
-      lsfg-vk-ui
       qbittorrent
       aseprite
 

hosts/nero/hardware.nix

@@ -27,23 +27,6 @@
     extraModulePackages = [ ];
   };
 
-  fileSystems."/mnt/fileshare" = {
-    device = "frank@vergil.cfl.rr.com:/mnt/shares";
-    fsType = "sshfs";
-
-    options = [
-      "uid=1000"
-      "gid=1000"
-      "default_permissions"
-      "allow_other"
-      "_netdev"
-      "x-systemd.automount"
-      "reconnect"
-      "ServerAliveInterval=15"
-      "IdentityFile=${config.sops.secrets.personal_ssh_key_ed25519.path}"
-    ];
-  };
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
   hardware = {

hosts/pdw-frankiel/configuration.nix

@@ -6,6 +6,7 @@
     ../shared/nixos-pc.nix
     ../../features/kde.nix
     ../../features/flatpak.nix
+    ../../features/keyd.nix
   ];
 
   boot = {
@@ -22,23 +23,6 @@
   services = {
     printing.enable = true;
 
-    keyd = {
-      enable = true;
-
-      keyboards = {
-        default = {
-          ids = [ "*" ];
-
-          settings = {
-            main = {
-              capslock = "leftcontrol";
-              insert = "S-insert";
-            };
-          };
-        };
-      };
-    };
-
     flatpak = {
       packages = [
         {

hosts/shared/nixos-pc.nix

@@ -1,13 +1,12 @@
 {
   pkgs,
-  lib,
   inputs,
   ...
 }:
 {
   imports = [
     ../../features/nix-ld.nix
-    ../../features/docker.nix
+    ../../features/podman.nix
     ../../features/vim.nix
     ../../features/avahi.nix
     ../../features/systemd-boot.nix
@@ -19,6 +18,8 @@
     ./nix-package-manager.nix
   ];
 
+  nixpkgs.overlays = [ inputs.affinity-nix.overlays.default ];
+
   boot = {
     consoleLogLevel = 3;
 
@@ -28,10 +29,6 @@
       "rd.systemd.show_status=auto"
     ];
 
-    initrd = {
-      verbose = false;
-    };
-
     kernelModules = [
       "ntsync"
     ];
@@ -53,6 +50,10 @@
   services = {
     flatpak = {
       packages = [
+        {
+          appId = "com.blackmagic.Resolve";
+          origin = "flatpark";
+        }
         {
           appId = "io.github.HakanSeven12.OpenCadStudio";
           origin = "flatpark";
@@ -72,8 +73,8 @@
       snapshotInterval = "hourly";
       cleanupInterval = "1d";
       configs = {
-        home = {
+        nixos = {
-          SUBVOLUME = "/home";
+          SUBVOLUME = "/";
           TIMELINE_CREATE = true;
           TIMELINE_CLEANUP = true;
           TIMELINE_LIMIT_HOURLY = "10";
@@ -105,7 +106,6 @@
       enable = true;
       pulse.enable = true;
       alsa.enable = true;
-      alsa.support32Bit = lib.mkForce false;
     };
 
     openssh = {
@@ -160,19 +160,6 @@
     };
   };
 
-  nixpkgs = {
-    # Fix msitools compiling and failing it's test-suite.
-    overlays = [
-      (final: prev: {
-        msitools = prev.msitools.overrideAttrs (old: {
-          doCheck = false;
-        });
-      })
-
-      inputs.affinity-nix.overlays.default
-    ];
-  };
-
   environment = {
     systemPackages =
       import ../../features/common-pkgs.nix { inherit pkgs; }
@@ -184,13 +171,15 @@
         hunspell
         hunspellDicts.en_US
         hyphenDicts.en_US
-        affinity-v3
         libreoffice-qt
         qimgv
         mpv
         vorta
         distrobox
         rtk
+        inkscape
+        affinity-v3
+        unsloth-desktop
 
         inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default
         inputs.pi.packages.${pkgs.stdenv.hostPlatform.system}.default