add flake-parts

.gitignore

@@ -1,2 +0,0 @@
-result*
-.gcroots

README.md

@@ -1,5 +1,3 @@
-see TODO.md for my aspirations
-
 ## usage
 
 ### install

TODO.md

@@ -1,20 +0,0 @@
-- add other remote
-- fully automate remote provisioning (remote keys)
-- fix ipv6 on remotes
-- modularize home manager
-- add services?
-    - 0x0
-    - forgejo
-    - matrix homeserver
-    - matrix webclient
-    - radicale
-    - tor relay
-    - wireguard as vpn
-- add home functionality
-    - better term emulator
-    - switch browser?
-        - chromium: much better sandboxing
-        - ladybird: be an early tester, contribute
-        - glide: sexier tridactyl implementation
-        - browsh: the GOAT
-    - get mouse out of here

flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1770165109,
+        "lastModified": 1762618334,
-        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
+        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
+        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
         "type": "github"
       },
       "original": {
@@ -132,11 +132,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1764873433,
+        "lastModified": 1764724327,
-        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
+        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
+        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
         "type": "github"
       },
       "original": {
@@ -148,15 +148,15 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1767039857,
+        "lastModified": 1761588595,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "NixOS",
+        "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "edolstra",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -180,58 +180,15 @@
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
-          "nur",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
+        "lastModified": 1765835352,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nvf",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1767609335,
-        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
         "type": "github"
       },
       "original": {
@@ -269,11 +226,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772893680,
+        "lastModified": 1763988335,
-        "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
+        "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
+        "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
         "type": "github"
       },
       "original": {
@@ -308,11 +265,11 @@
       "flake": false,
       "locked": {
         "host": "gitlab.gnome.org",
-        "lastModified": 1767737596,
+        "lastModified": 1764524476,
-        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
+        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
+        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
         "type": "gitlab"
       },
       "original": {
@@ -351,32 +308,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774007980,
+        "lastModified": 1766980997,
-        "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=",
+        "narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9670de2921812bc4e0452f6e3efd8c859696c183",
+        "rev": "7a7b43c7231a439d248179ba8d561dd6cd81799b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_3": {
-      "inputs": {
-        "nixpkgs": [
-          "impermanence",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1768598210,
-        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
         "type": "github"
       },
       "original": {
@@ -386,16 +322,12 @@
       }
     },
     "impermanence": {
-      "inputs": {
-        "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs"
-      },
       "locked": {
-        "lastModified": 1769548169,
+        "lastModified": 1737831083,
-        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
+        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
+        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
         "type": "github"
       },
       "original": {
@@ -406,11 +338,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1770419553,
+        "lastModified": 1758834834,
-        "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
+        "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
+        "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
         "type": "github"
       },
       "original": {
@@ -421,42 +353,22 @@
     },
     "ndg": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2"
-          "nvf",
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1768214250,
+        "lastModified": 1765720983,
-        "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
+        "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
         "owner": "feel-co",
         "repo": "ndg",
-        "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
+        "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
         "type": "github"
       },
       "original": {
         "owner": "feel-co",
-        "ref": "refs/tags/v2.6.0",
         "repo": "ndg",
         "type": "github"
       }
     },
-    "nix-zulip": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1772926346,
-        "narHash": "sha256-fk8lfYmpXtBLzpJb9f97fYzKXcNflA5CYdYEJD1SDoY=",
-        "ref": "refs/heads/main",
-        "rev": "995e67ff510f413bd0d21af2137159c283223985",
-        "revCount": 80,
-        "type": "git",
-        "url": "https://git.afnix.fr/nix-zulip/nix-zulip"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.afnix.fr/nix-zulip/nix-zulip"
-      }
-    },
     "nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
