bump anki-cli

.gitignore

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

README.md

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

TODO.md

@@ -0,0 +1,20 @@
+- 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

deploy.sh

@@ -1,5 +0,0 @@
-# usage:
-# $ ./deploy.sh <hostname> <ip>
-# example usage:
-# $ ./deply.sh 109-199-104-83 109.199.104.83
-nix run github:nix-community/nixos-anywhere -- --generate-hardware-config nixos-generate-config ./hardware-configuration.nix --flake .?ref=411ee0c#$1 --target-host root@$2

flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1762618334,
+        "lastModified": 1770165109,
-        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
+        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
+        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
         "type": "github"
       },
       "original": {
@@ -23,6 +23,28 @@
         "type": "github"
       }
     },
+    "anki-cli": {
+      "inputs": {
+        "fenix": "fenix",
+        "naersk": "naersk",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776540672,
+        "narHash": "sha256-D43SN81mM21icdtK/9JDwaXsIhFv+gm4G8KXhJDCxsQ=",
+        "ref": "refs/heads/master",
+        "rev": "bcd83506ea691861562ade66ce23f57b27e57ee2",
+        "revCount": 12,
+        "type": "git",
+        "url": "https://git.mtgmonkey.net/Andromeda/anki-cli.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.mtgmonkey.net/Andromeda/anki-cli.git"
+      }
+    },
     "base16": {
       "inputs": {
         "fromYaml": "fromYaml"
@@ -129,35 +151,59 @@
         "type": "github"
       }
     },
