.gitattributes

@@ -1,2 +1,4 @@
-/etcnixos/secrets/** filter=git-crypt diff=git-crypt
+etcnixos/secrets/secureboot.tar filter=git-crypt diff=git-crypt
-/home-manager/secrets/** filter=git-crypt diff=git-crypt
+etcnixos/secrets/wifi-passwords.nix filter=git-crypt diff=git-crypt
+etcnixos/secrets/disk-password filter=git-crypt diff=git-crypt
+etcnixos/secrets/password-hash filter=git-crypt diff=git-crypt

etcnixos/common.nix

@@ -31,13 +31,11 @@
   hardware.enableRedistributableFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
 
-  services.kmscon.enable = true;
-
   services.greetd = {
     enable = true;
     settings = {
       default_session = {
-        command = "${lib.getExe pkgs.tuigreet} --time --cmd niri-session";
+        command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session";
         user = username;
       };
     };

etcnixos/system-mreow.nix

@@ -27,6 +27,24 @@
   # PST
   # time.timeZone = lib.mkForce "America/Los_Angeles";
 
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session";
+        user = username;
+      };
+    };
+  };
+
+  system.activationScripts = {
+    # FIX: https://github.com/NixOS/nix/issues/2982
+    "profile-channel-dummy".text = ''
+      #!/bin/sh
+      mkdir -p /nix/var/nix/profiles/per-user/root/channels
+    '';
+  };
+
   # weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
   # if I move to another lock screen program, i will have to replace `swaylock`
   security.pam.services.swaylock = { };

flake.lock

@@ -62,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762997295,
+        "lastModified": 1762938833,
-        "narHash": "sha256-/4kxhVbD/wHVVg9B2srm1NzXEEmEI239JwMtyNYgZQQ=",
+        "narHash": "sha256-DAyy8XG0qsbv6JZ+AXTcEA+b9W//pQnNQJBiOzdOO/0=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "4897d454109bd9965a8372363169a5b676753094",
+        "rev": "d144aad6de2aeccf61ba8e3283059f95b93acb24",
         "type": "github"
       },
       "original": {
@@ -141,15 +141,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1762964643,
+        "lastModified": 1758463745,
-        "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
+        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "827f2a23373a774a8805f84ca5344654c31f354b",
+        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -299,16 +300,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1762844143,
+        "lastModified": 1762756533,
-        "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
+        "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
+        "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -361,11 +362,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763001554,
+        "lastModified": 1762915112,
-        "narHash": "sha256-wsfhRTuxu6f06RMmP4JWcq3wWRlmYtQaJZ6b3f+EJ94=",
+        "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "315d97eb753cee8e1aa039a5e622b84d32a454bb",
+        "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02",
         "type": "github"
       },
       "original": {
@@ -432,11 +433,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763007974,
+        "lastModified": 1762903129,
-        "narHash": "sha256-XMgjrDIHonLqIjc1eMQkLeemGcNqqYU0Dq+zNmeMYOI=",
+        "narHash": "sha256-4vxtwKSBiiJ950ccLo8kQvBGwyNjhglOgWI5b/sjGXY=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "eff1c79c78950ebb4ce70c3d51513e294cf30b52",
+        "rev": "d03a5917aef22219df1f97b6da6fe5b8039be8de",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,7 +2,7 @@
   description = "System nixOS flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
 
     lanzaboote = {
       url = "github:nix-community/lanzaboote";
@@ -13,7 +13,7 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

home-manager/gui.nix

@@ -62,7 +62,7 @@
 
         #fonts
         noto-fonts
-        noto-fonts-color-emoji
+        noto-fonts-emoji
         liberation_ttf
 
         #for ebook reading

home-manager/no-gui.nix

@@ -114,7 +114,6 @@ in
   imports = [
     ./progs/fish.nix
     ./progs/helix.nix
-    ./progs/opencode.nix
     (
       { ... }:
       {
@@ -158,7 +157,7 @@ in
         ffmpeg-full
 
         # microcontroller tooling
-        probe-rs-tools
+        probe-rs
 
         (python312.withPackages (
           ps: with ps; [
@@ -227,19 +226,20 @@ in
   programs.git = {
     enable = true;
     package = pkgs.git;
+    userName = "Simon Gardling";
+    userEmail = "titaniumtown@proton.me";
+
+    # better way to view diffs
+    delta.enable = true;
 
     lfs.enable = true;
 
-    settings = {
+    extraConfig = {
       init = {
         # master -> main
         defaultBranch = "main";
       };
       push.autoSetupRemote = true;
-      user = {
-        name = "Simon Gardling";
-        email = "titaniumtown@proton.me";
-      };
     };
 
     # gpg signing keys
@@ -248,10 +248,4 @@ in
       signByDefault = true;
     };
   };
-
-  # better way to view diffs
-  programs.delta = {
-    enable = true;
-    enableGitIntegration = true;
-  };
 }

home-manager/progs/eww/config/statusbar.yuck

@@ -79,7 +79,7 @@
     :text "${bluetooth-name} 󰂯")))
 
 ; `FNR == 1 + head -c 30` so the name doesn't explode the screen
-(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk '$1 == "Device" {print $0}' | cut -d' ' -f3-`)
+(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk 'FNR == 1 {print substr($0,1,30)}'`)
 
 (defwidget time []
   (box

home-manager/progs/opencode.nix

@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  programs.opencode = {
-    enable = true;
-    rules = "";
-    settings = {
-      theme = "opencode";
-      model = "moonshotai/kimi-k2-thinking";
-      autoshare = false;
-      autoupdate = true;
-      provider = {
-        openrouter = {
-          models = {
-            # put models here
-          };
-          options = {
-            # TODO! use agenix here instead
-            apiKey = "{file:${../secrets/openrouter_api_key}}";
-          };
-        };
-      };
-    };
-  };
-}