@@ -467,11 +379,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774001769,
+        "lastModified": 1766321686,
-        "narHash": "sha256-6y8yLrMecnFq21wFlUSxHF7OsabVCCj2p104HEUosvI=",
+        "narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "05968d7978faaa501836d6d2eb7f6cffb4140829",
+        "rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3",
         "type": "gitlab"
       },
       "original": {
@@ -482,11 +394,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1768564909,
+        "lastModified": 1766651565,
-        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
+        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
+        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
         "type": "github"
       },
       "original": {
@@ -498,15 +410,15 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1773821835,
+        "lastModified": 1764242076,
-        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -534,17 +446,19 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "flake-parts": [
+          "flake-parts"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1774121134,
+        "lastModified": 1767026366,
-        "narHash": "sha256-2rY/WUuZEtQ7St3AcFw6dri4oYyBJvr/dnZdpOPe1oM=",
+        "narHash": "sha256-TqJXPpEPYfeFCbraquNdrB1dJYuEqV474Npv8UcNxrs=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "4fe0420f495cdcd730969de67f75f44d2a5bb71f",
+        "rev": "1f8c02a96c58c0dd90f2de45440b9ef01571abc3",
         "type": "github"
       },
       "original": {
@@ -565,11 +479,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767810917,
+        "lastModified": 1764773531,
-        "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
+        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
+        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
         "type": "github"
       },
       "original": {
@@ -581,7 +495,9 @@
     "nvf": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": [
+          "flake-parts"
+        ],
         "mnw": "mnw",
         "ndg": "ndg",
         "nixpkgs": [
@@ -590,11 +506,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1774109759,
+        "lastModified": 1766596669,
-        "narHash": "sha256-Ksvw+R+kwCr+liA4h+TtQaYSW/0Jl+NDMThU5TBsJIY=",
+        "narHash": "sha256-9C72hpMDa99n4MbqZqsBkrBQZe+HEN9lnu7Sme67nmU=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "4f1074084eb86e8d8a32e19e78f3cf2adba0213e",
+        "rev": "ef1f22efaf4aa37ba9382a7d1807fa8ac9c097fd",
         "type": "github"
       },
       "original": {
@@ -610,11 +526,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774120611,
+        "lastModified": 1766543224,
-        "narHash": "sha256-QZ09cfZnPiF62BgNqVTxEbFtnBjYaBVuhZNdos9ggnE=",
+        "narHash": "sha256-96PBoNqh3sPU9t+IXxcB1OjjuQ8HOv42OOh9UtwFHbU=",
         "owner": "celenityy",
         "repo": "Phoenix",
-        "rev": "df5a6d30c792c0b17017510b35db93e94fb9e6a1",
+        "rev": "f09568c8a71af4fe42dd43c6f711c67daf605f1e",
         "type": "github"
       },
       "original": {
@@ -626,11 +542,11 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "flake-parts": "flake-parts",
         "home-manager": "home-manager_2",
         "impermanence": "impermanence",
-        "nix-zulip": "nix-zulip",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "noshell": "noshell",
         "nur": "nur",
         "nvf": "nvf",
@@ -645,7 +561,9 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": [
+          "flake-parts"
+        ],
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"
@@ -659,11 +577,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1773792048,
+        "lastModified": 1766603026,
-        "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=",
+        "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1",
+        "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430",
         "type": "github"
       },
       "original": {
@@ -753,11 +671,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1767710407,
+        "lastModified": 1763914658,
-        "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
+        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
+        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
         "type": "github"
       },
       "original": {
@@ -769,11 +687,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1767489635,
+        "lastModified": 1764465359,
-        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
+        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
+        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
         "type": "github"
       },
       "original": {
@@ -785,11 +703,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1767488740,
+        "lastModified": 1764464512,
-        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
+        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
+        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,6 +4,10 @@
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    flake-parts = {
+      url = "github:hercules-ci/flake-parts";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -14,10 +18,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nix-zulip = {
-      url = "git+https://git.afnix.fr/nix-zulip/nix-zulip";
-      flake = false;
-    };
     noshell = {
       url = "github:viperML/noshell";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -25,10 +25,12 @@
     nur = {
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
     };
     nvf = {
       url = "github:notashelf/nvf";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
     };
     phoenix = {
       url = "github:celenityy/Phoenix";
@@ -37,15 +39,16 @@
     stylix = {
       url = "github:nix-community/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
     };
   };
-  outputs = {
+  outputs = inputs @ {
     agenix,
+    flake-parts,
     home-manager,
     impermanence,
     nixos-mailserver,
     nixpkgs,
-    nix-zulip,
     noshell,
     nur,
     nvf,
@@ -53,7 +56,6 @@
     stylix,
     ...
   }: let
-    nix-zulip' = (import "${nix-zulip}/nix/default.nix" {}).output;
     machines = import ./machines.nix;
     configuration = machine: modules:
       nixpkgs.lib.nixosSystem {
@@ -62,32 +64,25 @@
         modules =
           modules
           ++ [
+            ./machines/${machine.hostname}/configuration.nix
             ./users.nix
             ./secrets.nix
-            ./modules/nixos/common.nix
-            agenix.nixosModules.default
             impermanence.nixosModules.impermanence
+            agenix.nixosModules.default
             nixos-mailserver.nixosModule
-            noshell.nixosModules.default
-            nix-zulip'.nixosModules.zulip
             phoenix.nixosModules.default
-            ({pkgs, ...}: {
-              nixpkgs.overlays = [
-                agenix.overlays.default
-                nur.overlays.default
-                nix-zulip'.overlays.default
           ];
-            })
-          ]
-          ++ machine.modules;
       };
     configurationWithHomeManager = machine: (configuration machine
       [
         home-manager.nixosModules.home-manager
         {
+          nixpkgs.overlays = [
+            agenix.overlays.default
+            nur.overlays.default
+          ];
           home-manager.useGlobalPkgs = true;
           home-manager.extraSpecialArgs = {inherit machine;};
-          home-manager.backupFileExtension = "bak";
           home-manager.users =
             builtins.mapAttrs
             (name: value: value)
@@ -106,11 +101,19 @@
               )
             );
         }
+        noshell.nixosModules.default
       ]);
-  in {
+  in
-    nixosConfigurations =
+    flake-parts.lib.mkFlake {inherit inputs;} (top @ {
+      config,
+      withSystem,
+      moduleWithSystem,
+      ...
+    }: {
+      systems = ["x86_64-linux"];
+      flake.nixosConfigurations =
         builtins.mapAttrs
         (hostname: value: configurationWithHomeManager value)
         machines;
-  };
+    });
 }

hardware-configuration.nix

@@ -1,24 +0,0 @@
-# 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 + "/profiles/qemu-guest.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  # 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.ens18.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}

machines.nix

@@ -2,74 +2,14 @@
   lenovo = {
     hostname = "lenovo";
     system = "x86_64-linux";
-    users = ["andromeda"];
+    users = [
-    modules = [
+      "andromeda"
-      # impermanence
+      "mtgmonkey"
-      ./modules/nixos/impermanence.nix
-      ./modules/nixos/impermanence-ssh.nix
-
-      # hardware configuration
-      # includes `system.stateVersion`
-      ./modules/nixos/machines/lenovo.nix
-      ./modules/nixos/zram.nix
-
-      # boot process
-      # systemd-boot
-      ./modules/nixos/boot/lenovo.nix
-
-      # networking
-      ./modules/nixos/laptop.nix
-
-      # vpn
-      # ./modules/nixos/openvpn-client.nix
-
-      # ly display manager
-      ./modules/nixos/ly.nix
-
-      # sway window manager
-      ./modules/nixos/sway.nix
-
-      # apps
-      # UNFREE
-      ./modules/nixos/steam.nix
-
-      # substitutors
-      ./substitutors.nix
     ];
   };
   "109-199-104-83" = {
     hostname = "109-199-104-83";
     system = "x86_64-linux";
     users = [];
-    modules = [
-      # hardware configuration
-      # from gitlab:whitequark/nixos-bite
-      ./modules/nixos/machines/109-199-104-83.nix
-
-      # networking
-      ./modules/nixos/networking/domains/galaxious.de.nix
-
-      # ssh through port 5522 among other things
-      # andromeda@lenovo is the only user allowed access
-      ./modules/nixos/networking/hard-ssh.nix
-      ({config, ...}: {users.users.root.openssh.authorizedKeys.keys = [config.pub-keys.ssh.andromeda];})
-
-      # simple-nixos-mailserver email server
-      # mail.domain
-      ./modules/nixos/mailserver.nix
-
-      # roundcube webmail client
-      # webmail.domain
-      ./modules/nixos/roundcube.nix
-
-      # BROKEN
-      # forgejo
-      # git.domain
-      # ./modules/nixos/forgejo.nix
-
-      # zulip chat client
-      # chat.domain
-      # ./modules/nixos/zulip.nix
-    ];
   };
 }

machines/109-199-104-83/configuration.nix

@@ -0,0 +1,90 @@
+{
+  config,
+  modulesPath,
+  machine,
+  ...
+}: {
+  # roundcube config
+  services.roundcube = {
+    enable = true;
+    hostName = "webmail.${config.networking.domain}";
+    extraConfig = ''
+      $config['imap_host'] = "ssl://${config.mailserver.fqdn}";
+      $config['smtp_host'] = "ssl://${config.mailserver.fqdn}";
+      $config['smtp_user'] = "%u";
+      $config['smtp_pass'] = "%p";
+    '';
+  };
+
+  # mailserver config
+  mailserver = {
+    enable = true;
+    stateVersion = 3;
+    fqdn = "mail.${config.networking.domain}";
+    domains = ["${config.networking.domain}"];
+    x509.useACMEHost = config.mailserver.fqdn;
+    loginAccounts = {
+      "test@${config.networking.domain}" = {
+        hashedPasswordFile = builtins.toString config.age.secrets.secret3.path;
+      };
+    };
+  };
+
+  # cert config
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = "mtgmonket@gmail.com";
+  };
+  services.nginx = {
+    enable = true;
+    virtualHosts."mail.${config.networking.domain}" = {
+      forceSSL = true;
+      enableACME = true;
+    };
+  };
+
+  # system config
+  system.stateVersion = "25.11";
+  nix.settings.experimental-features = ["flakes" "nix-command"];
+  imports = [(modulesPath + "/profiles/qemu-guest.nix")];
+  fileSystems."/" = {
+    device = "/dev/sda1";
+    fsType = "ext4";
+  };
+  boot.loader.grub.device = "/dev/sda";
+  boot.loader.timeout = 30;
+  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront"];
+  boot.initrd.kernelModules = ["nvme"];
+  boot.tmp.cleanOnBoot = true;
+  zramSwap.enable = true;
+  networking = {
+    useNetworkd = true;
+    usePredictableInterfaceNames = true;
+    hostName = machine.hostname;
+    domain = "galaxious.de";
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [80 443];
+      allowedUDPPorts = [80 443];
+    };
+  };
+  systemd.network = {
+    enable = true;
+    networks."40-wan" = {
+      matchConfig.Name = "enx0050565f4fff";
+      address = ["2a02:c207:2299:8419::1/64" "109.199.104.83/20"];
+      routes = [
+        {
+          Gateway = "109.199.96.1";
+          GatewayOnLink = true;
+        }
+        {Gateway = "fe80::1";}
+      ];
+      dns = ["2620:fe::fe" "9.9.9.9"];
+    };
+  };
+  services.openssh.enable = true;
+  users.mutableUsers = false;
+  users.users.root.openssh.authorizedKeys.keys = [config.pub-keys.ssh.andromeda];
+  programs.noshell.enable = true;
+}

