[NixOS] Add new computers to syncthing

dotfiles/config/alacritty/alacritty.toml

@@ -0,0 +1,15 @@
+import = ["/home/imalison/.config/alacritty/themes/themes/dracula.toml"]
+
+[font]
+size = 8
+
+[scrolling]
+history = 10000
+multiplier = 3
+
+[window]
+decorations = "full"
+
+[window.padding]
+x = 10
+y = 10

dotfiles/config/alacritty/alacritty.yml

@@ -1,34 +0,0 @@
-scrolling:
-  # How many lines of scrollback to keep,
-  # '0' will disable scrolling.
-  history: 10000
-
-  # Number of lines the viewport will move for every line
-  # scrolled when scrollback is enabled (history > 0).
-  multiplier: 3
-
-  # Faux Scrolling
-  #
-  # The `faux_multiplier` setting controls the number
-  # of lines the terminal should scroll when the alternate
-  # screen buffer is active. This is used to allow mouse
-  # scrolling for applications like `man`.
-  #
-  # To disable this completely, set `faux_multiplier` to 0.
-  faux_multiplier: 3
-
-  # Automatically scroll to the bottom when new text is written
-  # to the terminal.
-  auto_scroll: false
-
-font:
-  size: 8
-
-window:
-  padding:
-    x: 10
-    y: 10
-  decorations: full
-
-import:
-- ~/.config/alacritty/themes/themes/dracula.yaml

dotfiles/config/autorandr/strixy-minaj-240hz-solo/config

@@ -0,0 +1,20 @@
+output DP-0
+off
+output DP-1
+off
+output HDMI-0
+off
+output DP-3
+off
+output DP-4
+off
+output DP-5
+off
+output DP-6
+off
+output DP-2
+crtc 0
+mode 2560x1600
+pos 0x0
+rate 240.00
+x-prop-non_desktop 0

dotfiles/config/autorandr/strixy-minaj-240hz-solo/setup

@@ -0,0 +1 @@
+DP-2 00ffffffffffff0009e5580c0000000001210104b527187803bbc5ae503fb7250c515500000001010101010101010101010101010101c07200a0a040c8603020360084f21000001a000000fd0c30f0b1b176010a202020202020000000fe00424f452043510a202020202020000000fc004e4531383051444d2d4e4d310a029602030f00e3058080e606050195731000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa702079020021001d280f7409000a400680dd2a511824b249120e023554b060ec64662a1378220014ffed1185ff099f002f001f003f06c700020005002b000c27003cef00002700303b0000810015741a0000030b30f0006095107310f0000000008d00000000000000000000000000000000000000000000000000000000bc90

dotfiles/config/htop/htoprc

@@ -1,6 +1,6 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
-htop_version=3.2.2
+htop_version=3.3.0
 config_reader_min_version=3
 fields=0 48 17 18 38 39 40 2 46 47 49 1
 hide_kernel_threads=1
@@ -39,25 +39,25 @@ column_meter_modes_0=1 1 1
 column_meters_1=Tasks LoadAverage Uptime
 column_meter_modes_1=2 2 2
 tree_view=0
-sort_key=46
+sort_key=48
 tree_sort_key=46
-sort_direction=-1
+sort_direction=1
 tree_sort_direction=-1
 tree_view_always_by_pid=0
 all_branches_collapsed=0
 screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
-.sort_key=PERCENT_CPU
+.sort_key=USER
 .tree_sort_key=PERCENT_CPU
-.tree_view=0
 .tree_view_always_by_pid=0
-.sort_direction=-1
+.tree_view=0
+.sort_direction=1
 .tree_sort_direction=-1
 .all_branches_collapsed=0
 screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
 .sort_key=IO_RATE
 .tree_sort_key=PID
-.tree_view=0
 .tree_view_always_by_pid=0
+.tree_view=0
 .sort_direction=-1
 .tree_sort_direction=1
 .all_branches_collapsed=0

dotfiles/config/taffybar/flake.lock