-    "disko": {
+    "fenix": {
       "inputs": {
         "nixpkgs": [
+          "anki-cli",
           "nixpkgs"
-        ]
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1746728054,
+        "lastModified": 1776153734,
-        "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
+        "narHash": "sha256-QvkVX4Go+BnNgQQLc5Ma3WNBZOG5Jpdqsy8Ri0/CbSQ=",
         "owner": "nix-community",
-        "repo": "disko",
+        "repo": "fenix",
-        "rev": "ff442f5d1425feb86344c028298548024f21256d",
+        "rev": "a8b0e62fb39299fbeb1aa365f4b57e2c258a178e",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "latest",
+        "repo": "fenix",
-        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "fenix_2": {
+      "inputs": {
+        "nixpkgs": [
+          "anki-cli",
+          "naersk",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src_2"
+      },
+      "locked": {
+        "lastModified": 1752475459,
+        "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
         "type": "github"
       }
     },
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1764724327,
+        "lastModified": 1764873433,
-        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
+        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
+        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
         "type": "github"
       },
       "original": {
@@ -169,15 +215,15 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
+        "lastModified": 1767039857,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -227,11 +273,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760948891,
+        "lastModified": 1769996383,
-        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
@@ -248,11 +294,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763759067,
+        "lastModified": 1767609335,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
         "type": "github"
       },
       "original": {
@@ -290,11 +336,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763988335,
+        "lastModified": 1772893680,
-        "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
+        "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
+        "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
         "type": "github"
       },
       "original": {
@@ -329,11 +375,11 @@
       "flake": false,
       "locked": {
         "host": "gitlab.gnome.org",
-        "lastModified": 1764524476,
+        "lastModified": 1767737596,
-        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
+        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
         "type": "gitlab"
       },
       "original": {
@@ -372,11 +418,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1766980997,
+        "lastModified": 1774007980,
-        "narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=",
+        "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7a7b43c7231a439d248179ba8d561dd6cd81799b",
+        "rev": "9670de2921812bc4e0452f6e3efd8c859696c183",
+        "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,12 +453,16 @@
       }
     },
     "impermanence": {
+      "inputs": {
+        "home-manager": "home-manager_3",
+        "nixpkgs": "nixpkgs"
+      },
       "locked": {
-        "lastModified": 1737831083,
+        "lastModified": 1769548169,
-        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
+        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
+        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
         "type": "github"
       },
       "original": {
@@ -402,11 +473,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1758834834,
+        "lastModified": 1770419553,
-        "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
+        "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
+        "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
         "type": "github"
       },
       "original": {
@@ -415,20 +486,46 @@
         "type": "github"
       }
     },
-    "ndg": {
+    "naersk": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "fenix": "fenix_2",
+        "nixpkgs": [
+          "anki-cli",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1765720983,
+        "lastModified": 1776193198,
-        "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
+        "narHash": "sha256-U4w4GpgYt72z8pBKMDaqzlnPJRxI9pn+8tr7SOAxocE=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "e4e2ee6c9af67ecd4abb102fc32b9e49c70d92ff",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
+    "ndg": {
+      "inputs": {
+        "nixpkgs": [
+          "nvf",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768214250,
+        "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
         "owner": "feel-co",
         "repo": "ndg",
-        "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
+        "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
         "type": "github"
       },
       "original": {
         "owner": "feel-co",
+        "ref": "refs/tags/v2.6.0",
         "repo": "ndg",
         "type": "github"
       }
@@ -436,11 +533,11 @@
     "nix-zulip": {
       "flake": false,
       "locked": {
-        "lastModified": 1764583012,
+        "lastModified": 1772926346,
-        "narHash": "sha256-6ht4dtI1TBDAaB/Tatq+FcPexaZTBWuRiJGnioCDx5c=",
+        "narHash": "sha256-fk8lfYmpXtBLzpJb9f97fYzKXcNflA5CYdYEJD1SDoY=",
         "ref": "refs/heads/main",
-        "rev": "a9dd0f80d775745f1d88055f24d944562db97c5e",
+        "rev": "995e67ff510f413bd0d21af2137159c283223985",
-        "revCount": 67,
+        "revCount": 80,
         "type": "git",
         "url": "https://git.afnix.fr/nix-zulip/nix-zulip"
       },
@@ -459,11 +556,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766321686,
+        "lastModified": 1774001769,
-        "narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=",
+        "narHash": "sha256-6y8yLrMecnFq21wFlUSxHF7OsabVCCj2p104HEUosvI=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3",
+        "rev": "05968d7978faaa501836d6d2eb7f6cffb4140829",
         "type": "gitlab"
       },
       "original": {
@@ -474,11 +571,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766651565,
+        "lastModified": 1768564909,
-        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
+        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
+        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
         "type": "github"
       },
       "original": {
@@ -490,40 +587,20 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1764242076,
+        "lastModified": 1773821835,
-        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
+        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
+        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "noshell": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1717396029,
-        "narHash": "sha256-NPIhvnTYkJZqTY+aabbZ6CAaMAgG6IISvh7GZo1MTfQ=",
-        "owner": "viperML",
-        "repo": "noshell",
-        "rev": "4d194d838a50ea106cd0e47c024e47afc154ab42",
-        "type": "github"
-      },
-      "original": {
-        "owner": "viperML",
-        "repo": "noshell",
-        "type": "github"
-      }
-    },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -532,11 +609,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767026366,
+        "lastModified": 1774121134,
-        "narHash": "sha256-TqJXPpEPYfeFCbraquNdrB1dJYuEqV474Npv8UcNxrs=",
+        "narHash": "sha256-2rY/WUuZEtQ7St3AcFw6dri4oYyBJvr/dnZdpOPe1oM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "1f8c02a96c58c0dd90f2de45440b9ef01571abc3",
+        "rev": "4fe0420f495cdcd730969de67f75f44d2a5bb71f",
         "type": "github"
       },
       "original": {
@@ -557,11 +634,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764773531,
+        "lastModified": 1767810917,
-        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
+        "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
+        "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
         "type": "github"
       },
       "original": {
@@ -582,11 +659,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1766596669,
+        "lastModified": 1774109759,
-        "narHash": "sha256-9C72hpMDa99n4MbqZqsBkrBQZe+HEN9lnu7Sme67nmU=",
+        "narHash": "sha256-Ksvw+R+kwCr+liA4h+TtQaYSW/0Jl+NDMThU5TBsJIY=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "ef1f22efaf4aa37ba9382a7d1807fa8ac9c097fd",
+        "rev": "4f1074084eb86e8d8a32e19e78f3cf2adba0213e",
         "type": "github"
       },
       "original": {
@@ -602,11 +679,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766543224,
+        "lastModified": 1774120611,
-        "narHash": "sha256-96PBoNqh3sPU9t+IXxcB1OjjuQ8HOv42OOh9UtwFHbU=",
+        "narHash": "sha256-QZ09cfZnPiF62BgNqVTxEbFtnBjYaBVuhZNdos9ggnE=",
         "owner": "celenityy",
         "repo": "Phoenix",
-        "rev": "f09568c8a71af4fe42dd43c6f711c67daf605f1e",
+        "rev": "df5a6d30c792c0b17017510b35db93e94fb9e6a1",
         "type": "github"
       },
       "original": {
@@ -618,19 +695,52 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "disko": "disko",
+        "anki-cli": "anki-cli",
         "home-manager": "home-manager_2",
         "impermanence": "impermanence",
         "nix-zulip": "nix-zulip",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
-        "noshell": "noshell",
         "nur": "nur",
         "nvf": "nvf",
         "phoenix": "phoenix",
         "stylix": "stylix"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1776115521,
+        "narHash": "sha256-N/R1//Xd8vr84LtyTy8CVz7V2n9NJXXlJEODSunLE9c=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "5205b52ea60dd49c7e33dd2ad1a3e7ef55bb30ec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
+    "rust-analyzer-src_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1752428706,
+        "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "stylix": {
       "inputs": {
         "base16": "base16",
@@ -652,11 +762,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1766603026,
+        "lastModified": 1773792048,
-        "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=",
+        "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430",
+        "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1",
         "type": "github"
       },
       "original": {
@@ -746,11 +856,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1763914658,
+        "lastModified": 1767710407,
-        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
+        "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
+        "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
         "type": "github"
       },
       "original": {
@@ -762,11 +872,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1764465359,
+        "lastModified": 1767489635,
-        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
+        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
+        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
         "type": "github"
       },
       "original": {
@@ -778,11 +888,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1764464512,
+        "lastModified": 1767488740,
-        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
+        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
+        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,8 +4,8 @@
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    disko = {
+    anki-cli = {
-      url = "github:nix-community/disko/latest";
+      url = "git+https://git.mtgmonkey.net/Andromeda/anki-cli.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
@@ -22,10 +22,6 @@
       url = "git+https://git.afnix.fr/nix-zulip/nix-zulip";
       flake = false;
     };
-    noshell = {
-      url = "github:viperML/noshell";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nur = {
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -45,13 +41,12 @@
   };
   outputs = {
     agenix,
-    disko,
+    anki-cli,
     home-manager,
     impermanence,
     nixos-mailserver,
     nixpkgs,
     nix-zulip,
-    noshell,
     nur,
     nvf,
     phoenix,
@@ -71,19 +66,20 @@
             ./secrets.nix
             ./modules/nixos/common.nix
             agenix.nixosModules.default
-            disko.nixosModules.disko
             impermanence.nixosModules.impermanence
             nixos-mailserver.nixosModule
-            noshell.nixosModules.default
-            phoenix.nixosModules.default
             nix-zulip'.nixosModules.zulip
-            {
+            phoenix.nixosModules.default
+            ({pkgs, ...}: {
               nixpkgs.overlays = [
                 agenix.overlays.default
                 nur.overlays.default
                 nix-zulip'.overlays.default
+                (self: super: {
+                  anki-cli = anki-cli.packages.${machine.system}.default;
+                })
               ];
-            }
+            })
           ]
           ++ machine.modules;
       };
@@ -93,6 +89,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.extraSpecialArgs = {inherit machine;};
+          home-manager.backupFileExtension = "bak";
           home-manager.users =
             builtins.mapAttrs
             (name: value: value)

machines.nix

@@ -11,6 +11,7 @@
       # hardware configuration
       # includes `system.stateVersion`
       ./modules/nixos/machines/lenovo.nix
+      ./modules/nixos/zram.nix
 
       # boot process
       # systemd-boot
@@ -20,7 +21,7 @@
       ./modules/nixos/laptop.nix
 
       # vpn
-      ./modules/nixos/openvpn-client.nix
+      # ./modules/nixos/openvpn-client.nix
 
       # ly display manager
       ./modules/nixos/ly.nix
@@ -29,7 +30,18 @@
       ./modules/nixos/sway.nix
 
       # apps
+      # UNFREE
       ./modules/nixos/steam.nix
+
+      # substitutors
+      ./substitutors.nix
+
+      {
+        services.guix = {
+          enable = true;
+          stateDir = "/gnu/var";
+        };
+      }
     ];
   };
   "109-199-104-83" = {
@@ -37,28 +49,16 @@
     system = "x86_64-linux";
     users = [];
     modules = [
-      # impermanence
-      ./modules/nixos/impermanence.nix
-      ./modules/nixos/impermanence-ssh.nix
-
       # hardware configuration
-      # verbatim as `nixos-generate-config` AND `system.stateVersion`
+      # from gitlab:whitequark/nixos-bite
       ./modules/nixos/machines/109-199-104-83.nix
-      ./modules/nixos/disko/remote.nix
-
-      # boot process
-      # grub boot on /dev/sda
-      ./modules/nixos/boot/109-199-104-83.nix
 
       # networking
       ./modules/nixos/networking/domains/galaxious.de.nix
-      # uses cloud-init to network
-      ./modules/nixos/networking/networks/109-199-104-83.nix
 
       # ssh through port 5522 among other things
       # andromeda@lenovo is the only user allowed access
       ./modules/nixos/networking/hard-ssh.nix
-      ./modules/nixos/networking/ssh-as-root.nix
       ({config, ...}: {users.users.root.openssh.authorizedKeys.keys = [config.pub-keys.ssh.andromeda];})
 
       # simple-nixos-mailserver email server
@@ -74,10 +74,9 @@
       # git.domain
       # ./modules/nixos/forgejo.nix
 
-      # BROKEN
       # zulip chat client
       # chat.domain
-      ./modules/nixos/zulip.nix
+      # ./modules/nixos/zulip.nix
     ];
   };
 }

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

@@ -1,9 +0,0 @@
-{
-  boot.loader.grub = {
-    efiSupport = true;
-    efiInstallAsRemovable = true;
-  };
-  age.identityPaths = [
-    "/persist/etc/ssh/ssh_host_ed25519_key"
-  ];
-}

modules/nixos/common.nix

@@ -10,8 +10,8 @@
   ];
 
   # allows users to customize shell in `$XDG_CONFIG_HOME/shell` rather than
-  # needing /etc/shells. Useful for home-manager. Falls back.
+  # needing /etc/shells. Useful for home-manager.
-  programs.noshell.enable = true;
+  # programs.noshell.enable = true;
 
   # cleans /tmp to maintain a tidy system
   boot.tmp.cleanOnBoot = true;

modules/nixos/disko/remote.nix

@@ -1,64 +0,0 @@
-{
-  disko.devices = {
-    disk = {
-      disk1 = {
-        device = "/dev/sda";
-        type = "disk";
-        content = {
-          type = "gpt";
-          partitions = {
-            # legacy boot
-            boot = {
-              name = "boot";
-              size = "1M";
-              type = "EF02";
-            };
-
-            # efi boot
-            esp = {
-              name = "ESP";
-              size = "512M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            };
-
-            # btrfs
-            # root is on nodev
-            root = {
-              size = "100%";
-              content = {
-                extraArgs = ["-f"]; # internet told me to, works
-                type = "btrfs";
-                subvolumes = {
-                  # nix store
-                  "/nix" = {
-                    mountpoint = "/nix";
-                  };
-
-                  # persistant directory
-                  "/persist" = {
-                    mountpoint = "/persist";
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-    nodev = {
-      # root
-      "/" = {
-        fsType = "tmpfs";
-        mountOptions = [
-          "defaults"
-          "mode=755" # stops security complaints
-        ];
-      };
-    };
-  };
-}

modules/nixos/impermanence.nix

@@ -7,6 +7,7 @@
       "/var/log"
       "/var/lib/nixos"
       "/var/lib/systemd/coredump"
+      "/gnu"
     ];
     files = [
       "/etc/machine-id"

modules/nixos/laptop.nix

@@ -7,7 +7,7 @@
   services.blueman.enable = true;
 
   # locale
-  i18n.defaultLocale = "de_DE.UTF-8";
+  i18n.defaultLocale = "en_US.UTF-8";
   time.timeZone = "Europe/Berlin";
 
   # networking

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

@@ -1,25 +1,38 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{modulesPath, ...}: {
-# and may be overwritten by future invocations.  Please make changes
+  system.stateVersion = "25.11";
-# 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"];
+  # Hardware
-  boot.initrd.kernelModules = [];
+  imports = [(modulesPath + "/profiles/qemu-guest.nix")];
-  boot.kernelModules = [];
+  fileSystems."/" = {
-  boot.extraModulePackages = [];
+    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;
 
-  swapDevices = [];
+  zramSwap.enable = true;
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  # Networking
-
+  networking = {
-  system.stateVersion = "26.05";
+    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

@@ -37,21 +37,14 @@
         forceSSL = true;
         enableACME = true;
       };
+      "${config.networking.domain}" = {
+        forceSSL = true;
+        enableACME = true;
+      };
     };
   };
   security.acme = {
     acceptTerms = true;
     defaults.email = "mtgmonket@gmail.com";
   };
-
-  # persist directories per the backup guidelines
-  environment.persistence."/persist" = {
-    directories = [
-      # not needed bc the dkim dir is declared
-      # "/var/dkim"
-      "/var/vmail"
-      "/var/lib/redis-rspamd"
-      "/var/lib/acme"
-    ];
-  };
 }

modules/nixos/networking/hard-ssh.nix

@@ -4,7 +4,6 @@
     allowSFTP = false;
     ports = [5522];
     settings = {
-      PermitRootLogin = "no";
       PasswordAuthentication = false;
       KbdInteractiveAuthentication = true;
     };

modules/nixos/networking/networks/109-199-104-83.nix

@@ -1,15 +0,0 @@
-{
-  networking = {
-    useDHCP = false;
-    hostName = "109-199-104-83";
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [80 443];
-      allowedUDPPorts = [80 443];
-    };
-  };
-  services.cloud-init = {
-    enable = true;
-    network.enable = true;
-  };
-}

modules/nixos/openvpn-client.nix

@@ -1,8 +0,0 @@
-{lib, ...}: {
-  services.openvpn.servers = {
-    "173.249.5.230" = {config = ''config /etc/openvpn-confs/173.249.5.230.ovpn'';};
-  };
-  networking.enableIPv6 = lib.mkForce false;
-  environment.persistence."/persist".directories = ["/etc/openvpn-confs"];
-  boot.kernelParams = ["ipv6.disable=1"];
-}

modules/nixos/roundcube.nix

@@ -9,8 +9,4 @@
       $config['smtp_pass'] = "%p";
     '';
   };
-  environment.persistence."/persist".directories = [
-    "/var/lib/roundcube"
-    "/var/lib/postgresql"
-  ];
 }

modules/nixos/zram.nix

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

pub-keys.nix

@@ -1,6 +1,7 @@
 {
   age.secrets = {
     andromeda-pw.file = ./secrets/andromeda-pw.age;
+    conduit-secretFile.file = ./secrets/conduit-secretFile.age;
     "dkim-galaxious.de.mail.key".file = ./secrets/dkim-galaxious.de.mail.key.age;
     mtgmonkey-pw.file = ./secrets/mtgmonkey-pw.age;
     mailserver-acc-test-pw.file = ./secrets/mailserver-acc-test-pw.age;
@@ -17,7 +18,7 @@
     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 AAAAC3NzaC1lZDI1NTE5AAAAIPkg4vbyGDxrAtKFK7Pecr/qDK9cUjv+kfhQMjO6M/Ft root@vmi2998419";
     };
   };
 }

secrets/andromeda-pw.age

@@ -1,8 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg ixFM7swaItfNnTRVSdTm1wZJ8lHUv7tDOgSXo1OpgCc
+-> ssh-ed25519 mT2fyg geMV+A9hasvKDnYiQMQWpz2o9mkUhX/Qmc1m4uvKIBs
-lf8/ChfcpgYkK8mTS9Zk++toOu0KNh88S+Lqu4a0UIw
+3vYZmwZPDVwqYRe2GHmxPXXx4qSWa3eqcWuH+sKWEYw
--> ssh-ed25519 UHxfvA hbsRwdzU1IP3K/gH0btUOQ8hZer8Kgq+RqzcEVrCqTE
+-> ssh-ed25519 UHxfvA FzNzq3yYNeDZ5x/g3cRVEaRu0txR3RORSeNFssrVuyc
-iSVh+yeypHoalRhaRM2XMlBvtO8HCyatDnWgUyC3GWU
+dRQGhtVRMC65sHqlmxSXjwpsxtCqhifkVNWvBrrB4b8
---- hcs6DJZRvjoKDPI/cjUXRfM7+06PNJvWqjkvJof/bSs
+--- bHi+Q07PCpmPzalAkbaN+/H1tXLyJNbpBs3VMpDnSnU
-Boƒp‡Qlg-§\§=Æ™	Ú¼ðÛÒÙsv½Ì~×ÚOÔí{R
x×IErô–s§1„¯v¹÷Ü:<–
++y¾2‚µÊZ4å<34>'RÔ”ÅÍPX—òR;HŠ”ÞHÆÏw‡éF7dÎñÖO¥<>߀•ïs«.„ó<E2809E>J<EFBFBD>èärXqB¬ûPÉ¢™XÖ<58>ËÈE‘£»%¿¡Öè+(ä^=øÙöeugïêS;“2
-i¶Ÿ×1¾v»„KùÑýé¦*Ú |£ ¶–´Ÿñ5[{­\Ó

secrets/conduit-secretFile.age

@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> ssh-ed25519 mT2fyg k+ePDybTbw1Pwy6P8+5HlGg6oCWQsTKVT4j/WUpZcCI
+F2ySmW8tJ1BDBvLbqtrTMrnPkESAtwXBgzcQ7nVh8+A
+-> ssh-ed25519 UHxfvA /RzKa63+zOkHudFPCS1hLxj4PjGZCtZ2UIIK0mdItBQ
+TqdH3kQgMCEtG+rxx+dR+5/tcw05s63Dc1UFflRkoMA
+-> ssh-ed25519 ZwF9sQ FvquxZ8PsmsoV06o4dBsKZOq46S08Rn1aT3Aco9TuDg
+UnBKQCYXPa897ahVsj90XsVPuU4RKQ8RmMStY8BuubQ
+--- MbfHHesbaIlXIg5jziBe4YG95I85ZuikuJLc9F/TEeQ
+L("Ùß%DYÅ$°Ový¤:G5ÏzèWsœ¡šÏ‹pï<>/ËúðV¹}ëû2xˆ«gRT‰Ã3|Pµ°/§n¼•òÆcIq(7Q-W[ä»ÐØL]ØE¥LS%y3w}¶Œµ°€°“Ütµ/£¿äO /<<3C>þm ÜfþCôn’4”ºÑPyÚ'%+NY´à›B@>œF<>ÐÒ	è`,æ-–¯0Ox)<1D>á
+Ä)kT”ÍVòBxYì‹ 

secrets/mailserver-acc-test-pw.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg at6Q9eK1o8Mk0+fJh+mnIVrvV1tASV+PGuV8MXuwR2c
+-> ssh-ed25519 mT2fyg gUoqW4Oc/4kGV97GqzjBgoAGbDlPr30HQjCSi95IakU
-cm3wvsLAemeeTFok7yBocNlfwewKruPnymG+wsT5g+Y
+WLqdKLGAY//HKMhiWeOEbRkVTUm+bNcGCRwvZ+jxFiQ
--> ssh-ed25519 UHxfvA aaQqfrUfUnLzwUVT6nCRPIAVlIhIWAJcPyeg3J6BQUI
+-> ssh-ed25519 UHxfvA w82yDFitNUAnKzT/0mPNIm4Od9YLwDK+JIHBd6qRsSQ
-4sh8ZV14csafSs8yAtFZIccSkiz6YnseV3DJcuhw7dQ
+uHYX5DugH0tLqLR1phnyYBNiP2XOV2Hj9tw63+MD1JI
--> ssh-ed25519 yXDKAA KmwRbJURujQhlqOIVxzlVjyvaYRfyuJAVGWMZdkFaAE
+-> ssh-ed25519 ZwF9sQ 6dTsOKixioy+ypnpWm1YtKYPrHcS/RSKsoq3o2bnjk8
-mX083o2XdnnYgqLs5NeppwMbFHDHTucMiHHZuYdzLvo
+WYED7jkCVNLBaputl0JcfEz8GOX4doUNEihj6ZHx8Eo
---- Ay/SP2CXGOhSzO4KoiXFQhJMMdHaecxXOtNkGBK/RO0
+--- XOUmVi4QpCXDy4yVCZuwiv8Sg+LOsX9vfydM6OqGfTM
- Zÿ? á†‹ˆB¾æFØ9_N`¶È8Õ÷å&<26>Îï@ëŽ)q€7–aìO
+»?A³Ý'©p…@¶cUØ£Ì8º“1&9aXgÔyj°(óýz+$P36£<36>#ºîƒÊrçRDÊŒ7ªß¥.óÖ\:Ãþ­pcß<63>œÇp¯Ø€GÓ&+”Öb¢|ž’ß<E28099>6¢ é’Ý»YŽ

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

@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg sRu0FIphSJVMBcC02mo1YuZdy3i2+/jMeN3ROvxp4kM
+-> ssh-ed25519 mT2fyg vcICwHDjTfVHh0+Ip1XKs/6Fo0H1i5lTjBAw1M4NSHA
-sEwx23t3IAauISKesq+110ZKRKxQv3Zesd0AJufYOLs
+ZzxDjKEUdmyhFjPivAslXxr7tZnj7CVTcffuIhVdekI
--> ssh-ed25519 UHxfvA +YaJGPRT7nX2CqVzw1ixNLpW7MfzEnj44pSwj4iUwhI
+-> ssh-ed25519 UHxfvA UPc1hBrbx37a4wn/XBxjwQLOk1M0HnHbHpqAQFUhnn8
-E2U6Q+4uesNCWK7uVSztrA84TU/n/xLFm3PJH0hO/EM
+girao3TUDhFe1knuCUtYOh39ukXumjd7s1qzXXLGPjQ
--> ssh-ed25519 yXDKAA V2kygl0BK/oYpKnnheslBO2YqXFdQWFgtqfmDNdgolc
+-> ssh-ed25519 ZwF9sQ O2QJh1Zsdu0tIA90pTv5NrfcXDAcYFyduq8AtTG7Ujs
-NpJNN4nfrbgOav8Y38C9DwKFZH+QTRp/US/8kyo9m0o
+ahnpyUSFuSwW1Zx7WzqDXFJtYCaUfwJdCyyr5enLz5I
---- LdqtfywtHOAy3AZ7AexZU0TJMU/ugq+ZYN07706rNxY
+--- fYyjQduWvTrenIiJtljSkEZXuyTRWJOvx9LeWoI3ew0
-±
+…ußߘLÒ8ïÎ:ÂT·$…<10> ñJë´+LÄ?„zÇÍü5rL(MìýÁÑiÀý˜<C3BD>ˆFÀ’N‚±.W+ß·U28Èd$µ<>¯<EFBFBD>Á£‘8Üõm¡4:‘N´<g)©Š‰Ä&Í$Jþ=‚Ævœ
-U$âApµnG NeÉ•£u y`!<21>ʤ®•Øf;ipvÙYˆ°V_3»ºN+±éªk#¨{û…ŽÊêWÑ*Ÿn(Å•ËÎú‹Õ»G6ÒÉ݈yc`<60>éqµ:$K]?Í—b=§'ü^Ï9

secrets/secrets.nix

@@ -8,6 +8,11 @@ in {
   "andromeda-pw.age".publicKeys = [andromeda lenovo];
   "mtgmonkey-pw.age".publicKeys = [andromeda lenovo];
 
+  # 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];
 

secrets/zulip-camoKey.age

@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg 5ADzKAtycqfFpqW/dp71FTaK2gchzdWFNqxPyZ6deSY
+-> ssh-ed25519 mT2fyg cz2kWYGsZU08Sh3+mJHqhTC9lhqHvwzmgIHu+SUkVxU
-+aISA4YwF1l9S0fmE84wOvAJpM221bwPDYvXELTVv9k
+bDFcYokAEj4UulAtYNvW9inoRJzoD+z1lSCQRcpyd7o
--> ssh-ed25519 UHxfvA uKYcpPbaXA4r1OmlkuiIu/EqQ3IiHR7JpItnVgTaW2g
+-> ssh-ed25519 UHxfvA 0npgMgYOhrxSgprdVNXIRFtrkeMWL5xEoaOjg0MAu0M
-LjySgI4mTlaZY81IJc6DmBh43l2qeGlQnZi+rOlbtb8
+53VyXcDQxM7hoGt1deuJfKuOkKwz0P++JvUHOW7PxpQ
--> ssh-ed25519 yXDKAA TMwoM06ZJsjkZ7eLguxqYB05jcRn+tTgVzE7WQIf0mw
+-> ssh-ed25519 ZwF9sQ F+Hx3aJDjCAPe4wEhBg8kjZla/iF92kzFWfdh1ll0BU
-vKwCkWsywGsgVv6Y278Mi28MhCYBRRUnfg4+EouOw+0
+yUFzyxm40BVyIKLR/LfB2mTwNzIpPxJ0Ix1/x6vYVjg
---- CScrim9wya9AhElXBtKBR3XBZDL83/g3MTfdF258GJ8
+--- PMzNF3mxVzePmAZBtX36NtPf04L7x30kCjv69G6nMSQ
-K#Ð>8}cã§Ï}8‡ÅL¹(Ëôcò¶
+¼¡žˆÈ
-Üw1ª"O“Ù

secrets/zulip-extraSecrets-email_password.age

@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg IOcD4r19Gx2AvjusnnJDHQXr/U4Ti6qKr01I9lNQDQE
+-> ssh-ed25519 mT2fyg eVTpn6pJgpLbIqorjaLhK+VRCcVIjYZEWkUqSmSWQQU
-fCwouMQPvhkyzehszuv0YhSfNh9zGKaFNDKaTZT0rD0
+j5C4x3gBgVoVmOZicfNu6r7QVebx8jFcWlvy0/Ku4jI
--> ssh-ed25519 UHxfvA e95raPehUz6T2FR/eT8kzfrxt/Ou6kKsqi7z/3BkfwU
+-> ssh-ed25519 UHxfvA Hnf8ZGN4cpyeR4VVEaQbatDP3mDj7XsfoTrpzYmLjDA
-uHymqnY3t7IwpxWkN8xen3Vsy6R7VMoj+fR0zPnPinY
+2lCD8WzjiIxYhSa69Jb1QO2tjFBikffBuMszpD2W1y0
--> ssh-ed25519 yXDKAA nlR1prGysW+k8gq2npEiboFqoo9jKQ5ISxRiiCFlb0s
+-> ssh-ed25519 ZwF9sQ 9Z6NdJ1Aeexe4NZmV/PO6ChB1B36U4MZura/jHgaxns
-kaGOvlQgO0nOAl12mMKvafa9ezmy8XdUC2tVPuBG4iw
+V/xIoskMZQIIZGNwWK0THfhWX1dKk0cG8stawVJfCZo
---- MRFAGURoyediqNSjGxr57a0w6n9lH2zVjfyrUZcyAYw
+--- FNvKumqiJ1HBogji3Orpzo+gr0ug4ZxJUqBjaBuMgj8
-
+uó*àaPj"µ2wÔ6Þø<C39E>C§_p=;$œ%²‡Sœ
ˆkÏžE¾oª-8
-zä0

substitutors.nix

@@ -0,0 +1,8 @@
+{
+  # 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,9 +3,7 @@
   lib,
   machine,
   ...
-}: let
+}: {
-  machines = import ./machines.nix;
-in {
   users.users =
     builtins.mapAttrs
     (name: value: lib.mkIf (builtins.elem name machine.users) value)
@@ -15,8 +13,9 @@ in {
         description = "andromeda";
         hashedPasswordFile = builtins.toString config.age.secrets.andromeda-pw.path;
         extraGroups = [
-          "networkmanager"
+          "networkmanager" # network configuration
-          "wheel"
+          "wheel" # serial
+          "dialout" # access to serial ports
         ];
       };
     };
@@ -27,17 +26,22 @@ in {
       "andromeda" = {
         directories = [
           ".backups"
+          ".gnupg"
+          ".local/share/AAAAXY"
           ".local/share/Anki2"
           ".local/share/chat.fluffy.fluffychat"
+          ".local/share/Mindustry"
+          ".local/share/Steam"
           ".local/share/zoxide"
           ".ssh"
+          ".steam"
           "conf"
           "Downloads"
+          "conf_v1"
           "pp"
         ];
         files = [
           ".bash_history"
-          ".brush_history"
         ];
       };
     }

users/andromeda/home.nix

@@ -18,7 +18,6 @@
     };
 in {
   imports = [./stylix.nix];
-  xdg.configFile."shell".source = lib.getExe pkgs.brush;
   xdg.configFile."sway/config".source = lib.mkForce sway_config;
   wayland.windowManager.sway.enable = true;
   home = {
@@ -26,25 +25,35 @@ in {
     homeDirectory = "/home/${config.home.username}";
     stateVersion = "26.05";
     packages = [
+      pkgs.aaaaxy
       pkgs.acpi
       pkgs.agenix
       pkgs.alacritty
       pkgs.anki
+      pkgs.anki-cli
       pkgs.brightnessctl
-      pkgs.brush
       pkgs.dust
       pkgs.fluffychat
       pkgs.fzf
+      pkgs.gdb
+      pkgs.geeqie
       pkgs.glow
       pkgs.grim
+      pkgs.hexdump
+      pkgs.http-server
       pkgs.jmtpfs
+      pkgs.mindustry-wayland
+      pkgs.nasm
       pkgs.nix-output-monitor
+      pkgs.npins
       pkgs.ranger
       pkgs.rip2
       pkgs.ripgrep
       pkgs.slurp
+      pkgs.tokei
       pkgs.tree
-      pkgs.zoxide
+      pkgs.wget
+      pkgs.xxd
     ];
     file.${background-path}.source = config.stylix.image;
   };
@@ -52,6 +61,7 @@ in {
     alacritty.enable = true;
     bash = {
       enable = true;
+      enableCompletion = false;
       shellAliases = {
         neofetch = "fastfetch";
         ls = lib.mkForce "lsd";
@@ -63,7 +73,6 @@ in {
       };
       bashrcExtra = ''
         PS1="\u@\h:\w$"
-        eval "$(zoxide init bash)"
       '';
     };
     btop = {
@@ -97,79 +106,18 @@ in {
         cfg.enableTridactylNative = true;
       };
       profiles.${config.home.username} = {
-        extensions.packages = [
+        extensions = {
-          pkgs.nur.repos.rycee.firefox-addons.tridactyl
+          force = true;
-        ];
+          packages = [
-        search = {
+            pkgs.nur.repos.rycee.firefox-addons.tridactyl
-          default = "repos";
+          ];
-          privateDefault = "ddghtml";
+        };
-          order = [
+        search = {
-            "wiki"
+          default = "DuckDuckGo (HTML)";
-            "options"
+          privateDefault = "DuckDuckGo (HTML)";
-            "packages"
+          order = [
-            "repos"
+            "DuckDuckGo (HTML)"
           ];
-          engines = {
-            "packages" = {
-              urls = [
-                {
-                  template = "https://search.nixos.org/packages";
-                  params = [
-                    {
-                      name = "channel";
-                      value = "unstable";
-                    }
-                    {
-                      name = "query";
-                      value = "{searchTerms}";
-                    }
-                  ];
-                }
-              ];
-            };
-
-            "options" = {
-              urls = [
-                {
-                  template = "https://search.nixos.org/options";
-                  params = [
-                    {
-                      name = "channel";
-                      value = "unstable";
-                    }
-                    {
-                      name = "query";
-                      value = "{searchTerms}";
-                    }
-                  ];
-                }
-              ];
-            };
-
-            "wiki" = {
-              urls = [
-                {
-                  template = "https://wiki.nixos.org/w/index.php";
-                  params = [
-                    {
-                      name = "search";
-                      value = "{searchTerms}";
-                    }
-                  ];
-                }
-              ];
-            };
-
-            "repos" = {
-              template = "https://html.duckduckgo.com/html/";
-              params = [
-                {
-                  name = "q";
-                  value = "{searchTerms}+(site:*.gitlab.org OR site:github.com OR site:git.mtgmonkey.net OR site:sr.ht)";
-                }
-              ];
-            };
-          };
         };
         settings = {
           "extensions.autoDisableScopes" = 0;
@@ -187,11 +135,15 @@ in {
       };
     };
     gh.enable = true;
+    gpg = {
+      enable = true;
+    };
     home-manager.enable = true;
     lsd.enable = true;
     nvf = {
       enable = true;
       settings.vim = {
+        startPlugins = [pkgs.vimPlugins.parinfer-rust];
         autocomplete.nvim-cmp.enable = false;
         formatter.conform-nvim = {
           enable = true;
@@ -259,6 +211,12 @@ in {
             enable = true;
             lsp.enable = true;
           };
+          rust = {
+            enable = true;
+            format.enable = true;
+            lsp.enable = true;
+            treesitter.enable = true;
+          };
         };
         lineNumberMode = "relative";
         options = {
@@ -275,5 +233,13 @@ in {
       };
     };
     ssh.enable = true;
+    zoxide = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+  };
+  services.gpg-agent = {
+    enable = true;
+    pinentry.package = pkgs.pinentry-curses;
   };
 }

users/andromeda/sway_config

@@ -55,6 +55,12 @@ 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
@@ -64,8 +70,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 5%-
+bindsym --locked XF86MonBrightnessDown exec brightnessctl set 2%-
-bindsym --locked XF86MonbrightnessUp exec brightnessctl set 5%+
+bindsym --locked XF86MonbrightnessUp exec brightnessctl set 2%+
 
 default_border none
 font pango:monospace 0.001