machines/lenovo/configuration.nix

@@ -1,17 +1,70 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
+  machine,
   ...
 }: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+  imports = [
+    ./impermanence.nix
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+  age.secrets = {
+    secret0.file = ../../secrets/secret0.age;
+    secret1.file = ../../secrets/secret1.age;
+  };
+  boot.loader = {
+    efi.canTouchEfiVariables = true;
+    systemd-boot.enable = true;
+  };
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+  };
+  i18n.defaultLocale = "de_DE.UTF-8";
+  networking = {
+    dhcpcd.enable = true;
+    firewall.enable = true;
+    hostName = machine.hostname;
+    networkmanager.enable = true;
+  };
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
+      "steam"
+      "steam-original"
+      "steam-unwrapped"
+      "steam-run"
+    ];
+  programs = {
+    noshell.enable = true;
+    steam.enable = true;
+    sway.enable = true;
+  };
+  services = {
+    blueman.enable = true;
+    displayManager = {
+      enable = true;
+      ly.enable = true;
+    };
+    libinput.enable = true;
+    openssh.enable = true;
+    printing.enable = true;
+  };
+  system.stateVersion = "26.05";
+  time.timeZone = "Europe/Berlin";
   boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "sdhci_pci"];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
   fileSystems."/" = {
+    #device = "none";
+    #fsType = "tmpfs";
+    #options = ["defaults" "size=60%" "mode=755"];
     device = "/dev/disk/by-uuid/5455cfb4-0efd-4f55-b496-d2cab3f419b7";
     fsType = "btrfs";
     options = ["subvol=root"];
@@ -39,12 +92,12 @@
     done
 
     btrfs subvolume create /btrfs_tmp/root
-    mkdir /btrfs_tmp/root/persist
+    mkdir /btrfs_tmp/root/nix
     mkdir /btrfs_tmp/root/etc
-    mount ${config.fileSystems."/persist".device} /btrfs_tmp/root/persist -o subvol=persist
+    mount ${config.fileSystems."/nix".device} /btrfs_tmp/root/nix
-    cp /btrfs_tmp/root/persist/etc/ssh /btrfs_tmp/root/etc/ssh -r
+    cp /btrfs_tmp/root/nix/persist/etc/ssh /btrfs_tmp/root/etc/ssh -r
-    umount /btrfs_tmp/root/persist
+    umount /btrfs_tmp/root/nix
-    rm -r /btrfs_tmp/root/persist
+    rm -r /btrfs_tmp/root/nix
     umount /btrfs_tmp
   '';
 
@@ -53,12 +106,6 @@
     fsType = "btrfs";
   };
 
-  fileSystems."/persist" = {
-    device = "/dev/disk/by-uuid/5455cfb4-0efd-4f55-b496-d2cab3f419b7";
-    fsType = "btrfs";
-    options = ["subvol=persist"];
-  };
-
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/F425-55BA";
     fsType = "vfat";
@@ -69,5 +116,4 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  system.stateVersion = "26.05";
 }

machines/lenovo/impermanence.nix

@@ -1,15 +1,19 @@
 {
-  fileSystems."/persist".neededForBoot = true;
+  environment.persistence."/nix/persist" = {
-  environment.persistence."/persist" = {
     enable = true;
     hideMounts = true;
     directories = [
       "/var/log"
+      "/var/lib/bluetooth"
       "/var/lib/nixos"
       "/var/lib/systemd/coredump"
+      "/etc/NetworkManager/system-connections"
+      "/etc/ssh"
+      "/etc/ly/custom-sessions"
     ];
     files = [
       "/etc/machine-id"
+      "/etc/ly/save.txt"
     ];
   };
 }

modules/nixos/boot/lenovo.nix

@@ -1,6 +0,0 @@
-{
-  boot.loader = {
-    efi.canTouchEfiVariables = true;
-    systemd-boot.enable = true;
-  };
-}

modules/nixos/common.nix

@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  # flakes usage
-  nix.settings.experimental-features = [
-    "flakes"
-    "nix-command"
-  ];
-
-  # allows users to customize shell in `$XDG_CONFIG_HOME/shell` rather than
-  # needing /etc/shells. Useful for home-manager. Falls back.
-  programs.noshell.enable = true;
-
-  # cleans /tmp to maintain a tidy system
-  boot.tmp.cleanOnBoot = true;
-
-  networking.domain = lib.mkDefault config.networking.hostName;
-
-  # disable lecture
-  security.sudo.extraConfig = ''Defaults lecture="never"'';
-
-  # make users immutable
-  users.mutableUsers = false;
-}

modules/nixos/forgejo.nix

@@ -1,27 +0,0 @@
-{config, ...}: {
-  services.nginx = {
-    virtualHosts.${config.services.forgejo.settings.server.DOMAIN} = {
-      forceSSL = true;
-      enableACME = true;
-      extraConfig = ''
-        client_max_body_size 512M
-      '';
-      locations."/".proxyPass = "https://localhost:${builtins.toString config.services.forgejo.settings.server.HTTP_PORT}";
-    };
-  };
-  services.forgejo = {
-    enable = true;
-    database.type = "postgres";
-    lfs.enable = true;
-    settings = {
-      server = rec {
-        DOMAIN = "git.galaxious.de";
-        ROOT_URL = "https://${DOMAIN}";
-        HTTP_PORT = 4043;
-        SSH_PORT = 4022;
-      };
-      service.DISABLE_REGISTRATION = false;
-    };
-  };
-  services.openssh.ports = [config.services.forgejo.settings.server.SSH_PORT];
-}

modules/nixos/impermanence-ssh.nix

@@ -1,4 +0,0 @@
-{
-  # ONLY include this module AFTER a machine has been provisioned
-  environment.persistence."/persist".directories = ["/etc/ssh"];
-}

modules/nixos/laptop.nix

@@ -1,37 +0,0 @@
-{
-  # bluetooth
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-  };
-  services.blueman.enable = true;
-
-  # locale
-  i18n.defaultLocale = "de_DE.UTF-8";
-  time.timeZone = "Europe/Berlin";
-
-  # networking
-  networking = {
-    firewall.enable = true;
-    networkmanager.enable = true;
-  };
-
-  # misc
-  services = {
-    printing.enable = true;
-
-    # trackpad
-    libinput.enable = true;
-
-    # ssh
-    openssh.enable = true;
-  };
-
-  # impermanence
-  environment.persistence."/persist".directories = [
-    # bluetooth
-    "/var/lib/bluetooth"
-    # wifi connections
-    "/etc/NetworkManager/system-connections"
-  ];
-}