@@ -0,0 +1,699 @@
+{
+  "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "fourmolu-011": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-g/yDZXeLCHq/iXoZTaTYSb8l9CMny3AKsRQgWElagZI=",
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/fourmolu-0.11.0.0/fourmolu-0.11.0.0.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/fourmolu-0.11.0.0/fourmolu-0.11.0.0.tar.gz"
+      }
+    },
+    "fourmolu-012": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-yru8ls67DMM6WSeVU6xDmmwa48I8S9CUv9NBaxSQ29M=",
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz"
+      }
+    },
+    "git-ignore-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "taffybar",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1660459072,
+        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "ref": "master",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "git-ignore-nix_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1703887061,
+        "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "ref": "master",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1660459072,
+        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gtk-sni-tray": {
+      "inputs": {
+        "flake-utils": [
+          "taffybar",
+          "flake-utils"
+        ],
+        "git-ignore-nix": [
+          "taffybar",
+          "git-ignore-nix"
+        ],
+        "nixpkgs": [
+          "taffybar",
+          "nixpkgs"
+        ],
+        "status-notifier-item": [
+          "taffybar",
+          "status-notifier-item"
+        ]
+      },
+      "locked": {
+        "lastModified": 1663379298,
+        "narHash": "sha256-m18+G7V1N+g/pPeKJG9hkblGA5c8QTnUYnsU5t14sOw=",
+        "owner": "taffybar",
+        "repo": "gtk-sni-tray",
+        "rev": "1927d86308d34b5d21a709cf8ff5332ec5d37de4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "taffybar",
+        "ref": "master",
+        "repo": "gtk-sni-tray",
+        "type": "github"
+      }
+    },
+    "gtk-strut": {
+      "inputs": {
+        "flake-utils": [
+          "taffybar",
+          "flake-utils"
+        ],
+        "git-ignore-nix": [
+          "taffybar",
+          "git-ignore-nix"
+        ],
+        "nixpkgs": [
+          "taffybar",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1663377859,
+        "narHash": "sha256-UrBd+R3NaJIDC2lt5gMafS3KBeLs83emm2YorX2cFCo=",
+        "owner": "taffybar",
+        "repo": "gtk-strut",
+        "rev": "d946eb230cdccf5afc063642b3215723e555990b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "taffybar",
+        "ref": "master",
+        "repo": "gtk-strut",
+        "type": "github"
+      }
+    },
+    "haskell-hie-bios": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1686930638,
+        "narHash": "sha256-gfcxxHtZ2jUsiKNn/O4jEkfWF/2H04aTnaIvPDbtNlQ=",
+        "owner": "haskell",
+        "repo": "hie-bios",
+        "rev": "3d4fadfb0dc44cb287db9897ecfb503899d33513",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "repo": "hie-bios",
+        "type": "github"
+      }
+    },
+    "haskell-implicit-hie-cradle": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1686495518,
+        "narHash": "sha256-OAe+zOkMZuoTfVEMnxnCT1cmPgRF/riAR8nVdomnwxo=",
+        "owner": "smunix",
+        "repo": "implicit-hie-cradle",
+        "rev": "d6aa00355898469af56cfd5e62f7fc8bd9959ded",
+        "type": "github"
+      },
+      "original": {
+        "owner": "smunix",
+        "ref": "smunix-patch-hls-0.5-1",
+        "repo": "implicit-hie-cradle",
+        "type": "github"
+      }
+    },
+    "haskell-language-server": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils_3",
+        "fourmolu-011": "fourmolu-011",
+        "fourmolu-012": "fourmolu-012",
+        "gitignore": "gitignore",
+        "haskell-hie-bios": "haskell-hie-bios",
+        "haskell-implicit-hie-cradle": "haskell-implicit-hie-cradle",
+        "hiedb": "hiedb",
+        "hlint-35": "hlint-35",
+        "hlint-36": "hlint-36",
+        "lsp": "lsp",
+        "lsp-test": "lsp-test",
+        "lsp-types": "lsp-types",
+        "nixpkgs": "nixpkgs_2",
+        "ormolu-052": "ormolu-052",
+        "ormolu-07": "ormolu-07",
+        "stylish-haskell-0145": "stylish-haskell-0145"
+      },
+      "locked": {
+        "lastModified": 1693851896,
+        "narHash": "sha256-799JUHpBd2iMRCrTYDme5RsROKnIwSKBe2xYxgVN7QI=",
+        "owner": "colonelpanic8",
+        "repo": "haskell-language-server",
+        "rev": "ea368cef0673059fff95e953ef983109b5979dbc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "colonelpanic8",
+        "ref": "goto-dependency-definition-2",
+        "repo": "haskell-language-server",
+        "type": "github"
+      }
+    },
+    "hiedb": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1691542357,
+        "narHash": "sha256-90ftphhoIo0CklJrjfCGQrZIUKZfdMJ2Og6tep9dmJ8=",
+        "owner": "nlander",
+        "repo": "HieDb",
+        "rev": "4eebfcf8fab54f24808e6301227d77ae64d2509c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nlander",
+        "ref": "all-new-functions",
+        "repo": "HieDb",
+        "type": "github"
+      }
+    },
+    "hlint-35": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-qQNUlQQnahUGEO92Lm0RwjTGBGr2Yaw0KRuFRMoc5No=",
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/hlint-3.5/hlint-3.5.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/hlint-3.5/hlint-3.5.tar.gz"
+      }
+    },
+    "hlint-36": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-fH4RYnWeuBqJI5d3Ba+Xs0BxYr0IYFH1OWO3k2iHGlU=",
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/hlint-3.6.1/hlint-3.6.1.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/hlint-3.6.1/hlint-3.6.1.tar.gz"
+      }
+    },
+    "lsp": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-HcEfdYUrCHufEa+10M2wESjnK41xM/msd+t6r6JwQO0=",
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/lsp-2.2.0.0/lsp-2.2.0.0.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/lsp-2.2.0.0/lsp-2.2.0.0.tar.gz"
+      }
+    },
+    "lsp-test": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-E1D3X2+I9ZTZLpHDEDTXexQFYpyG5byOFRIvRTeBsn8=",
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/lsp-test-0.16.0.0/lsp-test-0.16.0.0.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/lsp-test-0.16.0.0/lsp-test-0.16.0.0.tar.gz"
+      }
+    },
+    "lsp-types": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-Oa5HuKdsdTSQUKtuSt06zVAq19Qxq5IJZObrnPwlB6s=",
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/lsp-types-2.0.2.0/lsp-types-2.0.2.0.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/lsp-types-2.0.2.0/lsp-types-2.0.2.0.tar.gz"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1702312524,
+        "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
+        "path": "/nix/store/4fgs7yzsy2dqnjw8j42qlp9i1vgarzy0-source",
+        "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1686874404,
+        "narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "efc10371d5c5b8d2d58bab6c1100753efacfe550",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "haskell-updates",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1689098530,
+        "narHash": "sha256-fxc/9f20wRyo/5ydkmZkX/Sh/ULa7RcT8h+cUv8p/44=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f2406198ea0e4e37d4380d0e20336c575b8f8ef9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1666603677,
+        "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1702312524,
+        "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
+        "path": "/nix/store/4fgs7yzsy2dqnjw8j42qlp9i1vgarzy0-source",
+        "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "ormolu-052": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-H7eqId488RBRxcf7flgJefAZmRgFJASJva+Oy7GG4q4=",
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/ormolu-0.5.2.0/ormolu-0.5.2.0.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/ormolu-0.5.2.0/ormolu-0.5.2.0.tar.gz"
+      }
+    },
+    "ormolu-07": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-5M5gNzSvsiQH1+0oexRByzf5EIET+0BFwR4fLIr2P7g=",
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "taffybar": "taffybar",
+        "xmonad": "xmonad_2"
+      }
+    },
+    "status-notifier-item": {
+      "inputs": {
+        "flake-utils": [
+          "taffybar",
+          "flake-utils"
+        ],
+        "git-ignore-nix": [
+          "taffybar",
+          "git-ignore-nix"
+        ],
+        "nixpkgs": [
+          "taffybar",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1641783528,
+        "narHash": "sha256-wJymJfYPFj4/r1e4kT/wt9FEsyCXo5JkkcOoozpuhag=",
+        "owner": "taffybar",
+        "repo": "status-notifier-item",
+        "rev": "f4f9c66ab57fc42eeed0de8cfac9f5f9d30d9dc7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "taffybar",
+        "repo": "status-notifier-item",
+        "type": "github"
+      }
+    },
+    "stylish-haskell-0145": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-EE7RFQ6q4Ek8daRgOpNMGepYLa9o8cM4OLjTNUSHQf0=",
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/stylish-haskell-0.14.5.0/stylish-haskell-0.14.5.0.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/stylish-haskell-0.14.5.0/stylish-haskell-0.14.5.0.tar.gz"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "taffybar": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "git-ignore-nix": "git-ignore-nix",
+        "gtk-sni-tray": "gtk-sni-tray",
+        "gtk-strut": "gtk-strut",
+        "haskell-language-server": "haskell-language-server",
+        "nixpkgs": "nixpkgs_3",
+        "status-notifier-item": "status-notifier-item",
+        "xmonad": "xmonad"
+      },
+      "locked": {
+        "lastModified": 1696612500,
+        "narHash": "sha256-Q19F91yVQviqxgY+FkvEwtX2vcw414eVtK8erim0NrU=",
+        "owner": "taffybar",
+        "repo": "taffybar",
+        "rev": "46eba89c2a4d4ffefe42c3ee4506d1b74c8e61fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "taffybar",
+        "repo": "taffybar",
+        "type": "github"
+      }
+    },
+    "unstable": {
+      "locked": {
+        "lastModified": 1689098530,
+        "narHash": "sha256-fxc/9f20wRyo/5ydkmZkX/Sh/ULa7RcT8h+cUv8p/44=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f2406198ea0e4e37d4380d0e20336c575b8f8ef9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "unstable_2": {
+      "locked": {
+        "lastModified": 1704538339,
+        "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "xmonad": {
+      "inputs": {
+        "flake-utils": [
+          "taffybar",
+          "flake-utils"
+        ],
+        "git-ignore-nix": [
+          "taffybar",
+          "git-ignore-nix"
+        ],
+        "nixpkgs": [
+          "taffybar",
+          "nixpkgs"
+        ],
+        "unstable": "unstable"
+      },
+      "locked": {
+        "lastModified": 1687976934,
+        "narHash": "sha256-hUZmKy3jJ1+5rTGeQzfNR+LxgzmLaaeRVnbsJMEVw0Q=",
+        "owner": "xmonad",
+        "repo": "xmonad",
+        "rev": "1aac6611d82065c9198e5584176058a9483fcbb0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "xmonad",
+        "ref": "master",
+        "repo": "xmonad",
+        "type": "github"
+      }
+    },
+    "xmonad_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_4",
+        "git-ignore-nix": "git-ignore-nix_2",
+        "nixpkgs": "nixpkgs_5",
+        "unstable": "unstable_2"
+      },
+      "locked": {
+        "lastModified": 1702895348,
+        "narHash": "sha256-ADRTw4DTfDCmsSFFWZKmvdmIjnEVY7pjjUxYytKXy1E=",
+        "owner": "xmonad",
+        "repo": "xmonad",
+        "rev": "c4cf4715f736fed77fb2af622c0760259ac2cf43",
+        "type": "github"
+      },
+      "original": {
+        "owner": "xmonad",
+        "ref": "master",
+        "repo": "xmonad",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

dotfiles/config/taffybar/flake.nix

@@ -2,11 +2,14 @@
   inputs = {
     flake-utils.url = github:numtide/flake-utils;
     xmonad.url = github:xmonad/xmonad/master;
-    taffybar.url = path:./taffybar;
+    taffybar.url = "github:taffybar/taffybar";
   };
   outputs = { self, flake-utils, taffybar, nixpkgs, xmonad }:
   let
     hoverlay = final: prev: hself: hsuper: {
+      taffybar = hsuper.taffybar.overrideAttrs (old: {
+        doHaddock = false;
+      });
       imalison-taffybar = prev.haskell.lib.addPkgconfigDepends (
         hself.callCabal2nix "imalison-taffybar"
         (

dotfiles/config/taffybar/taffybar

@@ -1 +1 @@
-Subproject commit 067e0bff51e470ebffc4e9fc749656745461ce73
+Subproject commit 9c8540a56432db6555755a9a649b4874833520ed

dotfiles/config/xmonad/xmonad-contrib

@@ -1 +1 @@
-Subproject commit b5ef6265b87338f30dc9fc055c86d1ec021527a7
+Subproject commit 229c7baf006bf68e76ec1305f55d7d42a6cf7042

dotfiles/emacs.d/.mc-lists.el

@@ -83,6 +83,7 @@
         imalison:multiple-cursors-hydra/mc/mark-previous-like-this
         imalison:multiple-cursors-hydra/nil
         isearch-delete-char
+        lsp-ui-doc--handle-mouse-movement
         make-frame
         overwrite-mode
         smex

dotfiles/emacs.d/README.org

@@ -2622,6 +2622,13 @@ eval-last-sexp.
      (shell-command-to-string "nix eval -I \"$NIX_PATH\" --expr '<nixpkgs>' --impure"))))
   :config
   (progn
+    (use-package apheleia
+      :demand t
+      :config
+      (progn
+        (add-to-list 'apheleia-formatters '(alejandra . ("alejandra")))
+        (setf (alist-get 'nix-mode apheleia-mode-alist)
+              '(alejandra))))
     (setq nix-indent-function 'nix-indent-line)))
 
 (use-package lsp-nix
@@ -2885,6 +2892,10 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
   :defer t
   :mode ("\\.kt\\'"))
 #+END_SRC
+*** groovy
+#+begin_src emacs-lisp
+(use-package groovy-mode)
+#+end_src
 *** vala
 #+BEGIN_SRC emacs-lisp
 (use-package vala-mode
@@ -2931,6 +2942,10 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
 (use-package protobuf-mode
   :defer t)
 #+END_SRC
+*** graphql
+#+begin_src emacs-lisp
+(use-package graphql-mode)
+#+end_src
 *** json-mode
 #+BEGIN_SRC emacs-lisp
 (use-package json-mode
@@ -2947,6 +2962,10 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
   :mode (("\\.yaml\\'" . yaml-mode)
          ("\\.yml\\'" . yaml-mode)))
 #+END_SRC
+*** just-mode
+#+begin_src emacs-lisp
+(use-package just-mode)
+#+end_src
 *** es-mode
 #+BEGIN_SRC emacs-lisp
 (use-package es-mode
@@ -2967,6 +2986,11 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
 (use-package toml-mode
   :mode (("\\.toml\\'" . toml-mode)))
 #+end_src
+*** terraform
+#+begin_src emacs-lisp
+(use-package terraform-mode
+  :mode (("\\.tf\\'" . terraform-mode)))
+#+end_src
 ** Document
 *** org
 My org-mode configuration now lives in its own file org-config.org.
@@ -3146,7 +3170,21 @@ My org-mode configuration now lives in its own file org-config.org.
   :defer t
   :config
   (progn
-    (setq git-link-use-commit t)))
+    (setq git-link-use-commit t)
+    (defun git-link-commit-gitea (hostname dirname commit)
+      (format "https://%s/%s/commit/%s"
+	          hostname
+	          dirname
+	          commit))
+    (defun git-link-gitea (hostname dirname filename branch commit start end)
+      (format "https://%s/%s/src/commit/%s/%s#L%s"
+              hostname
+              dirname
+              commit
+              filename
+              start))
+    (add-to-list 'git-link-remote-alist '("dev.railbird.ai" git-link-gitea))
+    (add-to-list 'git-link-commit-remote-alist '("dev.railbird.ai" git-link-gitea))))
 #+END_SRC
 ** magit-gitflow
 #+BEGIN_SRC emacs-lisp
@@ -3269,10 +3307,15 @@ emr (emacs refactor) provides support for refactoring in many programming langua
 #+END_SRC
 ** language-server-protocol (lsp)
 #+BEGIN_SRC emacs-lisp
+(defvar imalison:use-lsp nil)
 (use-package lsp-mode
-  :defer 3
   :commands lsp
   :preface
+  (defun imalison:lsp-deferred-when-enabled ()
+    (add-hook 'hack-local-variables-hook
+              (lambda ()
+                (when imalison:use-lsp
+                  (lsp-deferred))) nil t))
   (defun imalison:nix-develop-lsp-wrapper-function (argv)
     (append
      (append (list "nix" "develop" "-I" "." "--impure" "--command")
@@ -3283,6 +3326,7 @@ emr (emacs refactor) provides support for refactoring in many programming langua
     (use-package lsp-ui
       :config
       (progn
+        (add-hook 'prog-mode-hook 'imalison:lsp-deferred-when-enabled)
         (add-hook 'lsp-mode-hook 'lsp-ui-mode)
         (setq lsp-ui-doc-position 'bottom)))))
 #+END_SRC
@@ -3459,7 +3503,7 @@ crux-reopen-as-root-mode makes it so that any file owned by root will automatica
   :config
   (progn
     (add-to-list 'gptel-directives '(finish-code . "You are a large language model and a careful programmer. Provide code that completes what is provided and only code as output without any additional text, prompt or note."))
-    ;; (setq gptel-model "gpt-4")
+    (setq gptel-model "gpt-4")
     ))
 #+end_src
 * Cooperation

dotfiles/gitconfig

@@ -10,7 +10,7 @@
 	cpr = cherry-pick-range
 	cam = commit -am
 	clean-branches = "!r() { git branch --merged ${1-origin/master} | grep -v '*' | xargs -n1 git branch -d; }; r"
-	del-merged-branches = "!f() { git fetch $1 && git branch -r --merged $1/$2 | awk -F/ \"/$1/ && !/$2$/ {print \\$2}\" | xargs -I {} git push $1 --delete {}; }; f"
+	del-merged-branches = "!f() { git fetch $1 && git branch -r --merged $1/$2 | grep -v \"$1/$2$\" | sed \"s:$1/::\" | xargs -I {} sh -c \"git push $1 :{}\" _; }; f"
 	clone = clone --recursive
 	credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f" # Credit an author on the latest commit
 	co = checkout

dotfiles/gitignore

@@ -75,3 +75,7 @@ cabal.project.local
 #
 .direnv
 /dotfiles/config/gtk-3.0/settings.ini
+
+/untracked
+
+railbird-infra-*.json

dotfiles/lib/functions/nr

@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+function nr {
+    nix run nixpkgs#"$@"
+}
+
+nr "$@"

dotfiles/lib/functions/split_by_char

@@ -10,5 +10,3 @@ function split_by_char {
 }
 
 split_by_char "$@"
-
-

dotfiles/xkb/keymap/strixy-minaj

@@ -0,0 +1,7 @@
+xkb_keymap {
+	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
+	xkb_types     { include "complete"	};
+	xkb_compat    { include "complete"	};
+	xkb_symbols   { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)"	};
+	xkb_geometry  { include "pc(pc105)"	};
+};

nixos/base.nix

@@ -1,10 +1,12 @@
-{ config, pkgs, options, inputs, makeEnable, ... }:
+{ config, pkgs, forEachUser, makeEnable, realUsers, ... }:
 makeEnable config "modules.base" true {
   nixpkgs.config.permittedInsecurePackages = [
     "openssl-1.0.2u"
     "electron-12.2.3"
     "etcher"
     "electron-19.1.9"
+    "openssl-1.1.1w"
+    "nix-2.16.2"
   ];
 
   # Disabling these waits disables the stuck on boot up issue
@@ -18,7 +20,6 @@ makeEnable config "modules.base" true {
       enable = true;
       enableSSHSupport = true;
     };
-    package = pkgs.gnupg_2_4_0;
   };
   services.pcscd.enable = true;
 
@@ -72,4 +73,7 @@ makeEnable config "modules.base" true {
   services.dbus.packages = [ pkgs.gcr ];
 
   programs.dconf.enable = true;
+
+  home-manager.users = forEachUser (import ./home-manager.nix);
+  nix.settings.trusted-users = realUsers;
 }

nixos/code.nix

@@ -57,6 +57,7 @@ makeEnable config "modules.code" true {
     # nix
     nixd
     nil
+    alejandra
   ] ++ (if pkgs.system == "x86_64-linux" then with pkgs; [
     # purescript
     purescript

nixos/configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, forEachUser, ... }:
 {
   imports = [
     ./android.nix
@@ -7,6 +7,7 @@
     ./cache.nix
     ./code.nix
     ./desktop.nix
+    ./electron.nix
     ./environment.nix
     ./essential.nix
     ./extra.nix
@@ -15,7 +16,6 @@
     ./gitea-runner.nix
     ./gitea.nix
     ./gnome.nix
-    ./electron.nix
     ./imalison.nix
     ./internet-computer.nix
     ./kat.nix
@@ -24,10 +24,14 @@
     ./nixified.ai.nix
     ./options.nix
     ./plasma.nix
+    ./postgres.nix
+    ./rabbitmq.nix
     ./secrets.nix
     ./ssh.nix
     ./syncthing.nix
+    ./user-specific.nix
     ./users.nix
+    ./vscode.nix
     ./wsl.nix
     ./xmonad.nix
   ];

nixos/desktop.nix

@@ -7,7 +7,9 @@ makeEnable config "modules.desktop" true {
   services.xserver = {
     exportConfiguration = true;
     enable = true;
-    layout = "us";
+    xkb = {
+      layout = "us";
+    };
     displayManager = {
       sessionCommands = ''
         systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
@@ -35,7 +37,7 @@ makeEnable config "modules.desktop" true {
     gnome.adwaita-icon-theme
     hicolor-icon-theme
     libsForQt5.breeze-gtk
-    materia-theme
+    # materia-theme
     numix-icon-theme-circle
     papirus-icon-theme
 
@@ -53,7 +55,7 @@ makeEnable config "modules.desktop" true {
     alacritty
     blueman
     clipit
-    dfeet
+    d-spy
     dolphin
 
     feh

nixos/environment.nix

@@ -47,6 +47,7 @@ with lib;
       localBinInPath = true;
       shellAliases = {
         df_ssh = "TERM='xterm-256color ssh -o StrictHostKeyChecking=no'";
+        fix_nix = "LD_LIBRARY_PATH='' nix";
       };
       variables = {
         ROFI_SYSTEMD_TERM = "alacritty -e";

nixos/essential.nix

@@ -30,11 +30,13 @@ in
     efibootmgr
     emacs
     fd
+    ffmpeg
     file
     gawk
     gcc
     gdb
     git-lfs
+    git-fame
     git-sync
     gitFull
     glxinfo
@@ -46,11 +48,13 @@ in
     iotop
     ispell
     jq
+    just
     lshw
     lsof
     magic-wormhole-rs
     ncdu
     neofetch
+    neovim
     nix-index
     pass
     patchelf

nixos/fix-update-inputs-issue.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-
-nix flake lock --update-input taffybar
-nix flake lock --update-input imalison-taffybar
-nix flake lock --update-input xmonad
-nix flake lock --update-input xmonad-contrib

nixos/flake.lock

@@ -4,14 +4,15 @@
       "inputs": {
         "darwin": "darwin",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1696775529,
+        "lastModified": 1707830867,
-        "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
+        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
+        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
         "type": "github"
       },
       "original": {
@@ -28,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1673295039,
+        "lastModified": 1700795494,
-        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
         "type": "github"
       },
       "original": {
@@ -114,11 +115,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685662779,
+        "lastModified": 1698882062,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
+        "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
+        "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
         "type": "github"
       },
       "original": {
@@ -129,14 +130,18 @@
     },
     "flake-parts_2": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs-lib": [
+          "nixified-ai",
+          "hercules-ci-effects",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1685662779,
+        "lastModified": 1696343447,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
+        "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
+        "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
         "type": "github"
       },
       "original": {
@@ -144,29 +149,6 @@
         "type": "indirect"
       }
     },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixified-ai",
-          "hercules-ci-effects",
-          "hercules-ci-agent",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1685662779,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": [
@@ -174,11 +156,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694529238,
+        "lastModified": 1710146030,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -189,14 +171,14 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1694529238,
+        "lastModified": 1705309234,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -207,7 +189,7 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -225,7 +207,7 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -241,6 +223,24 @@
         "type": "github"
       }
     },
+    "flake-utils_5": {
+      "inputs": {
+        "systems": "systems_6"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fourmolu-011": {
       "flake": false,
       "locked": {
@@ -296,11 +296,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694102001,
+        "lastModified": 1709087332,
-        "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=",
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
         "type": "github"
       },
       "original": {
@@ -396,22 +396,6 @@
         "type": "github"
       }
     },
-    "haskell-flake": {
-      "locked": {
-        "lastModified": 1684780604,
-        "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
-        "owner": "srid",
-        "repo": "haskell-flake",
-        "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "ref": "0.3.0",
-        "repo": "haskell-flake",
-        "type": "github"
-      }
-    },
     "haskell-hie-bios": {
       "flake": false,
       "locked": {
@@ -493,7 +477,7 @@
         "lsp": "lsp",
         "lsp-test": "lsp-test",
         "lsp-types": "lsp-types",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_6",
         "ormolu-052": "ormolu-052",
         "ormolu-07": "ormolu-07",
         "stylish-haskell-0145": "stylish-haskell-0145"
@@ -528,7 +512,7 @@
         "lsp": "lsp_2",
         "lsp-test": "lsp-test_2",
         "lsp-types": "lsp-types_2",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_7",
         "ormolu-052": "ormolu-052_2",
         "ormolu-07": "ormolu-07_2",
         "stylish-haskell-0145": "stylish-haskell-0145_2"
@@ -548,40 +532,20 @@
         "type": "github"
       }
     },
-    "hercules-ci-agent": {
-      "inputs": {
-        "flake-parts": "flake-parts_3",
-        "haskell-flake": "haskell-flake",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1686721748,
-        "narHash": "sha256-ilD6ANYID+b0/+GTFbuZXfmu92bqVqY5ITKXSxqIp5A=",
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-agent",
-        "rev": "7192b83935ab292a8e894db590dfd44f976e183b",
-        "type": "github"
-      },
-      "original": {
-        "id": "hercules-ci-agent",
-        "type": "indirect"
-      }
-    },
     "hercules-ci-effects": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "hercules-ci-agent": "hercules-ci-agent",
         "nixpkgs": [
           "nixified-ai",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1686830987,
+        "lastModified": 1699381651,
-        "narHash": "sha256-1XLTM0lFr3NV+0rd55SQW/8oQ3ACnqlYcda3FelIwHU=",
+        "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "04e4ab63b9eed2452edee1bb698827e1cb8265c6",
+        "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328",
         "type": "github"
       },
       "original": {
@@ -680,11 +644,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682203081,
+        "lastModified": 1703113217,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
+        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
         "type": "github"
       },
       "original": {
@@ -700,11 +664,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700261679,
+        "lastModified": 1710452332,
-        "narHash": "sha256-jpQq/rJnjhkUHXz/KOQxk6fSfF7H0vV9PjFvfgTFHG8=",
+        "narHash": "sha256-+lKOoQ89fD6iz6Ro7Adml4Sx6SqQcTWII4t1rvVtdjs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3feeb7715584fd45ed1389cec8fb15f6930e8dab",
+        "rev": "096d9c04b3e9438855aa65e24129b97a998bd3d9",
         "type": "github"
       },
       "original": {
@@ -730,7 +694,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-rua03PcdrDhQoRjqAVHqUHfTUazlK0L1Pw8iIMM+YDA=",
+        "narHash": "sha256-/j8RpaKS3M26QXE61bqjZPBiaPwEiO5P9pJ2imA1bD4=",
         "path": "../dotfiles/config/taffybar",
         "type": "path"
       },
@@ -756,19 +720,19 @@
         "type": "github"
       }
     },
-    "lowdown-src": {
+    "libgit2": {
       "flake": false,
       "locked": {
-        "lastModified": 1633514407,
+        "lastModified": 1697646580,
-        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
+        "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
-        "owner": "kristapsdz",
+        "owner": "libgit2",
-        "repo": "lowdown",
+        "repo": "libgit2",
-        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
+        "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
         "type": "github"
       },
       "original": {
-        "owner": "kristapsdz",
+        "owner": "libgit2",
-        "repo": "lowdown",
+        "repo": "libgit2",
         "type": "github"
       }
     },
@@ -847,23 +811,21 @@
     "nix": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "lowdown-src": "lowdown-src",
+        "libgit2": "libgit2",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1690515062,
+        "lastModified": 1710366336,
-        "narHash": "sha256-PyvvANcbsjHAjvUsrGDyxk0b/CVExcrJAlCEQRp9HWc=",
+        "narHash": "sha256-eJeZ3vMbuC351B6CH4mqcpuZJ9RgtdRcxvhd7X2++Nk=",
-        "owner": "IvanMalison",
+        "owner": "NixOS",
         "repo": "nix",
-        "rev": "bedf108a183191519fdfa99a913f766090515d34",
+        "rev": "c152c2767a262b772c912287e1c2d85173b4781c",
         "type": "github"
       },
       "original": {
-        "owner": "IvanMalison",
+        "id": "nix",
-        "ref": "my2.15.1",
+        "type": "indirect"
-        "repo": "nix",
-        "type": "github"
       }
     },
     "nixified-ai": {
@@ -871,15 +833,15 @@
         "flake-parts": "flake-parts",
         "hercules-ci-effects": "hercules-ci-effects",
         "invokeai-src": "invokeai-src",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "textgen-src": "textgen-src"
       },
       "locked": {
-        "lastModified": 1698023400,
+        "lastModified": 1701304375,
-        "narHash": "sha256-2wrm9Y9gsI/OaZEsTqc2wflkfxlrvCRocJHpqkOm/Cc=",
+        "narHash": "sha256-WI/SimUvHPIWFhQTY04+1yCVjZzVjVb28pSE4S2yhFA=",
         "owner": "nixified-ai",
         "repo": "flake",
-        "rev": "7b9730e0a75bcd6375b0780aef75e406ea20a9a4",
+        "rev": "63339e4c8727578a0fe0f2c63865f60b6e800079",
         "type": "github"
       },
       "original": {
@@ -890,15 +852,15 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1699997707,
+        "lastModified": 1707802617,
-        "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=",
+        "narHash": "sha256-29HCocTg8aPr6gaY6VHNxJQpZQJ6GAqjFsKPqNFj5qo=",
-        "owner": "NixOS",
+        "owner": "colonelpanic8",
         "repo": "nixos-hardware",
-        "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9",
+        "rev": "cb96be8513e2959110c7f90ae5d61ca5aff35862",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "colonelpanic8",
         "repo": "nixos-hardware",
         "type": "github"
       }
@@ -907,14 +869,14 @@
       "inputs": {
         "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1700096639,
+        "lastModified": 1709980437,
-        "narHash": "sha256-FVOTqjwjLX4El7n3jErrWWQ4gR5NVcL7B8cvGRGFQSo=",
+        "narHash": "sha256-rp1MwfRaZl7TPM4E5i1HxQGJCCfMcIa7dOzTX3SW7ro=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "83ce0dbe362b9b866414bbc31a2dc9f1d41be649",
+        "rev": "e0b9e6c8ff35c7a28cb6baa02d85a9737a2ee4e9",
         "type": "github"
       },
       "original": {
@@ -925,11 +887,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677676435,
+        "lastModified": 1703013332,
-        "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
+        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
+        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
         "type": "github"
       },
       "original": {
@@ -939,24 +901,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1685564631,
-        "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-regression": {
       "locked": {
         "lastModified": 1643052045,
@@ -975,11 +919,11 @@
     },
     "nixpkgs-regression_2": {
       "locked": {
-        "lastModified": 1700284104,
+        "lastModified": 1710455890,
-        "narHash": "sha256-oNsJfAyAuBCTkusesiK0LWuO59F6vEGcP4wwa7kc1ZA=",
+        "narHash": "sha256-Ecfz+YhCEtj0KZhI90fiW21QqneOd5HpvMeJGzlN72Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "005617587ee2b7c003388b4539b9120ebcc90e44",
+        "rev": "30ccdc28ecb2060cfe01d679aa8a4304631a41b5",
         "type": "github"
       },
       "original": {
@@ -990,27 +934,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1670461440,
+        "lastModified": 1709083642,
-        "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=",
+        "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425",
+        "rev": "b550fe4b4776908ac2a861124307045f8e717c8e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11-small",
+        "ref": "release-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1686501370,
+        "lastModified": 1700204040,
-        "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
+        "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
+        "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
         "type": "github"
       },
       "original": {
@@ -1022,48 +966,48 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1697059129,
+        "lastModified": 1707514827,
-        "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
+        "narHash": "sha256-Y+wqFkvikpE1epCx57PsGw+M1hX5aY5q/xgk+ebDwxI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
+        "rev": "20f65b86b6485decb43c5498780c223571dd56ef",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1697851979,
+        "lastModified": 1710272261,
-        "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=",
+        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8",
+        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1699963925,
+        "lastModified": 1686874404,
-        "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=",
+        "narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bf744fe90419885eefced41b3e5ae442d732712d",
+        "rev": "efc10371d5c5b8d2d58bab6c1100753efacfe550",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "haskell-updates",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -1086,18 +1030,16 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1686874404,
+        "lastModified": 1682134069,
-        "narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
+        "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "efc10371d5c5b8d2d58bab6c1100753efacfe550",
+        "rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "id": "nixpkgs",
-        "ref": "haskell-updates",
+        "type": "indirect"
-        "repo": "nixpkgs",
-        "type": "github"
       }
     },
     "notifications-tray-icon": {
@@ -1188,12 +1130,13 @@
         "nixified-ai": "nixified-ai",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-regression": "nixpkgs-regression_2",
         "notifications-tray-icon": "notifications-tray-icon",
         "status-notifier-item": "status-notifier-item",
-        "systems": "systems_3",
+        "systems": "systems_4",
         "taffybar": "taffybar",
+        "vscode-server": "vscode-server",
         "xmonad": "xmonad",
         "xmonad-contrib": "xmonad-contrib"
       }
@@ -1337,6 +1280,36 @@
         "type": "github"
       }
     },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "taffybar": {
       "inputs": {
         "flake-utils": [
@@ -1361,11 +1334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696612500,
+        "lastModified": 1706639324,
-        "narHash": "sha256-Q19F91yVQviqxgY+FkvEwtX2vcw414eVtK8erim0NrU=",
+        "narHash": "sha256-O5T4/1+dERQitmA6pwcP67/tREcJQ7KuATD8kGiB2Es=",
         "owner": "taffybar",
         "repo": "taffybar",
-        "rev": "46eba89c2a4d4ffefe42c3ee4506d1b74c8e61fd",
+        "rev": "9c8540a56432db6555755a9a649b4874833520ed",
         "type": "github"
       },
       "original": {
@@ -1393,11 +1366,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1699963925,
+        "lastModified": 1710272261,
-        "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=",
+        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bf744fe90419885eefced41b3e5ae442d732712d",
+        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
         "type": "github"
       },
       "original": {
@@ -1407,6 +1380,25 @@
         "type": "github"
       }
     },
+    "vscode-server": {
+      "inputs": {
+        "flake-utils": "flake-utils_5",
+        "nixpkgs": "nixpkgs_8"
+      },
+      "locked": {
+        "lastModified": 1709622318,
+        "narHash": "sha256-bTscF0366xtoIXgH7Zq+Mn0mpX3w4h/2xKpHiYMyLNc=",
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "rev": "d0ed9b8cf1f0a71f110df9119489ab047e0726bd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "type": "github"
+      }
+    },
     "xmonad": {
       "inputs": {
         "flake-utils": [
@@ -1421,11 +1413,11 @@
         "unstable": "unstable"
       },
       "locked": {
-        "lastModified": 1699833963,
+        "lastModified": 1710184205,
-        "narHash": "sha256-JNT6nnDJUvi/aPh9nOP7dQJGrfMdjzEabbHc+Qduwic=",
+        "narHash": "sha256-vcDr/l0dohzk1ZtWdMGK9j7QUNS7RpdwmA1Mku/r6CY=",
         "owner": "xmonad",
         "repo": "xmonad",
-        "rev": "2f585679120747defaa8b49880cbbab943b4c22c",
+        "rev": "746880e9b9bb4eecc6e89e26f760cfbdf1464fed",
         "type": "github"
       },
       "original": {
@@ -1450,11 +1442,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692232716,
+        "lastModified": 1707727304,
-        "narHash": "sha256-MwbeBTfcf6vE7bQvha4ueg5zLZxBiU3678ESYrXD4lw=",
+        "narHash": "sha256-KTtenUGK03CjBYnoceDIYG1d12oNgvfDa3dakILz7jY=",
         "owner": "IvanMalison",
         "repo": "xmonad-contrib",
-        "rev": "b5ef6265b87338f30dc9fc055c86d1ec021527a7",
+        "rev": "229c7baf006bf68e76ec1305f55d7d42a6cf7042",
         "type": "github"
       },
       "original": {

nixos/flake.nix

@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixos-hardware = { url = "github:NixOS/nixos-hardware"; };
+    nixos-hardware = { url = "github:colonelpanic8/nixos-hardware"; };
 
     nixpkgs = {
       url = "github:NixOS/nixpkgs/nixos-unstable";
@@ -59,10 +59,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nix = {
-      url = "github:IvanMalison/nix/my2.15.1";
-    };
-
     flake-utils = {
       url = "github:numtide/flake-utils";
       inputs.systems.follows = "systems";
@@ -103,6 +99,8 @@
       };
     };
 
+    vscode-server.url = "github:nix-community/nixos-vscode-server";
+
     nixpkgs-regression = { url = "github:NixOS/nixpkgs"; };
 
     nixified-ai = { url = "github:nixified-ai/flake"; };
@@ -153,10 +151,14 @@
       specialArgs = rec {
         inherit inputs machineNames;
         makeEnable = (import ./make-enable.nix) nixpkgs.lib;
-        mapValueToKeys = keys: value: builtins.listToAttrs (map (name: { inherit name value; }) keys);
-        realUsers = [ "root" "imalison" "kat" "dean" "alex" "will" ];
-        forEachUser = mapValueToKeys realUsers;
         keys = (import ./keys.nix);
+        usersInfo = (import ./users.nix) { pkgs = { zsh = "zsh"; }; keys = keys; };
+        realUsers = (builtins.attrNames
+        (nixpkgs.lib.filterAttrs
+           (_: value: (builtins.elem "isNormalUser" (builtins.attrNames value)) && value.isNormalUser) usersInfo.users.users)
+        );
+        mapAllKeysToValue = keys: value: builtins.listToAttrs (map (name: { inherit name value; }) keys);
+        forEachUser = mapAllKeysToValue realUsers;
       } // specialArgs;
     });
   in

nixos/gitea-runner.nix

@@ -21,6 +21,7 @@ makeEnable config "modules.gitea-runner" false {
       };
       hostPackages = with pkgs; [
         bash
+        direnv
         coreutils
         curl
         gawk
@@ -29,6 +30,8 @@ makeEnable config "modules.gitea-runner" false {
         gitFull
         gnused
         nodejs
+        docker
+        openssh
         wget
       ];
       enable = true;
@@ -46,4 +49,11 @@ makeEnable config "modules.gitea-runner" false {
         XDG_CONFIG_HOME = gitea-runner-directory;
         XDG_CACHE_HOME = "${gitea-runner-directory}/.cache";
       };
+    users.groups.gitea-runner = {};
+    users.users.gitea-runner = {
+      isSystemUser = true;
+      group = "gitea-runner";
+      extraGroups = ["docker"];
+      home = "/var/lib/gitea-runner";
+    };
 }

nixos/gitea.nix

@@ -4,6 +4,10 @@ makeEnable config "modules.gitea" false {
   services.gitea = {
     enable = true;
     lfs.enable = true;
+    dump = {
+      enable = true;
+      interval = "23:05";
+    };
     settings.server = {
       DOMAIN = "dev.railbird.ai";
       SSH_PORT = 1123;

nixos/home-manager.nix

@@ -14,14 +14,11 @@
     forwardAgent = true;
   };
 
-  programs.gpg.package = pkgs.gnupg_2_4_0;
-
   services.gpg-agent = {
     enable = true;
     defaultCacheTtl = 8 * 60 * 60;
     maxCacheTtl = 8 * 60 * 60;
     enableSshSupport = true;
-    pinentryFlavor = "qt";
     extraConfig = ''
       allow-emacs-pinentry
       allow-loopback-pinentry

nixos/justfile

@@ -0,0 +1,14 @@
+switch *args:
+	sudo nixos-rebuild switch --flake '.#' --impure {{args}}
+
+fix-local-path-issue:
+	nix flake lock --update-input imalison-taffybar
+
+
+expire-home-manager-generations:
+	#!/usr/bin/env bash
+	set -euxo pipefail
+	for user in $(awk -F':' '{ if ($3 >= 1000 && $7 !~ /nologin|false|sync|shutdown|halt/) print $1 }' /etc/passwd); do
+	    echo $user
+	    sudo su - $user -c 'home-manager expire-generations -1days'
+	done

nixos/keys.nix

@@ -21,6 +21,7 @@ rec {
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCJ08qswd3OoApAIHQwojEUJ4sre89vSngbM3x5pBP2 imalison@jay-lenovo.local" # Kat's Lenovo Legion
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOVGIGnpkU7HNQ/zl/Ffi562M+laWY9/yIjB63BCMiTS kat@nixcomp.local"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO3tlMePru6ZlSuf8yUii3N1dy3WwJnSQAt3EgETkctK kat@jay-lenovo.local"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFrOYD3ReFc2+xFUylBFHREcm1lO7BRJGW5JrOoY3I8s ivanm@strixy-minaj"
   ];
   deanKeys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICDvbEVL+y7eV4+mtxOuHwyomBBQ6uYMesctstua20+e deanwenstrand@deans-mbp-2.lan"
@@ -45,4 +46,8 @@ rec {
   railbird-sf = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDozY/3Cd9npaYPCgIn/E7MjW9c7Zb5/wTO5Qi7yRU45 root@railbird-sf"
   ];
+  micahKeys = [
+    "AAAAB3NzaC1yc2EAAAADAQABAAACAQC4ayU9sly58EHQ2YdrnoJ5o0mFD8I8UiDvN3kVh6oSMMQ9wkVzLUY6wUzlc0uq3P/OYco9mURMt83C+lY4UC+jvN09nIEHV7yVJWsKV3ntmnEqM63e9cOWnpC9XA1MSha7xrf9DaO/doxST4fY6ixZA+nbE0bFgNTqyjzdya7pCamAdnPqKqwUEha+0KfpA8TJlrfgrDLd65f2/+jLU8fhTkU6yhrJ9Piq7C+RwVTu/dlrp50PNirfQRSa7vUPNS8Y973XtK6jzB/xS2Qc6iGJ+4QcCy6lgu2xksO/MNIimZYGOCP2yx6/GDp/gnOlAktrJ3flMycJdEHkZVH61HfQV76O/mY3tck/SiCwhuNxXw0uh9wf4UO8JHlnJcsIsBkSBemJsxQul+G7kV4EV/gqW/iO5U2nKmDqbwNWigO9mN44LqBOwsnAnu78kiSE8sNCEdSy/qVWloBw4VyT/emvmTwP1okh/CKNnu0/HmfSNL6Vib1XuvKSPvrUIOLMrSeRdtu85LrWaS0CvKEoMrIgpvc+3jHtdbxwINE3JBGrbXvfe20CuHl6Fx0ONkhirRmrjG7iUjV/4c6nS2aguPVsGi7q3GYvtz7cNEe3XbfpZaHzrCncnoQPbnSDLjHdeZf4O5Aew6iOwwkpgBBDA3lJO55ujq2vNbgkpH3hmQjltQ=="
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEBce6E/XCdo8+dC4PPyyTsO/Z0BZxuz0IrTLaGehrT weitzman.micah@gmail.com"
+  ];
 }

nixos/machines/adele.nix

@@ -3,7 +3,7 @@
 {
   imports = [
     ../configuration.nix
-    inputs.nixos-hardware.nixosModules.dell-xps-17-9700-intel
+    inputs.nixos-hardware.nixosModules.dell-xps-17-9700-nvidia
   ];
 
   modules.base.enable = true;
@@ -15,14 +15,21 @@
   modules.syncthing.enable = true;
   modules.fonts.enable = true;
   modules.nixified-ai.enable = false;
-  modules.gitea-runner.enable = true;
+  modules.gitea-runner.enable = false;
 
   hardware.enableRedistributableFirmware = true;
 
+  environment.systemPackages = with pkgs; [
+    android-studio
+  ];
+
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
+  services.xserver = {
+    videoDrivers = [ "nvidia" ];
+  };
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 

nixos/machines/biskcomp.nix

@@ -7,6 +7,12 @@ in
     ../raspberry-pi.nix
   ];
 
+  users.users.nginx = {
+    group = "nginx";
+    isSystemUser = true;
+    extraGroups = ["syncthing"];
+  };
+
   modules.raspberry-pi.enable = true;
 
   modules.base.enable = true;
@@ -40,6 +46,15 @@ in
     defaults.email = "IvanMalison@gmail.com";
   };
 
+  # services.nextcloud = {
+  #   enable = true;
+  #   hostName = "nextcloud.railbird.ai";
+  #   config = {
+  #     dbtype = "pgsql";
+  #     database.createLocally = true;
+  #   };
+  # };
+
   services.nginx = {
     enable = true;
     recommendedProxySettings = true;
@@ -60,6 +75,16 @@ in
           proxyPass = "http://192.168.1.26:3090";
         };
       };
+      "syncthing.railbird.ai" = {
+        enableACME = true;
+        forceSSL = true;
+        root = "/var/lib/syncthing/sync";
+        locations."/" = {
+          extraConfig = ''
+            autoindex on;
+          '';
+        };
+      };
     };
   };
 

nixos/machines/jay-lenovo.nix

@@ -8,6 +8,7 @@
   features.full.enable = true;
 
   environment.systemPackages = with pkgs; [
+    android-studio
     linuxPackages_latest.perf
     zenmonitor
   ];
@@ -25,6 +26,8 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
+  modules.postgres.enable = true;
+
   networking.networkmanager.enable = true;
 
   services.xserver = {

nixos/machines/jimi-hendnix.nix

@@ -15,6 +15,7 @@
   modules.fonts.enable = true;
   modules.nixified-ai.enable = false;
   modules.gitea-runner.enable = true;
+  modules.postgres.enable = true;
 
   hardware.enableRedistributableFirmware = true;
 

nixos/machines/ryzen-shine.nix

@@ -13,6 +13,7 @@
     port = 3090;
   };
   modules.gitea-runner.enable = true;
+  modules.postgres.enable = true;
 
   boot.loader.systemd-boot.configurationLimit = 5;
 

nixos/machines/strixy-minaj.nix

@@ -0,0 +1,70 @@
+{ config, lib, pkgs, inputs, forEachUser, ... }:
+
+{
+  imports = [
+    ../configuration.nix
+  ];
+
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = true;
+  modules.extra.enable = false;
+  modules.code.enable = true;
+  modules.games.enable = false;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.nixified-ai.enable = false;
+  modules.gitea-runner.enable = false;
+
+  hardware.enableRedistributableFirmware = true;
+
+  environment.systemPackages = with pkgs; [
+    android-studio
+  ];
+
+  services.xserver.dpi = 96;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+  services.xserver = {
+    videoDrivers = [ "nvidia" ];
+  };
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+  };
+  hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.production;
+  hardware.nvidia.modesetting.enable = true;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  services.asusd.enable = true;
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/fc06a54c-cc45-423a-914b-8dfcb5939106";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/B28A-829A";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/27f277a0-b552-43a0-904d-625e48922bb9"; }
+    ];
+
+  networking.hostName = "strixy-minaj";
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  home-manager.users = forEachUser {
+    home.stateVersion = "23.05";
+  };
+
+  system.stateVersion = "23.05";
+}

nixos/nix.nix

@@ -6,7 +6,7 @@
 
   options = {
     imalison.nixOverlay.enable = lib.mkOption {
-      default = true;
+      default = false;
       type = lib.types.bool;
     };
   };
@@ -27,19 +27,19 @@
       settings = {
         keep-outputs = true;
         keep-derivations = true;
+        substituters = [
+          "https://cache.nixos.org"
+          "https://cache.railbird.ai?priority=45"
+        ];
+        trusted-public-keys = [
+          "cache.railbird.ai:KhnvcouxtIU2zxUcjJsm4bUK3o1S3p8xMf9qfZGF7/A="
+        ];
+        nix-path = nixPath;
       };
       channel.enable = false;
       nixPath = [
         "nixpkgs=${inputs.nixpkgs.outPath}"
       ];
-      settings.nix-path = nixPath;
-      binaryCaches = [
-        "https://cache.nixos.org"
-        "https://cache.railbird.ai"
-      ];
-      binaryCachePublicKeys = [
-        "cache.railbird.ai:KhnvcouxtIU2zxUcjJsm4bUK3o1S3p8xMf9qfZGF7/A="
-      ];
     };
 
     nixpkgs.overlays = [

nixos/overlay.nix

@@ -17,13 +17,14 @@ final: prev: {
     };
   });
 
-  picom = prev.picom.overrideAttrs(_: {
+  picom = prev.picom.overrideAttrs(old: {
     src = prev.fetchFromGitHub {
       repo = "picom";
       owner = "dccsillag";
       rev = "51b21355696add83f39ccdb8dd82ff5009ba0ae5";
       sha256 = "sha256-crCwRJd859DCIC0pEerpDqdX2j8ZrNAzVaSSB3mTPN8==";
     };
+    nativeBuildInputs = old.nativeBuildInputs ++ [ final.pcre ];
   });
 
   expressvpn = prev.expressvpn.overrideAttrs(_: {

nixos/postgres.nix

@@ -0,0 +1,32 @@
+{ pkgs, config, makeEnable, realUsers, ... }:
+makeEnable config "modules.postgres" true {
+  services.postgresql = {
+    enable = true;
+    package = pkgs.postgresql_15;
+    ensureDatabases = [ "railbird" "public" ];
+    authentication = pkgs.lib.mkOverride 10 ''
+      #type database  DBuser  CIDR-ADDRESS auth-method
+      local all       all                  trust
+      host  all       all     0.0.0.0/0    trust
+      host  all       all     ::1/128      trust
+    '';
+    ensureUsers = map (username: {
+        name = username;
+        ensureClauses = {
+          superuser = true;
+          createrole = true;
+          createdb = true;
+        };
+    }) realUsers;
+    # initialScript = pkgs.writeText "init-sql-script" ''
+    #   CREATE DATABASE IF NOT EXISTS railbird;
+    #   \c railbird
+    #   CREATE SCHEMA IF NOT EXISTS railbird;
+    # '';
+  };
+  services.pgadmin = {
+    enable = false;
+    initialEmail = "IvanMalison@gmail.com";
+    initialPasswordFile = (builtins.toFile "password" "This is the content of the file.");
+  };
+}

nixos/rabbitmq.nix

@@ -0,0 +1,6 @@
+{ pkgs, config, makeEnable, realUsers, ... }:
+makeEnable config "modules.rabbitmq" true {
+  services.rabbitmq = {
+    enable = true;
+  };
+}

nixos/rebuild.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-rm flake.lock
-nix flake update --impure --inputs-from .
-sudo nixos-rebuild switch --flake '.#' --impure

nixos/secrets/gitea-runner-token.jimi-hendnix.age

@@ -1,48 +1,49 @@
 age-encryption.org/v1
--> ssh-ed25519 ZgrTqA ZhQai78QiRxex0hvG+zf+qL1hbTb4/JVJVWmDG8rAUU
+-> ssh-ed25519 ZgrTqA zsIOhgeJ7P+Ahrrh+coSbVgxw6RtPymZs5ll8X2BpTA
-yKincV6tR86Qr28JC+0+LdXWLamys7D3Zka6JKFk1sk
+ON9VLFUzhFU/sxslo4Wt7EgohGdY+k58ri+G5naolLs
--> ssh-ed25519 ZaBdSg /bWisLCN6LpAZpgwqZvtp0Bpmr4EBDZKKw67w6DwCDQ
+-> ssh-ed25519 ZaBdSg /OzROBe2BME+hsdWTna+UV4tIEJK9lDDaZQnpUYWfmA
-qdlTc0+bgu040JrSFHxVYhOOjBgL/mlpv41d7BnbBdw
+PjU8bzoct2GPytjXMxbYdPlGi9RgfaGNdlcdx8X9mcs
--> ssh-ed25519 MHZylw 7mUaZTrTTusBBB3c9bwD8xiYOEu2Yy0vD0/JBhIfThQ
+-> ssh-ed25519 MHZylw RKGcQyfmai8OeNo0c6zyW0KaZ4Mgt66qikomlON272c
-x9vauqbTA+OL4yObO5EHsXhSurtYTYkSH8VQKl+B4Tk
+lO2AvsQ/3oWl0aNzitwjnFOV20H//wiuMY1MY/3WDrM
--> ssh-ed25519 sIUg6g wPIoib/eshBQvzAKdWqD6eWyWozxKuOf9h6ebG3KmUo
+-> ssh-ed25519 sIUg6g 8at+Rg94MgOePuOA9fUCPuxyleQHDaGPnsaNQNy6824
-9D74H5EqsPlrNCgrDJo7ZofwNz0JvB0GzvwI4RAILRw
+CCNrSkINVlqAhi2rzAEjnzX+aJBj8S7D5OjOc7+282I
--> ssh-ed25519 TnanwQ aFqE3LuU6rjBTISLPzdz0dCcurg/8T6CLFI8ota2m2M
+-> ssh-ed25519 TnanwQ JQ5HncLZsUKpXbUhRBvS+UdMa8ARJBRIK75w2kuD0Hs
-sFCyTPiqu6t/qqXSdmjnDVYjIGDLEGxUPYxerUTZlFU
+6giGtalrSpcO2Xb7IxCvqhi7Op/wdNnhPqGOVxumutc
 -> ssh-rsa gwJx0Q
-yKgI9wnuT5YhySbf2mxkNwnSgdHv5fnaDI759day+jw7rwtV/Q/RoWPghCEfS3T9
+q9YKescXHdvkSEEL+buHyFpedrkyP8KN+U5mwe4ML9bdFGsEESBjtwRs+wTHBKfR
-+u/dFpNubL1+Sue/d0PxpJwaGV+nZb13/a1DpYZaaXYXIYiMpBaZR/3bCF1uSuOp
+DGueZFt8yloafYJJi2bDSOwQM+YQ7l3I9pmkdK8xppUpoxc5lsd3za4tZvl7Q3mQ
-LAJAqS2WlG8+ysTj5EN+RBud4sFYYZ5gp+xk+wX/aY+NIxjQ/cKhZtlk9e9THAHJ
+JMgqfQ1pwpPG8YnKEnS1rZ6DFq3wJ4dH5dOkEcSkUflUse2GrVpkFHA6B0iF4Fth
-WYdYkc25sp7DCsj5HlIczkmx2Wn2wajJvOKOBK95Jijn/y7+Zj+hTF2MKjfRJnGw
+F8cpVOpBh8zruRp5b1hNlzuC+4E4fgLC/dqo/WK17gEQmPBoVLmZurAsLUz63VBR
-EoizLrr1EN2hkCbUJCwbef2NNBlUnI4A/LvKvr/2xmdw8aJc+lgEA1EssVab0Ugx
+XJ0cphb39Jx+OqID0pfoRx8F7pWNMXeziQ/figtfX1BVsvAgAfG/G52UQIHPBB9l
-jgBHsW+70T/yT8CbSo+n6Q
+lRbUKp533f8J4B3uQlplAQ
--> ssh-ed25519 YFIoHA j1o7t3EaY5JBJFlxv406aS+5nrQbjj2xu2l/rkwsfhU
+-> ssh-ed25519 YFIoHA As3dFA/KZEv4uK3cABiksYAbbRKD/SAYHn6DMu5A/ho
-CTlM2FFqysa2cu+tonQ+XtdkOe8lSx7bA0XX5cRuHh4
+1Gui6pI2/Y/4fhL+sV+ReE/Q8YzOXpa+el9ieDI63hg
--> ssh-ed25519 KQfiow iTAhqJszH3qfZLcJEPsPUOfsg2lnWE1yGcFHmVqcK04
+-> ssh-ed25519 KQfiow JfOvjZPAjSMEtyMj1ES5hgZQ3ChceOAgCUlAwdUWvHE
-rAcVdfcrYcqDTUiyB1Xj3OsxQZGaXsd7XPT2ZENZxg4
+cHOS/ogIjIt3/cpcsip/OUbTa/XTsqabxpih0Q4d+vs
--> ssh-ed25519 kScIxg SdRrX6jPDbApqYb0BUvoPENfO0EREAcVzov0mYiqfW0
+-> ssh-ed25519 kScIxg Ss92xRhzfFLuQ7cZ9qOXWYlxPosZJiIA5WUtnBn5uAA
-YxCq3/YI0RAI6tSe2S9eFFHRiRT+cgiqKG38R1Ed0rk
+eFbchoQ2WFT5QZlbMp3ie2IO+oN1gDx5LEHYgtmibyU
--> ssh-ed25519 HzX1zw +77mjckApgLbOn6r+E9ftgUOFFhDX7t6wQcCn8shA1c
+-> ssh-ed25519 HzX1zw CXFvvKTr+chLDjxeHIQq6YgfsyNguoqQgWMVCriq03s
-LzP5oBw0YDfET9c6AiuRUrDPAblExBtPfO/aLM5bTPY
+AfZclyaLfIyVgRsSt6gFw/n3Gmjz9+qqcbS+jKLUTdU
--> ssh-ed25519 KQfiow /kv2czudYV5/knn4gm9UjWkTgK7h52OSwnBtQkJ4Ogs
+-> ssh-ed25519 KQfiow hoWtmj8tL3hYQaCusTzoEe2wy/hzOBQF/+ygYN0j0QU
-x3U//RiRVbD2q+2BB7fRZ+D/mOuq2RBBrUwRaGaZ4t4
+lvfAsrOv1vtQeYvlacFyg6rlEUeb2nwxelSCkHZL1JQ
--> ssh-ed25519 1o2X0w sWQrEHabTxKgPXctvjbozGia0TOFNY/nMkJkbg9wjDk
+-> ssh-ed25519 1o2X0w hSNKyIkQ5HrqUodLzWRrx+7RkxFg9A1TVuXbq+EFlw0
-xKMdH3+dGd0I/GCuII/29D49X0pGTkB3lig3PizcfAA
+CXUpZnKGuXV34Tt4YWGL1hheYHSYB2JonuxmZC9BNZg
--> ssh-ed25519 KQ5iUA 0GxPwSfFhyFmgFjg17ZdQ+Np8ozLcZw4qnmJXf8e5Fs
+-> ssh-ed25519 KQ5iUA jbUaWkNa1xj8gKEalGx7wJWcVwwDWQ5Mzq7kw0Rk3BU
-BmMvDNnEFqRHN/DQxTS2xYr64rsNwwcJ/ISx+tSgwIk
+y71HcF0ApASye3RgUHEThP1aFZZX5jocKHL25qZ2yZ8
--> ssh-ed25519 AKGkDw LP67Vi5XAYaeCRzKRvUol+9sYhj5DfRM2XFcfpBObCk
+-> ssh-ed25519 AKGkDw n5MO4SkU61QWZ57aG+383Q3raFRdomDMXGaDMgpQUSs
-sQR+s300FSVp7MGvc0lAlsiriF1yYG+gv2O8qXLC0qI
+4g2UfsdaNa++TRXNrUfVV8pj6irb0W+F10XfVAPJk+Y
--> ssh-ed25519 0eS5+A 6W01v2D+eo7ykmdt/c6+OngbOgPYhp3IRzOP7YycGAE
+-> ssh-ed25519 0eS5+A DMk4jzjnfPWzk3kz1gwebXqJ5a3yAvqTi1fXCEBLi2k
-xSiwX/pPa6u+wMP99930ZALt3fUI52k56o9DIj5MJP8
+JL5wGUcHNQDz4Czo6yQ2Eo5sc0/psjo0O0C9unL3V0g
--> ssh-ed25519 9/4Prw OhlAdZNG5GI60FecavQWNBHWOK5u+ONItDSnJ7kW6hE
+-> ssh-ed25519 9/4Prw 9RMdxeyRXz8pKxAaiOrd/D5UdImOB48C0OE4x1MbSnw
-KBybj+3HZ4FCHht8lwBqJszCMZvylSoLrnOeKslDvi0
+5m4g4ZSMLP99bYR0+twroVvnowpGBPolw/u0T/wDCmk
--> ssh-ed25519 gAk3+Q t5ItGM7NarFQYDU4Ae+39ZIdhmnX7liY+bqRtsqY8F8
+-> ssh-ed25519 gAk3+Q Mos0Csznmt3wZF0fE+BKlqTMJgLKR/+Yih7DTNaLF3s
-o+MKA8rMnXOUECFLf0bnqo4uohTjI2PN2ejvKSDbOeE
+EfaOXBbeS2q36lUfydPL35GcL0qzxEyG1/g1HUk+Bjc
--> ssh-ed25519 X6eGtQ JbV/sf9/HVBpVcCym7rDvSXUNvE7t1/eHQpIjksw0Cs
+-> ssh-ed25519 X6eGtQ 3uAhhDAEQQCu7MQmNbEAs8/bDxEeh50VefU+prQN5SU
-UO0cDqFmcEQt+vasnMAc4O4bmEkLdkYzj9YzsMmsfzM
+jdp6QFF9Yw3zHrbmijJQV0CqlcoOm0BU3fkJTJAsxpY
--> ssh-ed25519 0ma8Cw WMNiHynQWBF/8ig0JF5tZcGruRDHHxlJOQtJalv7+lg
+-> ssh-ed25519 0ma8Cw +7QmGjIuxHsqeDxeLkiSvpaC7ztv+Ix0rEwEhbTeHG0
-8U5QXXo3qV9QlRZobD2K4O01uQfzCd+BSViZf9fIRYo
+DUHK8xqoxnE78AMIh9z846eWcSToc6PruVERTOCdya8
--> }-grease WA!
+-> ssh-ed25519 Tp0Z1Q Alv9QyL6AzdLRTyN8pn413eeKW32ql3i/WVhasuKETI
-O5uhSTAdlz9vuYJoelzj2CABhv00grAx
+EkkG/JknXDT5opzLSZ3Gbf8d3+FlHwwxzbZK/nCQ6ng
---- m3xCzyC0aFdfuklw+MDS1kx0oor72n4iP9w3iaYDpJs
+--- zN1cSiDL5ZI84c9DI4ewQLqaGZJS1IR6EoSlpQC44zI
-î1úèÙ;b—2_ë±Dz«	aÃêL15OtÑ“‡»Õ!+ñܨ¨PlÎEÌ23£"kzdFIEÂø³¦ªÃÏüà‰w…õ(ÿæ,¾¾K”<17>
+ìØ·ÖÛ¨9‹H
ÛGþ.Dh{ø:—æpí2¼yY±ìõ`…o“cð©$ŵù–Z
+ÂåƒÎÿ´ÙT©¸¾IÃl2îóOÿ¹PÈøšù™$®G

nixos/secrets/gitea-runner-token.nixquick.age

@@ -1,48 +1,48 @@
 age-encryption.org/v1
--> ssh-ed25519 ZgrTqA swipq6Fr927DGa/aS5gVWl3TaGIwwyVn/pLb61AOjBc
+-> ssh-ed25519 ZgrTqA Hv1BMWICdw57RojY05L13liVfrg9qt6WxhiK6SAnqnc
-WZjYqhvV4UuYRWE1VOhlrZZwDZl5LaTgwJRpidx6xBE
+vveVXJsn4MVYTLX/HvKaofXWOeJ0IMdWSeDljKSlSwg
--> ssh-ed25519 ZaBdSg j1wG6GxL536GI98uQDjvd3k4NX9i6xJaTURsOeM8tmI
+-> ssh-ed25519 ZaBdSg iyNGSlaHdvTctpECP5qXFSO0gC0skd25gCidX8mJhXE
-omHmMEDCCjoCDb/CClty0crcLxyGgHUswr4HOP4L86k
+4lC4UIFuPimSfPuavLjhR94M5roDeco5yRDClI4P0V8
--> ssh-ed25519 MHZylw BS4N9FGQvoBFYMcUKZ/0fNAR5b8gRdEqdBahN4IjhWc
+-> ssh-ed25519 MHZylw a8Ueer7YzQ1f4PPgedktuyNWa1r4cE3u2nDU61nC7UU
-ZnDyOGMiVn2zyKisDpHu5o9AFg+Sxsor09p1BpL3hQU
+SETxeXg59NOznOfuLvduM2tKUolThR+CNWVCAj4fahc
--> ssh-ed25519 sIUg6g hGohSvdPUBmiD5XvGT5S8svHKeoX4iADR0wnTXBrvm4
+-> ssh-ed25519 sIUg6g A/C7Vtugn4p3w7gc6s/ZBbTIUW2dOEcGwSVfm0kwY1c
-q2kb1n46DQAceE0PpHwk32cycGur8eWGUwjyfp4o38M
+66bSBWF+ZVKHvmEi+OEnfQF9m+7u+W0VnbDHxw9WY/Q
--> ssh-ed25519 TnanwQ 9eI4k/NX5NgWWsydOu0bi8OhBncIKS6xyMEzuJrYY1s
+-> ssh-ed25519 TnanwQ E2I98KMUGzMDiyJLUeZcLpb++1v8udmnONioiVmVzyk
-dY4WyWbqcGS+RQUM391kGBlRXFzB5fIX+PpVQPvcD2I
+Sbc6bfi8VUyO6eBBkyv5DoEfVNd99K1G8NexeDmuDhA
 -> ssh-rsa gwJx0Q
-Hc+8CkU0zml1AMG2z4mxx8/0Yd0YlcdSkPgMqXk7TL+Pu7uJPLNfsxHDGKFKLeOJ
+vwnSvESPfLtlWVchHtsmPAYqUnSoKIjf16qwk6rKD976cDQt8TEQqKjbGExHNBZF
-uWeyFRJHXx3gOoGo2sQpMcInnU1PL6bNq6r86KeUruYDUMgxak8Pze9LFv9ZzsfY
+hnXfPxLy4at1cJzPCVOsumGVdkTkGPhMkyOSTnzipGBA0hiFZ/YKmoqyl8MnOy9H
-+nJ7u/kpSFvhRQR4J3cbwK3ZI2ezWHGi6vClGf+Orxt2k6I8WkwDPVC7+xeQDOFh
+RVd51JJLdmUUDUsVLdv8DEbYw2mTmLJsoum+LXi1oYHrYqhQvC2PhXH8b/jfn0En
-pFa1V44OfcJXeSLEyioPKxB2LXBl30qcVcWiCMWyHt4GiITLovGKqYxrM1Q5jPXU
+vYrzIxbFaJ/xw6o+T+4G/5d3DCX4fb9ccYHnLhv9GQWvQPH+wEfYkKBaxriur1ir
-Ty08vkYlgqGEOdvmE4LaBsZ/SnKukArUHykjstUp7bCqqVAaywy5zcDt9RhOnz3k
+9gkE1kErSzemr0sND5NoZKkGqf4P4ear3Vnjtf1gg1Can3Fqutb0B9ou71RD111J
-tTSB2Gy5/reAD4NqbLb8Sw
+SupcBHc0D7Kc47CTzI/V4w
--> ssh-ed25519 YFIoHA 5dSh3gD/8VZAzoUqs0qhcPl91+i+Bf9et1DXXDukr2M
+-> ssh-ed25519 YFIoHA HSIHZ70ZSLrbeieWFfRI8Syj5QVr3X3g3J68ZEsOSSg
-2GUCUGw0lqyJj9Doed75mG5ix3La9BjeLUd39ZiTeyg
+8veYBdbZfkqQ/7YvpFeE7pjWR1hZ9HF4JfM5yPUdl3Y
--> ssh-ed25519 KQfiow Xv1iY0dBtz3V8T5GyPET9BwqbX4Y4af7eecBY7y1Anc
+-> ssh-ed25519 KQfiow 4Ofzo/KS6qE+bb2O2l9p+Xl7sVSyYztBW1wy7e8aGCk
-ts5ErCZqFcRTf6lLprZrr2np8o6BBGblRPrOh44UFNA
+gzeCLM85g+tSGYFAM3z03HVwyO67sriOVgL6uiOGWV0
--> ssh-ed25519 kScIxg G2Je9Qp1A9Zj9b5luvK2sJO1SWy2AZKGcM6EHKigPns
+-> ssh-ed25519 kScIxg MNZ5ZwjuGahkB/N3KlIzCwQjtenikYhCcqOqUsotG3c
-bKIxxBdJ+DiRWuXRNDilOKxQJdVekzs9IwR7GiTireY
+SvDAuGNWu1SG7EEQLJboFJ0VKEAbcc1rZbg9LCdxtyk
--> ssh-ed25519 HzX1zw wMhENDQMUsij9CbQaxkVIglL6WBZlDeZbRLqm7otEAg
+-> ssh-ed25519 HzX1zw 9Z3XU4h4otPcP+3hx4gA3t3/T5RJAOyf/Lm/gWK8Y28
-gzlH0PS+wgoHm9RiJnOwJtxWdAILLHNGOd/lsk35vCE
+WEpitv/XIXxHg0Rmf2zibIq8Vrf01ieEPJ9teXgHp1g
--> ssh-ed25519 KQfiow 3U/Gl7VGyBSCaQ06XLIatyCUsu/78MvyuyUXoSi3Djw
+-> ssh-ed25519 KQfiow HF3fZ69+NwB+1tyZDoBb+vL7S0sAB4VtFbteA8l3myE
-HV+Dj3VpnCdzz7XuRfhfJGhAD+7Fv+5vb60VZI2/T/k
+EPE0dZ4HAsE2SLXT+BlDUrWGGNKlBUQZLYVKiOYwvs0
--> ssh-ed25519 1o2X0w HsEk1SiUhTqOTAw6DminH+BAc5Y7Peogb3BuGpgB6FM
+-> ssh-ed25519 1o2X0w NQodm0eoA8H57E1Lgt11GubQIXXn+9a9Ho79akD1FQ8
-Zm4j5robwQS5T2sBOiSNPncXkltdBgYfYu/d2qgKcQA
+pG8VFyXUBsrTKEZnR/pCU5pZaIBu8s4l02tv27IFBO4
--> ssh-ed25519 KQ5iUA hvAKzXWUKMyNaJxWuk2Ath21FI0UJUWVO8GkVS01iTw
+-> ssh-ed25519 KQ5iUA /XRx2bwU4u47q0pmFFjnmopgeAFDRcdwVUgiZvFZBEU
-8WGPzRRaxrVuX8gTe9+P//oM8Opk6tcVJbQ+WLTdzEg
+hb7OR5qsZ2ctqoi9F9yoJiOSCMIEFhsKTxmTzTlNcgs
--> ssh-ed25519 AKGkDw 3ALLobyiLBam2jGvDTnvQnFDKwqMu6Sms6VK6A9jCSg
+-> ssh-ed25519 AKGkDw MDy7x7w+m12Un+WJzIjlT1sqFUqyMgvs5cUX96YtTBE
-LA1XgPi4EvZ+RYKaYyYVMThEu+edYyQyOccfX7arCco
+4idv3M2g8lkjGTXiH3zxR3sORP3K6OijlCF2vTlGDs0
--> ssh-ed25519 0eS5+A L+MOMKygaYRXXslO2pp7smRudxO3SFCU1Y2OXxbjyyQ
+-> ssh-ed25519 0eS5+A GxaSMOtNOuri6nFhtEmPCUAYO7ULTRgfhoSEhwsQhTA
-EScEV5/7m+HSNhvFYj1uOvKf/vTj/T5pSr62cWkEYyY
+eFGFTZB2z4zBOp+yuU9ryvhNh25v5S5bT77+XYlZ3eo
--> ssh-ed25519 9/4Prw 1VFfT7FpfFEFfnx/Tf1VQYKvEbc+raAnveL7xckM+AM
+-> ssh-ed25519 9/4Prw 2dVb0418rDvJEJ8yYDm3+eofjwEA0r8tuloPN+VC01c
-oYZ2WuJ0BE5T/j25EACfB/cjLCP9IElCnKla6aZPLD4
+uVjqjHdZCvfZJKZukaDT0m2SL1S0CMB/exuNeIEBlH4
--> ssh-ed25519 gAk3+Q zhmxSdCJmIySnMINqbKxNjmVctS9eHX4rTKqC0z+xGc
+-> ssh-ed25519 gAk3+Q 659Yfnz4QIdJCq1X3FxiDyL2F9QQEBSxyjnx+SCl3CI
-GSnqECoK+bj3aRWvQ2ALVV0VFznk7fSr77Vcv+oWpl0
+VuGpJwysc8y3Mq/HrIJP5DY1DdMJC7QlXTlyoCaWbzw
--> ssh-ed25519 X6eGtQ 5xUEtBKxwQLtlmz4Ne05pjUsxeXFRZEn3rIEnk71tXI
+-> ssh-ed25519 X6eGtQ hYe08q7Sofe8mdwVTCitTayJNbV9Tl9Bkt4RPexxMDU
-fG2mfswiyhZB9J69Y91zo0YocbDnftd2lIkv0knbqys
+FhU5gPGYUi6DBMt2O1wY5uL25dyI3aGhXEFXfgyUgBQ
--> ssh-ed25519 0ma8Cw o+sHqr3FeOdpdrSKMCFl6M0YypkFUklOuOcdTuxzjFg
+-> ssh-ed25519 0ma8Cw z0Di7JjAJLIcQx2+B01JVBRbmh9fV1T0+Q6E8S+xGjw
-s6veJeLpYv4XcHGv/fvHTDBV2LzN4lkkgMiw9r3Tmh0
+507pjrUEDf7r/DY0zC3gGj78uifvpe13BHKVtetSPFw
--> cFiHfJ[~-grease U^| y&
+-> ssh-ed25519 Tp0Z1Q PMwAaVX/1envqO+cf93hMvw7skIHIwDHizPpjn3zLWk
-eE+uq9nid3cWH7UO/044x6hCr/ZBZUwRIQIMi7X0yFDf4We54/kRGdA
+sNGxgzKWwS29pTBnv8YVQwGm7WzH0LnYXfqYjwsJ+gw
---- yja3ejJfODu7JOeNwFGq3l73whtWcDCBdqV3zM7R3Us
+--- 7ziHLKL/XsD7aJ+uEbNNNwxEC05vAINt+E5+Lvhm7oE
-É kÞžþ,%de—lmJ_E9%"®G½î7ÈÓwŠrÍéøzjÿc@›ÑÚ‹2µJM	FSwƒéÖ…J´ÆŽ÷”Ý{~EÕÛ¦}}!-
+ÛÓ;íKª§ÐTc6L $ÁsôO[3ÔÅøUÉñçt6’s	a SŽnœÐ#jE^qhÖö5eɈQA²ÉþþŽ2ψI/

nixos/secrets/gpg-passphrase.age

@@ -1,50 +1,48 @@
 age-encryption.org/v1
--> ssh-ed25519 ZgrTqA nxDhZDKcFwSoxR/i34N//ivTJDLC/11977XU4VmaWxg
+-> ssh-ed25519 ZgrTqA gwgbZfsmN/IZSoLT93ftwBDJ9FMFkumWuDYLAdR5mDw
-JEwXfBrRVtkOkrpmsU+Zk4YAIrxZkBbsTmUXOtOR6eo
+wjVFV+RNqRUomklgh+/I+upUzOjIF7NbeHDG/ZfAkXU
--> ssh-ed25519 ZaBdSg 22smm7JR4fwhhlb5sNo9Qrfyd70NZCDEQqQNrhfamzo
+-> ssh-ed25519 ZaBdSg vfpZjIfCwFXEkEUrErLcCSigL4Uqm0/NZkIyzMkJmC4
-aVwrulW5nWBqVLfB21A5wVdKYOpJq44venb3qXjpr+Y
+NgGeogehq3w0AUawo9blKKMrr1HfwSseUndNSvA0cDw
--> ssh-ed25519 MHZylw eOjkoAZZjqMKZgCH+XOsdX7QfOAh23Qh7byqgWLvbEg
+-> ssh-ed25519 MHZylw 9gx87i2+xptkEFAq4brfSa28StOcKHrBrQ6YdPrEXVw
-2HUuAPBYmMwfyAD/ZKoYkwknPWwvldHpfHrOc8BMHXs
+Wz0TkHL3865UNTalO5GLyla3eh5HO8CU1OpvmFnUz1Y
--> ssh-ed25519 sIUg6g DTno5u3GShRGLl3O21bMAeworZSGPTHyawVkQUdOCX8
+-> ssh-ed25519 sIUg6g kXECNgiZ+7BenXVIvbioQwYb0Kni3uCAyHgRgbw11C4
-1EKEyC0g0Bzdut5kj5+YcTVW+QqWxXX0INKHOh1yQmY
++ky0U9p0KaAu35zSOSNHXPmHFqdIf8BGAveLDMxpeTU
--> ssh-ed25519 TnanwQ duKkCYjd1yIG4rRPWyN8KF7Ktc8yRa2t5urLGzOYqwA
+-> ssh-ed25519 TnanwQ G5nA7iVSLYTx4TE5Xb5G/69JKJ9qm8xpYq3xi4A7ZDE
-72Q4lVsHbAAmxfxazFk1Uhd2WgY1tDtA3Bma81oyDQo
+yMW2ny1+QuPB+xzSRxxdYN5bjKZiJVY04qN6W+V1Y3E
 -> ssh-rsa gwJx0Q
-U15JflZHy2YXgUL+YbLw21GGrjo9kUUGBIUy9zviyfRze2FsP/s64o4I5RcMHZQE
+IEv+jd2oOZskPWM/LWUb9ZLA8IzRfaBQTafgQyEzVoD7v8lbfpMKTI31ylxJQSvh
-fMeSZkZSECPW55EnyNXPP58B9afruHPttq0cA+8KhmvN92pTJFVW3B29NZvAmbg+
+d+gutl9xgGtVDHXjGdNKbDHwAVzYaz3IbvP+Vje9jtSqH6A0AU+1OqXeRzI3ZAux
-yw6k8m9CbTTNj1YAiPP4zoW5VA5bWB9vNsTC42RLN+mXvnk3jHhJiyQ77E0m6dsX
+oBJlCEGZqSBspA8AhH3cv4ion0G6iC1wmqaIb9Nk/qnzfBvtE/cIpqErv19byVUj
-gT6JePlb8iOySx6i90/b6PuFB23i2QFnyBUsGcwhU4VPqPcNEoXZwpS9ibbQoXYW
+pZr5NviDXETV29Gz2HDyv3RsZ4wfJE/npebSu+ORakOH6PLRtnMpB4aKOensv31Y
-Ce15tbkfjm7HffI8cnrnJh3HpO+3onoqfwJLSm7v1twGGN3neqJU31ywFPE5kvtA
+UJQMTHNuJRgPdxgSI0P9W/LaCSMT5vuXR4ETz4vEqDNzcFm1ekqfY8821/AbOtlD
-J53Ii0JuEjqghm9GaspfTQ
+Q2c0zr2C+ayGW5zwGp2XTQ
--> ssh-ed25519 YFIoHA 44F44WcZamqz8iYwS4HQhqT1zNdUZDCI+Zfq1zlpGjQ
+-> ssh-ed25519 YFIoHA UMEeywWPiRXx07jalhLcS4/TmK+gwg8nWdtBpM/IJzI
-dyroggIjVoJCFayVjmp2zN7m6s9uDECkXUL8XJQ9uFk
+9SDhcDfTgwRi7HJ5zL9i8jHL6i00oi6y/qaTzsjb6uc
--> ssh-ed25519 KQfiow /50omkmktdLNxaOHB3ImSrtL+wCtKQqVH8nGyo4Q8xE
+-> ssh-ed25519 KQfiow furHqLazJ3qLEIod24dfGPfu6ie7zutEXDV0N2NGYDY
-90cGcqXOePnHjAhn262MeuMzn3odfKrgwsky1yE+6Hg
+Se5igVc1LJtobjLioH05RPtQfUh5jjYV/bRgU3RL4dY
--> ssh-ed25519 kScIxg j/12yl3KUndaxmFovvXeWvNjDiS4gLmTu60h091vFCE
+-> ssh-ed25519 kScIxg mBFDyzrNBg33LQAJMvlikmd7h0X9d7Eus/p86PF8mxU
-hscYo/JdGuH9jFiZl7qKP7nNwiBsTKwMgqLK1SLPXPM
+MCHgXOGu9AE83VulyxcPEwbfbiymqiZ9c6p3IqLzhak
--> ssh-ed25519 HzX1zw /+sbKjdDKP7tzxD5Bi3KXLf/qKbIdXqkvgv5VVMtGgc
+-> ssh-ed25519 HzX1zw dAgBHAtVniUDV5W/MGrQX1cQh+P+cpHErnxCMn/b8A0
-kv7Bv79YUyVy2MpMECI5+1Z/jz9hKG+guAB3joIEF94
+zx0RxAMo2b6fzjx1U2hw/wHjz8dRXHcM+e20dXRkN98
--> ssh-ed25519 KQfiow z+1XnwF0MvV1WoLMOm1y1SBFmMCuBs52bEHNOVWHrSI
+-> ssh-ed25519 KQfiow NxL41InC5f7Za+/EIQT+z+vhzkkzQxOBRBqTe0J2U2c
-AV1Desi4VRies/yqXcSjISdxPGvKn8aWYTfDFPMyzEY
+t0IJoVJ9Ap6P4D4kCM+TGgU2oKhTEpeiFktAQxM+C54
--> ssh-ed25519 1o2X0w q/W93yDVRDYcazyOIlf8jUBHSNng0GgPsqZA7r3Mn2U
+-> ssh-ed25519 1o2X0w ++MXOZdgCeKxiKyQ6mAiVz1i4dXnpyFSuhSq5hG3vVM
-NtlRyyH4mbAnTAWBRpf5PL4vLyk2wSxAobSkYMBBX+A
+KeMSC/Cb10lF2ZvdLS5JXRkOE6iEcLtju3I6YMRQoqU
--> ssh-ed25519 KQ5iUA 0RLXvcC+cuMFXGgQQnCBJhWQU6+PglxxQaxlZSqVNE0
+-> ssh-ed25519 KQ5iUA +5L7eIEu1RGoVXxpd/nJHi1/DIF82YCKtzt71mhKqRc
-8WRPF58jm6m/gKubZgomqCZNpQoLA26fOzfY0Hqx3vI
++La1804HzEBjkHeQdRGboNwIj8NarvZ/SJG3Ua4y+Vo
--> ssh-ed25519 AKGkDw Wi+UsCD95sykFp2c+5mGWGM1XgHxt7CAnSQR5vT8S2Y
+-> ssh-ed25519 AKGkDw Ru9l2BXa/LUZCn5DpMVDh4ca7w1JU2thmChLOeY8Ii0
-TPk8gkZkmhdZnNiI1Wo1yRGkMgQdzf12dLJCDHISCjY
+GSua+XJoy3g9NNZ2qHstAbomR/3xKEAe6SOcn6g2Q/w
--> ssh-ed25519 0eS5+A Ip2KcVBtziu8Gtgz0ekmbk3G4yB4EUjUCQcaqXbQcjs
+-> ssh-ed25519 0eS5+A e2prXUG804KhjGO+rg/eXrZUQM73HxQ/BnN1vsHbuQU
-t2y53xf2mEHGxFaeONMXa3/t+zGDCdQKb6RQecYfkmY
+nIANuBAF2Tk7hWT9HJJ4uvUrPbtUhsBW59eOkVnK5IY
--> ssh-ed25519 9/4Prw zkAdxlDmai9tSFu+a6a3jhoUnyxzZUpCiLgAyJ85uwY
+-> ssh-ed25519 9/4Prw DOtRMtKN5Q1YFq8AFrH/37SJxaHoaZuTMa/JVzT2Bzk
-u+z5fSEzJtPvz7iEFFng4cn0WQJuMYO5zFsBCnXvXvs
+j+mawty5y3Ox2Nzp3TncHbR/rMmcmIQD5EfezhUUtWg
--> ssh-ed25519 gAk3+Q 6S8D1fDXLKPc9MvrnHbhMLqoY8f1W+yy9LrZq2345lY
+-> ssh-ed25519 gAk3+Q mZVlRxtH9jV7N6/aoJ1je+jkxuF7sffcGsLiYwjReHw
-oSkGUfVxlqPnqS4sHqiywVg/cSu8rDiosw8KbXtlhn8
+XOQKhZ60vBfHaO7u9Fkwy40po/jh/Y4/Yj/D4gRO0k0
--> ssh-ed25519 X6eGtQ kCtmcfUdTp8vJ8rBFDDJeJmk7s/uhlRuvrk9fhvQzw4
+-> ssh-ed25519 X6eGtQ 8+iFJD1esMa/3yuKAx8fZBEJ2SxLdrzXhqqkEicRvgQ
-lKwwGc+86muQv8dZ0BuivDHHR2vX/hXuhqDHNgq+/nA
+R9jJ7vDcxA/sOSF329GW8d18Jzdwot/BpFEl/knraSE
--> ssh-ed25519 0ma8Cw NAFySfIt7dQ3kTL73/7E1WzpOlcyd7PU1DyMsYWGnl4
+-> ssh-ed25519 0ma8Cw LgbM+4liQS3j9acMcFnnp9gi4Gzkq6Xtmrm4KQoO5hU
-JTZh0eM06/IOC8HNRxn5gF3KAlnBmmEUpxv5UFjuwks
+TX50NCZoZpH4SzS7ZfkDbEcGO/A3dzRJXvtDqxjzsuk
--> ZhDG9-grease > ~YTLl
+-> ssh-ed25519 Tp0Z1Q yHfAA3IRIM3rDcPNoV9qh1RU7g6LX9aelELZGXVt7Wc
-MzCy45d4My1EJc2k/SzhXa2v9geyu45HhXth4R/CMejeVSk+NuTfB1UhSp6iCErU
+QIlWb0xzr+RpVwcyBqr8oRR4WrOz9st4fFSKNCEXCWE
-eK4qPQoPCx2z1ihs5fQCC+lf55jE88+tP9aDqYPnTzXVPPHMNpDYLQYAow
+--- ztKYvZNf3AP9x0CiM2gtLQEIRHtkwAEgaBRHWJSZuKc
---- dVpM8R96RIKRuG6yQ672A543LxhU9ttuiSrbG4fcsvQ
+@6˜Û‘34p¸oqŠDvÍub9}`–IíÉž[Y+Ó&õ&n‚3Ÿ
-D4'Vp<56>
-Zþx	YA`Ñx¹ä :àS‘5u¦W[”¡uŒ
á—ÇnÝ#j‘

nixos/secrets/nextcloud-admin.age

@@ -0,0 +1,48 @@
+age-encryption.org/v1
+-> ssh-ed25519 ZgrTqA l1KhMBYmv+TZzBET8kptlZsQqzk3PWm4KA1YbQ7pLDw
+XQdF+ZjcWyWs1oprvb5J5GWL9qhQ2oyTiAHU580I9Us
+-> ssh-ed25519 ZaBdSg HpBQZKCjSZLWOgUhlZNBSQdEh4VqHyIRsnWeqOoNu1w
+olbfsFPUKa6n64WxIjqSfzEN0Sv69rkMem7l4BSdRO0
+-> ssh-ed25519 MHZylw i3v/ahcgJ0eNpv+eyLcLW5HFbJgDxmILPwRIfYbfYSo
+gNFYiAJFaeTE2psIhpAOEbdh8qpNPkHhQ+JimwLWHMU
+-> ssh-ed25519 sIUg6g qhpWT0ZYGs7L9phprKuuTc5x3ONa5HxfJrml9hZXCDA
+bSUNBSgE4THO24IldTR6UDl1nibM6wJVhfQDNgXDHoQ
+-> ssh-ed25519 TnanwQ oIiKhCPi2Q6Aie4hdnMM+GD0X1AP+RRYX3MhPZr6mwg
++eQAf9brHo6aFjChm0AhUcF9taFNqrwIITVanvAJBZI
+-> ssh-rsa gwJx0Q
+bPnrY1qe+cJIrAL66CjfIoHrwpyIsJ3hxMnjecNpbYwj0VD2FDy8oLknXvUs+Qr7
+9AVJXYnkJ2qP/KSxZe0Kq4yvuIVu30CcibMWdA+FbDSC+BGhkFuVMbn87ewujBZO
+yckIiiW0Z26mmBWTc2wOxJvQBsvNmEzJqt75g1SKjZYd4yD2ZHybLZkd5S2CRNnE
+P+9UZstX+ZGQT7N4xCaYi1nBn3ZyDx6QfUtWPK+W+ZBxCmeCWSKA6GdPhG3Xy/sD
+7Emq3VQpFwByBzgno7u3XzhY+RgGDDWz9YnvieUPT7VloXnjD+2+CqiS5zYj4ueM
+5VHE4pYUTczXWBe2kurwpg
+-> ssh-ed25519 YFIoHA zgTafEG44X/fXwXLIlogjs45fAjoEMtWwOH1bJiUXA0
+vp/8r42Zr97CVwG5K9F8be5OUy9lAjqMC/86mgsHyok
+-> ssh-ed25519 KQfiow 0mtQJsqu9ilrlYIcxEURoPR4v26ovNb+xK3HsA67J3k
+sUGJ2uJXmDCzjWVGvD+kQq/k1Kjh1GWxalx66PdbRLo
+-> ssh-ed25519 kScIxg G/D+dmQhzFH8baIl1/LEcFm6Srag72DfUwMi2lU4FSI
+lUm3v86TvpXOCEOD7x2c6OQfglVlNpz3RJQKgLos4A0
+-> ssh-ed25519 HzX1zw mOWnNPTDS2uWUhaBDh5W20sa6L8Sv82B/i5fyYtBg2I
+ml3ypIN6Hk9ZLWAHgeeX9Fl69cVo0quKKnIOzf0gtiA
+-> ssh-ed25519 KQfiow +KbirvF1s4PLCPVko1UuvGkPUWT4ysU7IURr61WBYFI
+EIEFzIrqBu0eF2qsJ0sNYWVLdxUVWhER05C//iU8Hik
+-> ssh-ed25519 1o2X0w SEi4GVg7eYsP4H5x+FzMWaHzQ10qYuD63DtlNbdtEjg
+hvVJMGz0mrfKYua9kfc+QfZgAqAapKlRoxmJQvX076g
+-> ssh-ed25519 KQ5iUA DH/T6YbQufZDEejYJwyTvxeR2dn/CaTm1i68Rh03yyU
+u3sMfE0YupucU58UVrCkEsVKPWCvxEfDDCvRhON0J+4
+-> ssh-ed25519 AKGkDw N/s4jeBT7J8oTXqiJhfNRzUuxR9PTyGApTqCjERFH10
+oxEicNoou7wTRuLra2lNHUGp6ZAVNMAV88X/UTdI16M
+-> ssh-ed25519 0eS5+A mJLNn95SfVF6fBBmPJHBxeGH74+hCbHVC3CHN3bcr1c
+mVc2Rsz6tXZlPGSMNNmmo4sbPN36we7YVy17mXkwKas
+-> ssh-ed25519 9/4Prw moIGBpA5A/k4RqRFbiESz4LjB57/e7CV4Usp0kJ+o1Q
+MCDzUd0ZM8jEFPkcHaYXcCBeJT7L6vkqfSlpZQ/sG5o
+-> ssh-ed25519 gAk3+Q DkXPTEBi/E6aZkDQeeXPMs/rhg+ZyipHQ5PfbrutMSk
+lOlrZmHIgLzUkMUYjWwVs7c3oR3xA3PEevT41nXkKcs
+-> ssh-ed25519 X6eGtQ FnKi617TVTcL4xNmWCiYdFZXqN46WaoGS9XUsR4cvSY
+STQh6M7mB15fSvndYx7wei1M/NLuKx7P1IGfjfzW+VY
+-> ssh-ed25519 0ma8Cw jNGzFMl5ln7nhFcmZkzLcMDlCliMTP0d9FI0pA0PaDQ
+sgMfIzoC4fi2aMvtvxNpifw2pXeJJtB/rI1Js8qZmlM
+-> ssh-ed25519 Tp0Z1Q 4H03FYzl4l7Qy96uo+WxUcpQiWWXdEPva8nPcIPg71w
+pza0c3a9aTnXFs/MT3wkORn6WUKQmxW/xqAaorZHmSA
+--- qteXhOgvLyIakAwNEcpK5Mtk0aERS+2hNZFT+bmE/HU
+óZ¶ïiCG(kà÷faÆ?<3F>×ÿk<02>‘óþì}´÷á
ÒU Ûd6*g]ëšÌ›ºŸS!>`Ó92

nixos/secrets/secrets.nix

@@ -10,4 +10,5 @@ in
   "gitea-runner-token.jimi-hendnix.age".publicKeys = keys.agenixKeys;
   "gitea-runner-token.adele.age".publicKeys = keys.agenixKeys;
   "gitea-runner-token.railbird-sf.age".publicKeys = keys.agenixKeys ++ keys.railbird-sf;
+  "nextcloud-admin.age".publicKeys = keys.agenixKeys;
 }

nixos/ssh.nix

@@ -2,7 +2,7 @@
 {
   services.avahi = {
     enable = true;
-    nssmdns = true;
+    nssmdns4 = true;
     publish = {
       enable = true;
       domain = true;

nixos/switch.sh

@@ -1,2 +0,0 @@
-#!/usr/bin/env sh
-sudo nixos-rebuild switch --flake '.#' --impure "$@"

nixos/syncthing.nix

@@ -13,6 +13,10 @@ let
     jay-lenovo = { id = "AP5ZUKJ-QBVYWCN-DYHR3UB-JJXRWNI-CAORGYM-HWRKHEH-ZJSTRLN-PP5USQX"; };
     jimi-hendnix = { id = "55JWW5K-4NY5DKT-TR4MVPO-UNOMQKM-J7TYCRF-CCCZGPM-FVRKHID-JVFLAAV"; };
     railbird-sf = { id = "5F4FPJM-KRBFVIH-CTTB2NC-7CPVGAM-CONMH2Q-SQPRODO-CWKRFPF-HVN4AAD"; };
+    dean = { id = "RIVW4FP-NZNGGGD-4ET26IC-R6CZHEU-4EBIDHX-U756VWB-W7EM3LE-3YQ6YA3"; };
+    mixos = { id = "7DMMUDT-CO33EMS-LQW65MX-3BVYDBT-ZZWDJC6-SWEF6SW-ICUMWOE-ZC4IBQK"; };
+    strixi-minaj = { id = "DOAEFFI-W6EZY3K-GDUHDLX-6DQPVFC-XU3G65X-5KX6RKK-EMF7ZT7-YKKKOAM"; };
+    strixi-minaj-wsl = { id = "IF76WOS-WVYFAQG-ZZMIT3R-ZR6EQQH-YQP3FGZ-BJ3LJKO-56FK2XA-UREADQM"; };
   };
   allDevices = builtins.attrNames devices;
 in
@@ -22,6 +26,7 @@ makeEnable config "modules.syncthing" true {
       chown -R syncthing:syncthing /var/lib/syncthing
       chmod -R 2770 /var/lib/syncthing
       mkdir -p /var/lib/syncthing/sync
+      mkdir -p /var/lib/syncthing/railbird
     '';
   };
   services.syncthing = {
@@ -34,6 +39,11 @@ makeEnable config "modules.syncthing" true {
           devices = allDevices;
           copyOwnershipFromParent = true;
         };
+        railbird = {
+          path = "~/railbird";
+          devices = allDevices;
+          copyOwnershipFromParent = true;
+        };
       };
       options = {
         relaysEnabled = true;

nixos/user-specific.nix

@@ -0,0 +1,7 @@
+{
+  home-manager.users.micah = {pkgs, ...}: {
+    home.packages = [
+      pkgs.neovim
+    ];
+  };
+}

nixos/users.nix

@@ -1,4 +1,4 @@
-{ pkgs, realUsers, forEachUser, keys, ... }:
+{ pkgs, keys, ... }:
 let
   extraGroups = [
     "audio"
@@ -28,34 +28,34 @@ in
       home = "/var/lib/syncthing";
       createHome = true;
     };
+    ivanm = userDefaults // {
+      extraGroups = extraGroupsWithWheel;
+      name = "ivanm";
+      openssh.authorizedKeys.keys = kanivanKeys;
+    };
     imalison = userDefaults // {
       extraGroups = extraGroupsWithWheel;
       name = "imalison";
-      shell = pkgs.zsh;
       openssh.authorizedKeys.keys = kanivanKeys;
     };
     kat = userDefaults // {
       extraGroups = extraGroupsWithWheel;
       name = "kat";
-      shell = pkgs.zsh;
       openssh.authorizedKeys.keys = kanivanKeys;
     };
     dean = userDefaults // {
       extraGroups = extraGroupsWithWheel;
       name = "dean";
-      shell = pkgs.zsh;
       openssh.authorizedKeys.keys = kanivanKeys ++ deanKeys;
     };
     will = userDefaults // {
       extraGroups = extraGroupsWithWheel;
       name = "will";
-      shell = pkgs.zsh;
       openssh.authorizedKeys.keys = kanivanKeys ++ willKeys;
     };
     alex = userDefaults // {
       extraGroups = extraGroupsWithWheel;
       name = "alex";
-      shell = pkgs.zsh;
       openssh.authorizedKeys.keys = kanivanKeys ++ alexKeys;
     };
     loewy = userDefaults // {
@@ -73,13 +73,15 @@ in
       name = "andy";
       openssh.authorizedKeys.keys = kanivanKeys ++ andyKeys;
     };
+    micah = userDefaults // {
+      inherit extraGroups;
+      name = "micah";
+      openssh.authorizedKeys.keys = kanivanKeys ++ micahKeys;
+    };
   };
 
-  nix.settings.trusted-users = realUsers;
   nix.sshServe = {
     enable = true;
     keys = keys.allKeys;
   };
-
-  home-manager.users = forEachUser (import ./home-manager.nix);
 }

nixos/vscode.nix

@@ -0,0 +1,7 @@
+{ inputs, config, makeEnable, forEachUser, ... }:
+makeEnable config "modules.vscode" true {
+  home-manager.users = forEachUser {
+    imports = [inputs.vscode-server.homeModules.default];
+    services.vscode-server.enable = true;
+  };
+}