modules/nixos/ly.nix

@@ -1,11 +0,0 @@
-{
-  services.displayManager = {
-    enable = true;
-    ly.enable = true;
-  };
-  # TODO needs to be manually updated when new users added
-  environment.persistence."/persist" = {
-    directories = ["/etc/ly/custom-sessions"];
-    files = ["/etc/ly/save.txt"];
-  };
-}

modules/nixos/machines/109-199-104-83.nix

@@ -1,39 +0,0 @@
-{modulesPath, ...}: {
-  system.stateVersion = "25.11";
-  nix.settings.experimental-features = "flakes nix-command";
-
-  # Hardware
-  imports = [(modulesPath + "/profiles/qemu-guest.nix")];
-  fileSystems."/" = {
-    device = "/dev/sda1";
-    fsType = "ext4";
-  };
-  boot.loader.grub.device = "/dev/sda";
-  boot.loader.timeout = 30;
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront"];
-  boot.initrd.kernelModules = ["nvme"];
-  boot.tmp.cleanOnBoot = true;
-
-  zramSwap.enable = true;
-
-  # Networking
-  networking = {
-    useNetworkd = true;
-    usePredictableInterfaceNames = true;
-  };
-  systemd.network = {
-    enable = true;
-    networks."40-wan" = {
-      matchConfig.Name = "enx0050565f4fff";
-      address = ["2a02:c207:2299:8419::1/64" "109.199.104.83/20"];
-      routes = [
-        {
-          Gateway = "109.199.96.1";
-          GatewayOnLink = true;
-        }
-        {Gateway = "fe80::1";}
-      ];
-      dns = ["2020:fe::10" "9.9.9.10"];
-    };
-  };
-}

modules/nixos/mailserver.nix

@@ -1,54 +0,0 @@
-{config, ...}: {
-  mailserver = {
-    enable = true;
-    stateVersion = 3;
-
-    # domain bs
-    fqdn = "mail.${config.networking.domain}";
-    domains = ["${config.networking.domain}"];
-    x509.useACMEHost = config.mailserver.fqdn;
-
-    loginAccounts = {
-      # test acc
-      "test@${config.networking.domain}" = {
-        hashedPasswordFile = builtins.toString config.age.secrets.mailserver-acc-test-pw.path;
-      };
-      "admin@${config.networking.domain}" = {
-        hashedPasswordFile = builtins.toString config.age.secrets.mailserver-acc-admin-pw.path;
-        aliases = ["@${config.networking.domain}"];
-      };
-    };
-  };
-
-  # put dkim key into /etc for declarability
-  mailserver.dkimKeyDirectory = "/etc/dkim";
-  environment.etc."dkim/${config.networking.domain}.${config.mailserver.dkimSelector}.key" = {
-    source = config.age.secrets."dkim-${config.networking.domain}.${config.mailserver.dkimSelector}.key".path;
-    mode = "600";
-    user = config.services.rspamd.user;
-    group = config.services.rspamd.group;
-  };
-
-  # does acme for me
-  services.nginx = {
-    enable = true;
-    virtualHosts = {
-      "mail.${config.networking.domain}" = {
-        forceSSL = true;
-        enableACME = true;
-      };
-      "matrix.${config.networking.domain}" = {
-        forceSSL = true;
-        enableACME = true;
-      };
-      "${config.networking.domain}" = {
-        forceSSL = true;
-        enableACME = true;
-      };
-    };
-  };
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "mtgmonket@gmail.com";
-  };
-}

modules/nixos/networking/domains/galaxious.de.nix

@@ -1,3 +0,0 @@
-{
-  networking.domain = "galaxious.de";
-}

modules/nixos/networking/hard-ssh.nix

@@ -1,18 +0,0 @@
-{
-  services.openssh = {
-    enable = true;
-    allowSFTP = false;
-    ports = [5522];
-    settings = {
-      PasswordAuthentication = false;
-      KbdInteractiveAuthentication = true;
-    };
-    extraConfig = ''
-      AllowTcpForwarding no
-      AllowAgentForwarding no
-      MaxAuthTries 3
-      MaxSessions 4
-      TCPKeepAlive no
-    '';
-  };
-}

modules/nixos/networking/ssh-as-root.nix

@@ -1,3 +0,0 @@
-{lib, ...}: {
-  services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
-}

modules/nixos/roundcube.nix

@@ -1,12 +0,0 @@
-{config, ...}: {
-  services.roundcube = {
-    enable = true;
-    hostName = "webmail.${config.networking.domain}";
-    extraConfig = ''
-      $config['imap_host'] = "ssl://${config.mailserver.fqdn}";
-      $config['smtp_host'] = "ssl://${config.mailserver.fqdn}";
-      $config['smtp_user'] = "%u";
-      $config['smtp_pass'] = "%p";
-    '';
-  };
-}

modules/nixos/steam.nix

@@ -1,10 +0,0 @@
-{lib, ...}: {
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [
-      "steam"
-      "steam-original"
-      "steam-unwrapped"
-      "steam-run"
-    ];
-  programs.steam.enable = true;
-}

modules/nixos/sway.nix

@@ -1,3 +0,0 @@
-{
-  programs.sway.enable = true;
-}

modules/nixos/zram.nix

@@ -1,8 +0,0 @@
-{
-  zramSwap = {
-    enable = true;
-    priority = 100;
-    algorithm = "zstd";
-    memoryPercent = 75;
-  };
-}

modules/nixos/zulip.nix

@@ -1,54 +0,0 @@
-{config, ...}: {
-  services.zulip = {
-    enable = true;
-
-    # lets it set up my postgresql for me
-    enablePostgresqlLocally = true;
-
-    # host domain
-    host = "chat.${config.networking.domain}";
-
-    # secrets; head rolled on keyboard for all :)
-    camoKeyFile = builtins.toString config.age.secrets.zulip-camoKey.path;
-    rabbitmqPasswordFile = builtins.toString config.age.secrets.zulip-rabbitmqPassword.path;
-    secretKeyFile = builtins.toString config.age.secrets.zulip-secretKey.path;
-    sharedSecretKeyFile = builtins.toString config.age.secrets.zulip-sharedSecretKey.path;
-    avatarSaltKeyFile = builtins.toString config.age.secrets.zulip-avatarSaltKey.path;
-
-    # TODO check for parity with `mailserver-acc-admin-pw.age`
-    extraSecrets.email_password = builtins.toString config.age.secrets.zulip-extraSecrets-email_password.path;
-
-    # settings
-    zulipSettings = rec {
-      # email users
-      ZULIP_ADMINISTRATOR = "admin@${config.networking.domain}";
-      EMAIL_HOST_USER = ZULIP_ADMINISTRATOR;
-
-      # configure mailserver port
-      EMAIL_HOST = config.mailserver.fqdn;
-      EMAIL_USE_SSL = true;
-      EMAIL_PORT = 465;
-
-      # setting to allow realm creation; probably unsafe, might delete later :3
-      OPEN_REALM_CREATION = true;
-
-      # send all noreply emails from `admin@galaxious.de`
-      # TODO configure admin to send from any address
-      ADD_TOKENS_TO_NOREPLY_ADDRESS = false;
-      NOREPLY_EMAIL_ADDRESS = ZULIP_ADMINISTRATOR;
-
-      # domain name
-      EXTERNAL_HOST = config.services.zulip.host;
-    };
-  };
-  # persist
-  environment.persistence."/persist".directories = [
-    # messages
-    "/var/lib/rabbitmq"
-    # uploads
-    "/var/lib/zulip"
-
-    # contrived, but in the store a couple layers down
-    # "/var/lib/redis-zulip"
-  ];
-}

modules/template.nix

@@ -1,11 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [];
-  options = {};
-  config = {};
-}

pub-keys.nix

@@ -1,24 +1,15 @@
 {
   age.secrets = {
-    andromeda-pw.file = ./secrets/andromeda-pw.age;
+    secret0.file = ./secrets/secret0.age;
-    conduit-secretFile.file = ./secrets/conduit-secretFile.age;
+    secret1.file = ./secrets/secret1.age;
-    "dkim-galaxious.de.mail.key".file = ./secrets/dkim-galaxious.de.mail.key.age;
+    secret2.file = ./secrets/secret2.age;
-    mtgmonkey-pw.file = ./secrets/mtgmonkey-pw.age;
+    secret3.file = ./secrets/secret3.age;
-    mailserver-acc-test-pw.file = ./secrets/mailserver-acc-test-pw.age;
-    mailserver-acc-admin-pw.file = ./secrets/mailserver-acc-admin-pw.age;
-    "mailserver-acc-zulip+admin-pw".file = "${./secrets}/mailserver-acc-zulip+admin-pw.age";
-    zulip-avatarSaltKey.file = ./secrets/zulip-avatarSaltKey.age;
-    zulip-camoKey.file = ./secrets/zulip-camoKey.age;
-    zulip-extraSecrets-email_password.file = ./secrets/zulip-extraSecrets-email_password.age;
-    zulip-rabbitmqPassword.file = ./secrets/zulip-rabbitmqPassword.age;
-    zulip-secretKey.file = ./secrets/zulip-secretKey.age;
-    zulip-sharedSecretKey.file = ./secrets/zulip-sharedSecretKey.age;
   };
   pub-keys = {
     ssh = {
       andromeda = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJy2VD362wUcu0lKj2d6OIU8dbAna0Lu/NaAYIj8gdIA andromeda@lenovo";
       lenovo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHG4eqsLTq2os2mxfwhys3BpVnowcJrqt2CbRFzN2pJb root@lenovo";
-      _109-199-104-83 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBH5TA6Br8K4xTjD5YcXQDh4UQSvuE0lEs1UxUytDiAn root@109-199-104-83";
+      _109-199-104-83 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJe5ol56yC23fivSEKeK4HZQm934ROX46AM7o0aE2hMq root@vmi2998419";
     };
   };
 }

secrets/andromeda-pw.age

@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 mT2fyg ixFM7swaItfNnTRVSdTm1wZJ8lHUv7tDOgSXo1OpgCc
-lf8/ChfcpgYkK8mTS9Zk++toOu0KNh88S+Lqu4a0UIw
--> ssh-ed25519 UHxfvA hbsRwdzU1IP3K/gH0btUOQ8hZer8Kgq+RqzcEVrCqTE
-iSVh+yeypHoalRhaRM2XMlBvtO8HCyatDnWgUyC3GWU
---- hcs6DJZRvjoKDPI/cjUXRfM7+06PNJvWqjkvJof/bSs
-Boƒp‡Qlg-§\§=Æ™	Ú¼ðÛÒÙsv½Ì~×ÚOÔí{R
x×IErô–s§1„¯v¹÷Ü:<–
-i¶Ÿ×1¾v»„KùÑýé¦*Ú |£ ¶–´Ÿñ5[{­\Ó

secrets/conduit-secretFile.age

@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 mT2fyg x0n1JToeD7bRsDYJpv0HFzQYB9YxxiSqt+dG6elG1Eg
-vspLec9Vm6fvJnlDGjzezThc1qeIYyWncBxYwsE/6rg
--> ssh-ed25519 UHxfvA nOlZo53SINXJs8tt/vdoiGjMnIW/lYZVdI8TJfAFqxE
-XlxvrHDFlm8c7odfNbBw0/QeYuCj5e4VValql5JNNgg
--> ssh-ed25519 yXDKAA Rf+obXBUKxOcMqrb6rlOSfZGyjkj1PnRvHUSDToj6Tw
-XV/3FmC48Wcg9r3C5soRKBwOcBgat2ueAa8pU1MUYLE
---- l/eEq13iyiddR9Rgf47Mv8JxPfjINwCnU4pd3KyxMVQ
-^P%ÔϦ‚Û}ÌÝM¤Ñù&ߢهóQ¬?d^ØYú	Ã~øTuÃï±oÍfž´·7¬nÙ'!'͓ㆆµ]d͇0>vÆÇŸ¸Ü.Ÿ€E]˜šÔ‡|‰>d— *wDÉ<44>‹¿­à<C2AD>›­)cH<63>êÁ@W<>v*šWk<57>õéN¤ÎRßF	I@¶ê;9=u¬–Í’¬°°Ï„Œ,
—‘©)Ÿ>bÁÝ:O«Jð=´W

secrets/mailserver-acc-test-pw.age

@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 mT2fyg at6Q9eK1o8Mk0+fJh+mnIVrvV1tASV+PGuV8MXuwR2c
-cm3wvsLAemeeTFok7yBocNlfwewKruPnymG+wsT5g+Y
--> ssh-ed25519 UHxfvA aaQqfrUfUnLzwUVT6nCRPIAVlIhIWAJcPyeg3J6BQUI
-4sh8ZV14csafSs8yAtFZIccSkiz6YnseV3DJcuhw7dQ
--> ssh-ed25519 yXDKAA KmwRbJURujQhlqOIVxzlVjyvaYRfyuJAVGWMZdkFaAE
-mX083o2XdnnYgqLs5NeppwMbFHDHTucMiHHZuYdzLvo
---- Ay/SP2CXGOhSzO4KoiXFQhJMMdHaecxXOtNkGBK/RO0
- Zÿ? á†‹ˆB¾æFØ9_N`¶È8Õ÷å&<26>Îï@ëŽ)q€7–aìO

secrets/mailserver-acc-zulip+admin-pw.age

@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 mT2fyg sRu0FIphSJVMBcC02mo1YuZdy3i2+/jMeN3ROvxp4kM
-sEwx23t3IAauISKesq+110ZKRKxQv3Zesd0AJufYOLs
--> ssh-ed25519 UHxfvA +YaJGPRT7nX2CqVzw1ixNLpW7MfzEnj44pSwj4iUwhI
-E2U6Q+4uesNCWK7uVSztrA84TU/n/xLFm3PJH0hO/EM
--> ssh-ed25519 yXDKAA V2kygl0BK/oYpKnnheslBO2YqXFdQWFgtqfmDNdgolc
-NpJNN4nfrbgOav8Y38C9DwKFZH+QTRp/US/8kyo9m0o
---- LdqtfywtHOAy3AZ7AexZU0TJMU/ugq+ZYN07706rNxY
-±
-U$âApµnG NeÉ•£u y`!<21>ʤ®•Øf;ipvÙYˆ°V_3»ºN+±éªk#¨{û…ŽÊêWÑ*Ÿn(Å•ËÎú‹Õ»G6ÒÉ݈yc`<60>éqµ:$K]?Í—b=§'ü^Ï9

secrets/mtgmonkey-pw.age

@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 mT2fyg WZNwnBmikWIb4rlH89iIQHouM7cw07/E/KXz/AVv3V8
-FxLaO1zM0aGztJAsq+lgrM8gFogKY76Wcs1vYxhA19g
--> ssh-ed25519 UHxfvA YIpS5r25kHVJtG3+kDVUvAPyTKDsRPG/jHwXmiD44SA
-FKAmC669aQzSbjBjbQbzCixdqnCXnb/JJRQo2MgEZgw
---- xvwJ5oYHR3T1D44fl/aeAVjZglnKhq0JKZr9YecC3EE
- owÌMÆÍÀ·{Œ8ãm€$/Ì1Åö0øts®‹ÞX±ýˆå¡ñ±Cד‡´ƒÏ\•hõ-}¹•E,É ŽÑ¦,dxdX¥TAkäÄ•

secrets/secret0.age

@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 mT2fyg 4fCTrNibFdjnVfsIbXi6plbd56K8ZDDqtgryXPk2SUA
+vKlbDi+HpyYlSsN39GRh6GRwdHRSjypCEqguOaHPFDM
+-> ssh-ed25519 UHxfvA RqrDa4xJoAy1Gdzvq6Z5eTSNTDtHzUmzRoLC+j+HxiI
++5CohUFSDB9oiLU0T25FKrQrz07DCviVuzZsVcUltOc
+--- SQ5zQx9lL5UdNinOgP6yG5WWiBdhSwFqJVt6u3SNpLA
+î6<EFBFBD>©ç¥UÛð¦pî<70>‡„øÚúQÙ]ÜNû;K;1yœµ™

secrets/secret3.age

@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> ssh-ed25519 mT2fyg slLOkD/9TAYOuZ/g5U4NvPWUlmYZeie12xzggioviw0
+E0uAj4RMgv7DTJpvtEO54G9XHNLFOgFflR54Cl6/X8g
+-> ssh-ed25519 UHxfvA xHFujOdegur0PLNHZP+h5RxHhVD2K906NZx7nprMkUs
+PdDxzD5QBdE/yWPMnF+CDGROEpE4nYvg12v1G3QK9XI
+-> ssh-ed25519 Xoin5w YWsO9HtEFB79+aKr6eWi5Sg5geKfzT+IrDy2L5qEmx4
+sXLRmcRDyAv64nSGs8QXcHmKYO+F11Pzea1EVGmpEys
+--- Sjg8SqkkEEL4X0G1GOUoHO702ZtrM0hMniIdS7yIsDA
+'ÏBâÉ(<28>–7DÏ“=ù³h•áÊh	fëÉ®×xT Ž!K.»‰‚~سò,…ß“<C39F>D|éä+pû<70>ü"Òt‚ÝG¢yñQ¬ÏRcPÁQüúQßÐ

secrets/secrets.nix

@@ -4,30 +4,8 @@ let
   lenovo = pub-keys.ssh.lenovo;
   _109-199-104-83 = pub-keys.ssh._109-199-104-83;
 in {
-  # user passwords
+  "secret0.age".publicKeys = [andromeda lenovo];
-  "andromeda-pw.age".publicKeys = [andromeda lenovo];
+  "secret1.age".publicKeys = [andromeda lenovo];
-  "mtgmonkey-pw.age".publicKeys = [andromeda lenovo];
+  "secret2.age".publicKeys = [andromeda lenovo _109-199-104-83];
-
+  "secret3.age".publicKeys = [andromeda lenovo _109-199-104-83];
-  # contains the following env
-  # CONDUIT_JWT_SECRET
-  # CONDUIT_TURN_SECRET
-  "conduit-secretFile.age".publicKeys = [andromeda lenovo _109-199-104-83];
-
-  # dkim private keys
-  "dkim-galaxious.de.mail.key.age".publicKeys = [andromeda lenovo _109-199-104-83];
-
-  # mail account passwords
-  "mailserver-acc-test-pw.age".publicKeys = [andromeda lenovo _109-199-104-83];
-  "mailserver-acc-admin-pw.age".publicKeys = [andromeda lenovo _109-199-104-83];
-  "mailserver-acc-zulip+admin-pw.age".publicKeys = [andromeda lenovo _109-199-104-83];
-
-  # zulip keys
-  "zulip-avatarSaltKey.age".publicKeys = [andromeda lenovo _109-199-104-83];
-  "zulip-camoKey.age".publicKeys = [andromeda lenovo _109-199-104-83];
-  "zulip-rabbitmqPassword.age".publicKeys = [andromeda lenovo _109-199-104-83];
-  "zulip-secretKey.age".publicKeys = [andromeda lenovo _109-199-104-83];
-  "zulip-sharedSecretKey.age".publicKeys = [andromeda lenovo _109-199-104-83];
-
-  # zulip-secrets.conf values
-  "zulip-extraSecrets-email_password.age".publicKeys = [andromeda lenovo _109-199-104-83];
 }

secrets/zulip-camoKey.age

@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 mT2fyg 5ADzKAtycqfFpqW/dp71FTaK2gchzdWFNqxPyZ6deSY
-+aISA4YwF1l9S0fmE84wOvAJpM221bwPDYvXELTVv9k
--> ssh-ed25519 UHxfvA uKYcpPbaXA4r1OmlkuiIu/EqQ3IiHR7JpItnVgTaW2g
-LjySgI4mTlaZY81IJc6DmBh43l2qeGlQnZi+rOlbtb8
--> ssh-ed25519 yXDKAA TMwoM06ZJsjkZ7eLguxqYB05jcRn+tTgVzE7WQIf0mw
-vKwCkWsywGsgVv6Y278Mi28MhCYBRRUnfg4+EouOw+0
---- CScrim9wya9AhElXBtKBR3XBZDL83/g3MTfdF258GJ8
-K#Ð>8}cã§Ï}8‡ÅL¹(Ëôcò¶
-Üw1ª"O“Ù

secrets/zulip-extraSecrets-email_password.age

@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 mT2fyg IOcD4r19Gx2AvjusnnJDHQXr/U4Ti6qKr01I9lNQDQE
-fCwouMQPvhkyzehszuv0YhSfNh9zGKaFNDKaTZT0rD0
--> ssh-ed25519 UHxfvA e95raPehUz6T2FR/eT8kzfrxt/Ou6kKsqi7z/3BkfwU
-uHymqnY3t7IwpxWkN8xen3Vsy6R7VMoj+fR0zPnPinY
--> ssh-ed25519 yXDKAA nlR1prGysW+k8gq2npEiboFqoo9jKQ5ISxRiiCFlb0s
-kaGOvlQgO0nOAl12mMKvafa9ezmy8XdUC2tVPuBG4iw
---- MRFAGURoyediqNSjGxr57a0w6n9lH2zVjfyrUZcyAYw
-
-zä0

substitutors.nix

@@ -1,8 +0,0 @@
-{
-  # spectrum
-  nix.settings.substituters = ["https://cache.dataaturservice.se/spectrum/"];
-  nix.settings.trusted-public-keys = [
-    "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-    "spectrum-os.org-2:foQk3r7t2VpRx92CaXb5ROyy/NBdRJQG2uX2XJMYZfU="
-  ];
-}

users.nix

@@ -3,7 +3,9 @@
   lib,
   machine,
   ...
-}: {
+}: let
+  machines = import ./machines.nix;
+in {
   users.users =
     builtins.mapAttrs
     (name: value: lib.mkIf (builtins.elem name machine.users) value)
@@ -11,32 +13,42 @@
       "andromeda" = {
         isNormalUser = true;
         description = "andromeda";
-        hashedPasswordFile = builtins.toString config.age.secrets.andromeda-pw.path;
+        hashedPasswordFile = builtins.toString config.age.secrets.secret0.path;
         extraGroups = [
           "networkmanager"
           "wheel"
         ];
       };
+      "mtgmonkey" = {
+        isNormalUser = true;
+        description = "mtgmonkey";
+        hashedPasswordFile = builtins.toString config.age.secrets.secret1.path;
+        extraGroups = [
+          (lib.mkIf
+            (machine == machines.lenovo)
+            "networkmanager")
+          "wheel"
+        ];
+        openssh.authorizedKeys.keys = [
+          (lib.mkIf
+            (machine == machines."109-199-104-83")
+            config.pub-keys.ssh.andromeda)
+        ];
       };
-  environment.persistence."/persist".users = lib.mkIf config.environment.persistence."/persist".enable (
+    };
+  environment.persistence."/nix/persist".users = lib.mkIf config.environment.persistence."/nix/persist".enable (
     builtins.mapAttrs
     (name: value: lib.mkIf (builtins.elem name machine.users) value)
     {
       "andromeda" = {
         directories = [
           ".backups"
-          ".gnupg"
-          ".local/share/AAAAXY"
           ".local/share/Anki2"
           ".local/share/chat.fluffy.fluffychat"
-          ".local/share/Mindustry"
+          ".local/share.zoxide"
-          ".local/share/Steam"
-          ".local/share/zoxide"
           ".ssh"
-          ".steam"
           "conf"
           "Downloads"
-          "conf_v1"
           "pp"
         ];
         files = [
@@ -44,6 +56,16 @@
           ".brush_history"
         ];
       };
+      "mtgmonkey" = {
+        directories = [
+          ".local/share/zoxide"
+          ".ssh"
+        ];
+        files = [
+          ".bash_history"
+          ".brush_history"
+        ];
+      };
     }
   );
 }

users/andromeda/home.nix

@@ -16,6 +16,82 @@
         "${config.home.homeDirectory}/${background-path}"
       ];
     };
+  sway_config' = builtins.toFile "sway_config" ''
+    set $mod Mod4
+    set $left h
+    set $down j
+    set $up k
+    set $right l
+    set $term alacritty
+    set $menu wmenu-run
+    set $screenshot grim -g "$(slurp)"
+    floating_modifier $mod normal
+
+    workspace_layout stacking
+    output * bg ${config.home.homeDirectory}/${background-path} fill
+
+    # launch programs
+    bindsym $mod+Shift+Return exec $term
+    bindsym $mod+Shift+d exec $menu
+    bindsym $mod+Shift+a exec anki
+    bindsym $mod+Shift+q exec librewolf
+    bindsym $mod+Shift+s exec $screenshot
+
+    bindsym $mod+Shift+c kill
+
+    bindsym $mod+Shift+r reload
+
+    bindsym $mod+Shift+Alt+q exit
+
+    bindsym $mod+$left focus left
+    bindsym $mod+$down focus down
+    bindsym $mod+$up focus up
+    bindsym $mod+$right focus right
+
+    bindsym $mod+Shift+$left move left
+    bindsym $mod+Shift+$down move down
+    bindsym $mod+Shift+$up move up
+    bindsym $mod+Shift+$right move right
+
+    bindsym $mod+1 workspace number 1
+    bindsym $mod+2 workspace number 2
+    bindsym $mod+3 workspace number 3
+    bindsym $mod+4 workspace number 4
+    bindsym $mod+5 workspace number 5
+    bindsym $mod+6 workspace number 6
+    bindsym $mod+7 workspace number 7
+    bindsym $mod+8 workspace number 8
+    bindsym $mod+9 workspace number 9
+    bindsym $mod+0 workspace number 0
+
+    bindsym $mod+Shift+1 move container to workspace number 1
+    bindsym $mod+Shift+2 move container to workspace number 2
+    bindsym $mod+Shift+3 move container to workspace number 3
+    bindsym $mod+Shift+4 move container to workspace number 4
+    bindsym $mod+Shift+5 move container to workspace number 5
+    bindsym $mod+Shift+6 move container to workspace number 6
+    bindsym $mod+Shift+7 move container to workspace number 7
+    bindsym $mod+Shift+8 move container to workspace number 8
+    bindsym $mod+Shift+9 move container to workspace number 9
+    bindsym $mod+Shift+0 move container to workspace number 0
+
+    bindsym $mod+f fullscreen
+    bindsym $mod+Shift+space floating toggle
+    bindsym $mod+Shift+minus move scratchpad
+    bindsym $mod+minus scratchpad show
+
+    bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+    bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+    bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
+    bindsym --locked XF86AudioMicMute exec pact set-source-mute \@DEFAULT_SOURCE@ toggle
+    bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
+    bindsym --locked XF86MonbrightnessUp exec brightnessctl set 5%+
+
+    default_border none
+    font pango:monospace 0.001
+    titlebar_border_thickness 0
+    titlebar_padding 0
+  '';
 in {
   imports = [./stylix.nix];
   xdg.configFile."shell".source = lib.getExe pkgs.brush;
@@ -26,7 +102,6 @@ in {
     homeDirectory = "/home/${config.home.username}";
     stateVersion = "26.05";
     packages = [
-      pkgs.aaaaxy
       pkgs.acpi
       pkgs.agenix
       pkgs.alacritty
@@ -36,13 +111,10 @@ in {
       pkgs.dust
       pkgs.fluffychat
       pkgs.fzf
-      pkgs.geeqie
       pkgs.glow
       pkgs.grim
       pkgs.jmtpfs
-      pkgs.mindustry-wayland
       pkgs.nix-output-monitor
-      pkgs.npins
       pkgs.ranger
       pkgs.rip2
       pkgs.ripgrep
@@ -95,30 +167,6 @@ in {
       };
     };
     fastfetch.enable = true;
-    firefox = {
-      enable = true;
-      package = pkgs.firefox.override {
-        cfg.enableTridactylNative = true;
-      };
-      profiles.${config.home.username} = {
-        extensions = {
-          force = true;
-          packages = [
-            pkgs.nur.repos.rycee.firefox-addons.tridactyl
-          ];
-        };
-        search = {
-          default = "DuckDuckGo (HTML)";
-          privateDefault = "DuckDuckGo (HTML)";
-          order = [
-            "DuckDuckGo (HTML)"
-          ];
-        };
-        settings = {
-          "extensions.autoDisableScopes" = 0;
-        };
-      };
-    };
     git = {
       enable = true;
       settings = {
@@ -130,10 +178,16 @@ in {
       };
     };
     gh.enable = true;
-    gpg = {
-      enable = true;
-    };
     home-manager.enable = true;
+    firefox = {
+      enable = true;
+      package = pkgs.firefox.override {
+        cfg.enableTridactylNative = true;
+      };
+      profiles.${config.home.username}.extensions.packages = [
+        pkgs.nur.repos.rycee.firefox-addons.tridactyl
+      ];
+    };
     lsd.enable = true;
     nvf = {
       enable = true;
@@ -205,12 +259,6 @@ in {
             enable = true;
             lsp.enable = true;
           };
-          rust = {
-            enable = true;
-            format.enable = true;
-            lsp.enable = true;
-            treesitter.enable = true;
-          };
         };
         lineNumberMode = "relative";
         options = {
@@ -228,8 +276,4 @@ in {
     };
     ssh.enable = true;
   };
-  services.gpg-agent = {
-    enable = true;
-    pinentry.package = pkgs.pinentry-curses;
-  };
 }

users/andromeda/sway_config

@@ -55,12 +55,6 @@ bindsym $mod+Shift+8 move container to workspace number 8
 bindsym $mod+Shift+9 move container to workspace number 9
 bindsym $mod+Shift+0 move container to workspace number 0
 
-seat * hide_cursor 100
-input type:touchpad events disabled
-
-bindsym $mod+r exec 'swaymsg "seat * hide_cursor 100"; swaymsg "input type:touchpad events disabled"'
-bindsym $mod+t exec 'swaymsg "seat * hide_cursor 0"; swaymsg "input type:touchpad events enabled"'
-
 bindsym $mod+f fullscreen
 bindsym $mod+Shift+space floating toggle
 bindsym $mod+Shift+minus move scratchpad
@@ -70,8 +64,8 @@ bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
 bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
 bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
 bindsym --locked XF86AudioMicMute exec pact set-source-mute \@DEFAULT_SOURCE@ toggle
-bindsym --locked XF86MonBrightnessDown exec brightnessctl set 2%-
+bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
-bindsym --locked XF86MonbrightnessUp exec brightnessctl set 2%+
+bindsym --locked XF86MonbrightnessUp exec brightnessctl set 5%+
 
 default_border none
 font pango:monospace 0.001

users/mtgmonkey/home.nix

@@ -0,0 +1,172 @@
+{
+  config,
+  lib,
+  machine,
+  pkgs,
+  ...
+}: {
+  imports = [./stylix.nix];
+  xdg.configFile."shell".source = lib.getExe pkgs.brush;
+  home = {
+    username = "mtgmonkey";
+    homeDirectory = "/home/${config.home.username}";
+    stateVersion = "26.05";
+    packages = [
+      pkgs.acpi
+      pkgs.brightnessctl
+      pkgs.brush
+      pkgs.dust
+      pkgs.fzf
+      pkgs.glow
+      pkgs.jmtpfs
+      pkgs.nix-output-monitor
+      pkgs.ranger
+      pkgs.rip2
+      pkgs.ripgrep
+      pkgs.tree
+      pkgs.zoxide
+    ];
+  };
+  programs = {
+    bash = {
+      enable = true;
+      shellAliases = {
+        neofetch = "fastfetch";
+        ls = lib.mkForce "lsd";
+        ll = lib.mkForce "lsd -l";
+        l = "lsd -la";
+        cd = "z";
+        gg = "git log --oneline --abbrev-commit --all --graph --decorate --color";
+        md = "glow";
+      };
+      bashrcExtra = ''
+        PS1="\u@\h:\w$"
+        eval "$(zoxide init bash)"
+      '';
+    };
+    btop = {
+      enable = true;
+      settings = {
+        theme_background = false;
+        vim_keys = true;
+        rounded_corners = false;
+        graph_symbol = "braille";
+        update_ms = 150;
+        proc_sorting = "cpu lazy";
+        proc_gradient = false;
+        proc_left = true;
+        cpu_single_graph = true;
+        cpu_bottom = true;
+        clock_format = "/user@/host:/uptime@%H:%M";
+        background_update = true;
+        mem_graphs = false;
+        mem_below_net = true;
+        show_swap = false;
+        only_physical = true;
+        show_io_stat = true;
+        io_mode = false;
+        io_graph_combined = false;
+      };
+    };
+    fastfetch.enable = true;
+    git = {
+      enable = true;
+      settings = {
+        user = {
+          name = config.home.username;
+          email = "${config.home.username}@${machine.hostname}";
+        };
+        init.defaultBranch = "master";
+      };
+    };
+    gh.enable = true;
+    home-manager.enable = true;
+    lsd.enable = true;
+    nvf = {
+      enable = true;
+      settings.vim = {
+        autocomplete.nvim-cmp.enable = false;
+        formatter.conform-nvim = {
+          enable = true;
+          setupOpts.format_on_save = {
+            lsp_format = "fallback";
+            timeout_ms = 5000;
+          };
+        };
+        lsp.otter-nvim.enable = true;
+        git.enable = true;
+        keymaps = [
+          {
+            key = "<Down>";
+            mode = ["i" "n" "v" "c"];
+            action = "<NOP>";
+          }
+          {
+            key = "<Up>";
+            mode = ["i" "n" "v" "c"];
+            action = "<NOP>";
+          }
+          {
+            key = "<Left>";
+            mode = ["i" "n" "v" "c"];
+            action = "<NOP>";
+          }
+          {
+            key = "<Right>";
+            mode = ["i" "n" "v" "c"];
+            action = "<NOP>";
+          }
+          {
+            key = "jj";
+            mode = ["i"];
+            action = "<Esc>";
+          }
+          {
+            key = "kk";
+            mode = ["i"];
+            action = "<Esc>";
+          }
+          {
+            key = "jk";
+            mode = ["i"];
+            action = "<Esc>";
+          }
+          {
+            key = "kj";
+            mode = ["i"];
+            action = "<Esc>";
+          }
+          {
+            key = "<Esc>";
+            mode = ["i"];
+            action = "<Nop>";
+          }
+        ];
+        languages = {
+          nix = {
+            enable = true;
+            format.enable = true;
+            lsp.enable = true;
+          };
+          haskell = {
+            enable = true;
+            lsp.enable = true;
+          };
+        };
+        lineNumberMode = "relative";
+        options = {
+          tabstop = 2;
+          shiftwidth = 2;
+          expandtab = true;
+          smarttab = true;
+          foldmethod = "indent";
+          number = true;
+          colorcolumn = "80";
+        };
+        statusline.lualine.enable = true;
+        syntaxHighlighting = true;
+      };
+    };
+    ssh.enable = true;
+  };
+}

users/mtgmonkey/stylix.nix

@@ -0,0 +1,29 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  stylix = {
+    enable = true;
+    # rebecca has lavener bkg
+    # tube has dark gray bkg
+    # silk-light is light theme
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-hard.yaml";
+    polarity = "dark";
+    fonts = {
+      monospace = {
+        package = pkgs.miracode;
+        name = "Miracode";
+      };
+      serif = config.stylix.fonts.sansSerif;
+      emoji = {
+        package = pkgs.noto-fonts-color-emoji;
+        name = "Noto Color Emoji";
+      };
+      sizes = {
+        applications = 12;
+        terminal = 10;
+      };
+    };
+  };
+}