add: krile configuration

chore: update flake lock
mod: fix fish_greeting
2026-10-27 13:47:25 -04:00 · 2026-10-25 07:04:48 +00:00 · 2026-10-19 00:52:55 -04:00 · 2026-10-18 19:38:14 +00:00 · 2026-10-18 07:01:16 +00:00 · 2026-10-17 20:32:59 -05:00
52 changed files with 2585 additions and 403 deletions
@@ -0,0 +1,40 @@
+name: Update flake lock
+
+on:
+  schedule:
+    # Gitea cron schedules use UTC. 07:00 UTC is 03:00 EDT.
+    - cron: "0 7 * * 0"
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  update-flake-lock:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Install upstream Nix
+        uses: cachix/install-nix-action@v31
+
+      - name: Update flake lock
+        run: nix flake update
+
+      - name: Commit and push changes
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          if git diff --quiet -- flake.lock; then
+            echo "flake.lock is already up to date"
+            exit 0
+          fi
+
+          git config user.name "gitea-actions[bot]"
+          git config user.email "gitea-actions[bot]@noreply.localhost"
+          git add flake.lock
+          git commit -m "chore: update flake lock"
+          git push
@@ -0,0 +1,100 @@
+k9s:
+  body:
+    fgColor: '#cdd6f4'
+    bgColor: '#1e1e2e'
+    logoColor: '#cba6f7'
+  prompt:
+    fgColor: '#cdd6f4'
+    bgColor: '#181825'
+    suggestColor: '#89b4fa'
+  help:
+    fgColor: '#cdd6f4'
+    bgColor: '#1e1e2e'
+    sectionColor: '#a6e3a1'
+    keyColor: '#89b4fa'
+    numKeyColor: '#eba0ac'
+  frame:
+    title:
+      fgColor: '#94e2d5'
+      bgColor: '#1e1e2e'
+      highlightColor: '#f5c2e7'
+      counterColor: '#f9e2af'
+      filterColor: '#a6e3a1'
+    border:
+      fgColor: '#cba6f7'
+      focusColor: '#b4befe'
+    menu:
+      fgColor: '#cdd6f4'
+      keyColor: '#89b4fa'
+      numKeyColor: '#eba0ac'
+    crumbs:
+      fgColor: '#1e1e2e'
+      bgColor: '#eba0ac'
+      activeColor: '#f2cdcd'
+    status:
+      newColor: '#89b4fa'
+      modifyColor: '#b4befe'
+      addColor: '#a6e3a1'
+      pendingColor: '#fab387'
+      errorColor: '#f38ba8'
+      highlightColor: '#89dceb'
+      killColor: '#cba6f7'
+      completedColor: '#6c7086'
+  info:
+    fgColor: '#fab387'
+    sectionColor: '#cdd6f4'
+  views:
+    table:
+      fgColor: '#cdd6f4'
+      bgColor: '#1e1e2e'
+      cursorFgColor: '#313244'
+      cursorBgColor: '#45475a'
+      markColor: '#f5e0dc'
+      header:
+        fgColor: '#f9e2af'
+        bgColor: '#1e1e2e'
+        sorterColor: '#89dceb'
+    xray:
+      fgColor: '#cdd6f4'
+      bgColor: '#1e1e2e'
+      cursorColor: '#45475a'
+      cursorTextColor: '#1e1e2e'
+      graphicColor: '#f5c2e7'
+    charts:
+      bgColor: '#1e1e2e'
+      chartBgColor: '#1e1e2e'
+      dialBgColor: '#1e1e2e'
+      defaultDialColors:
+        - '#a6e3a1'
+        - '#f38ba8'
+      defaultChartColors:
+        - '#a6e3a1'
+        - '#f38ba8'
+      resourceColors:
+        cpu:
+          - '#cba6f7'
+          - '#89b4fa'
+        mem:
+          - '#f9e2af'
+          - '#fab387'
+    yaml:
+      keyColor: '#89b4fa'
+      valueColor: '#cdd6f4'
+      colonColor: '#a6adc8'
+    logs:
+      fgColor: '#cdd6f4'
+      bgColor: '#1e1e2e'
+      indicator:
+        fgColor: '#b4befe'
+        bgColor: '#1e1e2e'
+        toggleOnColor: '#a6e3a1'
+        toggleOffColor: '#a6adc8'
+  dialog:
+    fgColor: '#f9e2af'
+    bgColor: '#9399b2'
+    buttonFgColor: '#1e1e2e'
+    buttonBgColor: '#7f849c'
+    buttonFocusFgColor: '#1e1e2e'
+    buttonFocusBgColor: '#f5c2e7'
+    labelFgColor: '#f5e0dc'
+    fieldFgColor: '#cdd6f4'
@@ -12,6 +12,9 @@ return {
  -- { import = "astrocommunity.pack.go "}, -- golang support
  { import = "astrocommunity.pack.fish" }, -- fish support
  -- { import = "astrocommunity.pack.cs" }, -- csharp/dotnet support
+  { import = "astrocommunity.completion.copilot-lua" }, -- copilot
+  { import = "astrocommunity.completion.copilot-lua-cmp" }, -- copilot
+  { import = "astrocommunity.recipes.heirline-mode-text-statusline" }, -- statusline customization

  -- import/override with your plugins folder
 }
@@ -0,0 +1,56 @@
+local function toggle_tui(cmd, direction, size)
+  local terminal
+  local dir = direction or "float"
+  local term_size = size
+
+  return function()
+    if not terminal then
+      local Terminal = require("toggleterm.terminal").Terminal
+      terminal = Terminal:new {
+        cmd = cmd,
+        hidden = true,
+        close_on_exit = true,
+        direction = dir,
+        on_open = function() vim.cmd "startinsert!" end,
+      }
+    end
+
+    terminal:toggle(term_size, dir)
+  end
+end
+
+local toggle_k9s = toggle_tui "k9s"
+local toggle_ghdash = toggle_tui "gh-dash"
+local toggle_ai_opencode = toggle_tui("opencode", "vertical", 80)
+local toggle_ai_copilot = toggle_tui("copilot", "vertical", 80)
+
+return {
+  {
+    "AstroNvim/astrocore",
+    ---@type AstroCoreOpts
+    opts = {
+      mappings = {
+        n = {
+          ["<Leader>k"] = { desc = "Kubernetes" },
+          ["<Leader>ki"] = {
+            toggle_k9s,
+            desc = "K9s",
+          },
+          ["<Leader>gD"] = {
+            toggle_ghdash,
+            desc = "GitHub dashboard",
+          },
+          ["<Leader>a"] = { desc = "AI" },
+          ["<Leader>ao"] = {
+            toggle_ai_opencode,
+            desc = "opencode",
+          },
+          ["<Leader>ag"] = {
+            toggle_ai_copilot,
+            desc = "GH Copilot",
+          },
+        },
+      },
+    },
+  },
+}
@@ -1,85 +1,10 @@
-if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
-
-- You can also add or configure plugins by creating files in this `plugins/` folder
-- Here are some examples:
-
 ---@type LazySpec
 return {
-
-  -- == Examples of Adding Plugins ==
-
-  "andweeb/presence.nvim",
-  {
-    "ray-x/lsp_signature.nvim",
-    event = "BufRead",
-    config = function() require("lsp_signature").setup() end,
-  },
-
-  -- == Examples of Overriding Plugins ==
-
-  -- customize alpha options
-  {
-    "goolord/alpha-nvim",
-    opts = function(_, opts)
-      -- customize the dashboard header
-      opts.section.header.val = {
-        " █████  ███████ ████████ ██████   ██████",
-        "██   ██ ██         ██    ██   ██ ██    ██",
-        "███████ ███████    ██    ██████  ██    ██",
-        "██   ██      ██    ██    ██   ██ ██    ██",
-        "██   ██ ███████    ██    ██   ██  ██████",
-        " ",
-        "    ███    ██ ██    ██ ██ ███    ███",
-        "    ████   ██ ██    ██ ██ ████  ████",
-        "    ██ ██  ██ ██    ██ ██ ██ ████ ██",
-        "    ██  ██ ██  ██  ██  ██ ██  ██  ██",
-        "    ██   ████   ████   ██ ██      ██",
-      }
-      return opts
-    end,
-  },
-
-  -- You can disable default plugins as follows:
-  { "max397574/better-escape.nvim", enabled = false },
-
-  -- You can also easily customize additional setup of plugins that is outside of the plugin's setup call
-  {
-    "L3MON4D3/LuaSnip",
-    config = function(plugin, opts)
-      require "astronvim.plugins.configs.luasnip"(plugin, opts) -- include the default astronvim config that calls the setup call
-      -- add more custom luasnip configuration such as filetype extend or custom snippets
-      local luasnip = require "luasnip"
-      luasnip.filetype_extend("javascript", { "javascriptreact" })
-    end,
-  },
-
-  {
-    "windwp/nvim-autopairs",
-    config = function(plugin, opts)
-      require "astronvim.plugins.configs.nvim-autopairs"(plugin, opts) -- include the default astronvim config that calls the setup call
-      -- add more custom autopairs configuration such as custom rules
-      local npairs = require "nvim-autopairs"
-      local Rule = require "nvim-autopairs.rule"
-      local cond = require "nvim-autopairs.conds"
-      npairs.add_rules(
-        {
-          Rule("$", "$", { "tex", "latex" })
-            -- don't add a pair if the next character is %
-            :with_pair(cond.not_after_regex "%%")
-            -- don't add a pair if  the previous character is xxx
-            :with_pair(
-              cond.not_before_regex("xxx", 3)
-            )
-            -- don't move right when repeat character
-            :with_move(cond.none())
-            -- don't delete if the next character is xx
-            :with_del(cond.not_after_regex "xx")
-            -- disable adding a newline when you press <cr>
-            :with_cr(cond.none()),
-        },
-        -- disable for .vim files, but it work for another filetypes
-        Rule("a", "a", "-vim")
-      )
-    end,
-  },
+  { "nvim-treesitter/nvim-treesitter" },
+  { "neovim/nvim-lspconfig" },
+  { "kylechui/nvim-surround" },
+  { "nvim-neo-tree/neo-tree.nvim" },
+  { "akinsho/toggleterm.nvim" },
+  { "nvimtools/none-ls.nvim" },
+  { "rebelot/heirline.nvim" },
 }
@@ -198,8 +198,8 @@ bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
 bindsym XF86AudioPlay exec playerctl play-pause
 bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
-bindsym XF86MonBrightnessUp exec light -A 5
-bindsym XF86MonBrightnessDown exec light -U 5
+bindsym XF86MonBrightnessUp exec brightnessctl set +5%
+bindsym XF86MonBrightnessDown exec brightnessctl set 5%-

 ### Lock the screen
 bindsym $mod+Ctrl+q 'swaylock -f -i /home/wyatt/.wallpaper/.wallpaper_lock.png'
@@ -9,11 +9,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1766424259,
-        "narHash": "sha256-ikKwd1/8rLIz8I+B8kwLaNwW5Hh75bkgGRalC+gEpw0=",
+        "lastModified": 1792853286,
+        "narHash": "sha256-l/Oh5k1NQqQuwh4gBF3VcmCF0WGiCT/LqfvY5huhOq4=",
        "owner": "ezKEa",
        "repo": "aagl-gtk-on-nix",
-        "rev": "37c289121c7ed44f723c326b6c079cd8aaeb35cf",
+        "rev": "e9a3b8fdb50a7d77a90c02c84e298c286310385b",
        "type": "github"
      },
      "original": {
@@ -22,6 +22,29 @@
        "type": "github"
      }
    },
+    "caitsith": {
+      "inputs": {
+        "flake-schemas": "flake-schemas",
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1792911802,
+        "narHash": "sha256-GdMiAfj8hRDCqrE2AvQJ3atf0y2XVGFx9/Ptr6qiju0=",
+        "ref": "refs/heads/master",
+        "rev": "a355f99a17b9dc38fc626b80340646a94ae7f1c9",
+        "revCount": 30,
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
+      }
+    },
    "darwin": {
      "inputs": {
        "nixpkgs": [
@@ -29,16 +52,37 @@
        ]
      },
      "locked": {
-        "lastModified": 1765066094,
-        "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=",
+        "lastModified": 1792800221,
+        "narHash": "sha256-53jIZEWNh96irEXhsMZFoNhLJgGSU3nYl1i4wFQHAsU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "688427b1aab9afb478ca07989dc754fa543e03d5",
+        "rev": "d31953cf55f9027a56e9be938daf5db8c5655663",
        "type": "github"
      },
      "original": {
        "owner": "lnl7",
-        "ref": "nix-darwin-25.11",
+        "ref": "nix-darwin-26.05",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "darwin_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1792737899,
+        "narHash": "sha256-P0/GhewcEQmAbzq3QunNWY2jLJaYH9F6c/5dEM/jQ4M=",
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "rev": "bb0b90dbd54e207100de72b5dcbe3188c98a4b69",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LnL7",
        "repo": "nix-darwin",
        "type": "github"
      }
@@ -46,11 +90,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
        "type": "github"
      },
      "original": {
@@ -62,11 +106,43 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_4": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@@ -75,14 +151,44 @@
        "type": "github"
      }
    },
+    "flake-compat_5": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1777699697,
+        "narHash": "sha256-Eg9b/rq/ECYwNwEXs5i9wHyhxNI0JrYx2srdI2uZMaQ=",
+        "ref": "refs/heads/main",
+        "rev": "382052b74656a369c5408822af3f2501e9b1af81",
+        "revCount": 94,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      }
+    },
    "flake-schemas": {
      "locked": {
-        "lastModified": 1761577921,
-        "narHash": "sha256-eK3/xbUOrxp9fFlei09XNjqcdiHXxndzrTXp7jFpOk8=",
-        "rev": "47849c7625e223d36766968cc6dc23ba0e135922",
-        "revCount": 107,
+        "lastModified": 1780327564,
+        "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=",
+        "rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6",
+        "revCount": 149,
        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
+      }
+    },
+    "flake-schemas_2": {
+      "locked": {
+        "lastModified": 1780327564,
+        "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=",
+        "rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6",
+        "revCount": 149,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz"
      },
      "original": {
        "type": "tarball",
@@ -107,47 +213,152 @@
        "type": "github"
      }
    },
-    "ghostty": {
+    "flake-utils_2": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils",
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
-        "zig": "zig",
-        "zon2nix": "zon2nix"
+        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1766930820,
-        "narHash": "sha256-YwSlB25j3m7DKWrhLoG5jjoXeUOrG+eG+8BpYCH59EY=",
-        "owner": "ghostty-org",
-        "repo": "ghostty",
-        "rev": "52d8e1f44c6ba69b56f0e3b7dfcda64bd481b63c",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
-        "owner": "ghostty-org",
-        "repo": "ghostty",
+        "owner": "numtide",
+        "repo": "flake-utils",
        "type": "github"
      }
    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": [
+          "go-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788267358,
+        "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "27555e2624241fb116b49095df4caaee85a25691",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "git-hooks_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "nixpkgs": [
+          "nur",
+          "go-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788267358,
+        "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "27555e2624241fb116b49095df4caaee85a25691",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "go-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "git-hooks": "git-hooks",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1792644631,
+        "narHash": "sha256-3aILZu5bQ+6khPvGCdIbC7wBFZOgPbpP0TBSL9tf89E=",
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "rev": "ff2b494b477eb4349dd40f0564cedab552f9804d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "type": "github"
+      }
+    },
+    "go-overlay_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "git-hooks": "git-hooks_2",
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1792644631,
+        "narHash": "sha256-3aILZu5bQ+6khPvGCdIbC7wBFZOgPbpP0TBSL9tf89E=",
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "rev": "ff2b494b477eb4349dd40f0564cedab552f9804d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "type": "github"
+      }
+    },
+    "hildibrand": {
+      "inputs": {
+        "flake-schemas": "flake-schemas_2",
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_3"
+      },
+      "locked": {
+        "lastModified": 1792911744,
+        "narHash": "sha256-iXH6FL8HYaZg0+p9lUv5bEc4k1YpvwKFYtMYbY1phTA=",
+        "ref": "refs/heads/master",
+        "rev": "01ff244467f011033d98286e8f4171a890e9060a",
+        "revCount": 19,
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
-          "ghostty",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1755776884,
-        "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=",
+        "lastModified": 1792818383,
+        "narHash": "sha256-199i7ubVSXTMl+0AAlL7cVCXSjcI+jWByMcimYjeMX0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86",
+        "rev": "24f2190587513b9c2f73db112a17844ae912d965",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-26.05",
        "repo": "home-manager",
        "type": "github"
      }
@@ -155,24 +366,39 @@
    "home-manager_2": {
      "inputs": {
        "nixpkgs": [
+          "nur",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1766939458,
-        "narHash": "sha256-VvZeAKyB3vhyHStSO8ACKzWRKNQPmVWktjfuSVdvtUA=",
+        "lastModified": 1792896866,
+        "narHash": "sha256-/0tELNnhdSnP+bHSdWiEe6KpfSwi6WrTnT9cm/jNkjA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e298a148013c980e3c8c0ac075295fab5074d643",
+        "rev": "c216bf5a1f173b0481bd5c8c489ebe5595ecc68c",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.11",
        "repo": "home-manager",
        "type": "github"
      }
    },
+    "mnw": {
+      "locked": {
+        "lastModified": 1784154424,
+        "narHash": "sha256-HRn4O1X2ShYtbq5Egji72/aemyc2cIQicjRZD9hBqM8=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "0151d9fa87992cbeb67c86616fb9170dcec830b6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
    "nix-flatpak": {
      "locked": {
        "lastModified": 1739444422,
@@ -189,52 +415,91 @@
        "type": "github"
      }
    },
-    "nixpkgs": {
+    "nix-minecraft": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ],
+        "systems": "systems_3"
+      },
      "locked": {
-        "lastModified": 1744536153,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "lastModified": 1792988509,
+        "narHash": "sha256-1Li/v57ePpV9t6E57w/XTu760H6hYHztwm1RSd6RA8k=",
+        "owner": "Infinidoge",
+        "repo": "nix-minecraft",
+        "rev": "931d87d3811cabc0277be27b94392d19291bd344",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "owner": "Infinidoge",
+        "repo": "nix-minecraft",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1789286504,
+        "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1763191728,
-        "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=",
-        "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1766736597,
-        "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
+        "lastModified": 1792898606,
+        "narHash": "sha256-Mg3rRjsbMqhSMxop5PYMXos8SwAjejrxSgVThTvP9eg=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
+        "rev": "1f607aa79b6356ed45d3cd3c8079c196e79efa2c",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1792615934,
+        "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1790046670,
+        "narHash": "sha256-OJe62m8gZx4xEAQnMcqH1u31/uu4Xf0q2ykAEHZfgrg=",
+        "rev": "6774f7bc253789b113a4f39285dc0fa100abeacc",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1077996.6774f7bc2537/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_5": {
      "locked": {
        "lastModified": 1744536153,
        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -250,42 +515,77 @@
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "nur": {
+      "inputs": {
+        "caitsith": "caitsith",
+        "darwin": "darwin_2",
+        "go-overlay": "go-overlay_2",
+        "hildibrand": "hildibrand",
+        "home-manager": "home-manager_2",
+        "nix-minecraft": "nix-minecraft",
+        "nixpkgs": "nixpkgs_3",
+        "rust-overlay": "rust-overlay_4"
+      },
      "locked": {
-        "lastModified": 1766201043,
-        "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
-        "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
-        "revCount": 904049,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.904049%2Brev-b3aad468604d3e488d627c0b43984eb60e75e782/019b3f6c-8b33-7edb-b858-9979590f270b/source.tar.gz"
+        "lastModified": 1793051642,
+        "narHash": "sha256-b+CbWZU8sYR9TNBg6KJur680E+5+Zm4S4IVzkzFnJEc=",
+        "ref": "refs/heads/master",
+        "rev": "8ec05b20cea4865f9fd5dd797c6e090f41863db1",
+        "revCount": 121,
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/nur.git"
      },
      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/nur.git"
+      }
+    },
+    "nvf": {
+      "inputs": {
+        "flake-compat": "flake-compat_5",
+        "mnw": "mnw",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1793047357,
+        "narHash": "sha256-eY8aBTGSgtx+25254i22jyjbj+JQkEIfb+JyQ2Exnuk=",
+        "owner": "notashelf",
+        "repo": "nvf",
+        "rev": "60b4593979c39e9a1227c9913bd835bb1a59054b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "notashelf",
+        "repo": "nvf",
+        "type": "github"
      }
    },
    "root": {
      "inputs": {
        "aagl": "aagl",
        "darwin": "darwin",
-        "ghostty": "ghostty",
-        "home-manager": "home-manager_2",
+        "go-overlay": "go-overlay",
+        "home-manager": "home-manager",
        "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3",
-        "rust-overlay": "rust-overlay_2",
-        "swaytreesave": "swaytreesave"
+        "nixpkgs": "nixpkgs_2",
+        "nur": "nur",
+        "nvf": "nvf",
+        "rust-overlay": "rust-overlay_5"
      }
    },
    "rust-overlay": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "aagl",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1764470739,
-        "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=",
+        "lastModified": 1785476452,
+        "narHash": "sha256-/CXwCFPS41rb/JI2VitKCgVK6V5E6/sfw5ke3B9zyVQ=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a",
+        "rev": "6ef009bf4c4873cdc1a621826722bdea7c03e62c",
        "type": "github"
      },
      "original": {
@@ -296,14 +596,18 @@
    },
    "rust-overlay_2": {
      "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": [
+          "nur",
+          "caitsith",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1766890375,
-        "narHash": "sha256-0Zi7ChAtjq/efwQYmp7kOJPcSt6ya9ynSUe6ppgZhsQ=",
+        "lastModified": 1792825530,
+        "narHash": "sha256-aphXA2IFNd3q48++TKmfuuvDDjkrgGdJDnDIhij9684=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "91e1f7a0017065360f447622d11b7ce6ed04772f",
+        "rev": "5b9f1198b59bcb31c5c3250b332e7d77590e6306",
        "type": "github"
      },
      "original": {
@@ -312,23 +616,65 @@
        "type": "github"
      }
    },
-    "swaytreesave": {
+    "rust-overlay_3": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "hildibrand",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1792825530,
+        "narHash": "sha256-aphXA2IFNd3q48++TKmfuuvDDjkrgGdJDnDIhij9684=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "5b9f1198b59bcb31c5c3250b332e7d77590e6306",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_4": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1792825530,
+        "narHash": "sha256-aphXA2IFNd3q48++TKmfuuvDDjkrgGdJDnDIhij9684=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "5b9f1198b59bcb31c5c3250b332e7d77590e6306",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_5": {
      "inputs": {
-        "flake-schemas": "flake-schemas",
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1767148467,
-        "narHash": "sha256-W0O7SWq8ucokt4ctEAEvRvNoSM/oF7fBfb2kTN+lwTs=",
-        "ref": "refs/heads/master",
-        "rev": "0f4bb9bb450b28aa4f29d5eb2062deac6c26687a",
-        "revCount": 4,
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
+        "lastModified": 1793000331,
+        "narHash": "sha256-6sLQgHX/V/yF8VrhmsJroujeRua1GY3nDTEpnY7tHF4=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "0d0575988e4bb9ebc4cf1afb1cec1ceac0b5914e",
+        "type": "github"
      },
      "original": {
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
      }
    },
    "systems": {
@@ -346,54 +692,33 @@
        "type": "github"
      }
    },
-    "zig": {
-      "inputs": {
-        "flake-compat": [
-          "ghostty",
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "ghostty",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs"
-        ]
-      },
+    "systems_2": {
      "locked": {
-        "lastModified": 1763295135,
-        "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=",
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
+        "owner": "nix-systems",
+        "repo": "default",
        "type": "github"
      }
    },
-    "zon2nix": {
-      "inputs": {
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs"
-        ]
-      },
+    "systems_3": {
      "locked": {
-        "lastModified": 1758405547,
-        "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
-        "owner": "jcollie",
-        "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
-        "owner": "jcollie",
-        "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
+        "owner": "nix-systems",
+        "repo": "default",
        "type": "github"
      }
    }
@@ -1,25 +1,24 @@
 {
  description = "Wyatt's nix configuration suite";
  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
    home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    darwin = {
-      url = "github:lnl7/nix-darwin/nix-darwin-25.11";
+      url = "github:lnl7/nix-darwin/nix-darwin-26.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    ghostty.url = "github:ghostty-org/ghostty";
    rust-overlay.url = "github:oxalica/rust-overlay";
+    go-overlay.url = "github:purpleclay/go-overlay";
    aagl = {
      url = "github:ezKEa/aagl-gtk-on-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-
-    # My personal flakes
-    swaytreesave.url = "git+https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git";
+    nvf.url = "github:notashelf/nvf";
+    nur.url = "git+https://scm.wyattjmiller.com/wymiller/nur.git";
  };

  outputs = inputs @ {
@@ -28,27 +27,33 @@
    nix-flatpak,
    darwin,
    home-manager,
-    ghostty,
    rust-overlay,
+    go-overlay,
    aagl,
-    swaytreesave,
+    nur,
+    nvf,
    ...
  }: let
    userName = "wyatt";
    userEmail = "wyatt@wyattjmiller.com";
    extraSpecialArgs = {
-      inherit userName userEmail ghostty swaytreesave;
+      inherit userName userEmail nur nvf;
    };

    myOverlays = { ... }: {
      nixpkgs.overlays = [
        rust-overlay.overlays.default
+        go-overlay.overlays.default
        aagl.overlays.default
        self.common.overlays
      ];
    };
  in {
    meta = import ./meta;
+    formatter = nixpkgs.lib.genAttrs [
+      "x86_64-linux"
+      "aarch64-darwin"
+    ] (system: nixpkgs.legacyPackages.${system}.nixfmt);

    common = {
      overlays = import ./modules/common/overlays.nix;
@@ -58,9 +63,9 @@
    darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
      system = "aarch64-darwin";
      specialArgs = {
-        inherit userName userEmail ghostty;
+        inherit userName userEmail;
        hostname = "sephiroth";
-        role = "devel";
+        role = "workstation";
      };
      modules = [
        myOverlays
@@ -71,7 +76,8 @@
        {
          home-manager.useGlobalPkgs = true;
          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = false; role = "workstation"; };
+          # home-manager.extraSpecialArgs = extraSpecialArgs;
          home-manager.backupFileExtension = "bak";
          home-manager.users.${userName} = import ./home;
        }
@@ -82,9 +88,9 @@
    nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
      specialArgs = {
-        inherit userName userEmail ghostty aagl;
+        inherit userName userEmail aagl nur;
        hostname = "cloud";
-        role = "devel";
+        role = "workstation";
      };
      modules = [
        myOverlays
@@ -96,7 +102,7 @@
        {
          home-manager.useGlobalPkgs = true;
          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "workstation"; };
          home-manager.backupFileExtension = "bak";
          home-manager.users.${userName}.imports = [
            ./home
@@ -122,7 +128,7 @@
        {
          home-manager.useGlobalPkgs = true;
          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "workstation"; };
          home-manager.backupFileExtension = "bak";
          home-manager.users.${userName}.imports = [
            ./home
@@ -160,5 +166,157 @@
      #   }
      # ];
    };
+
+    # Vintage story server
+    nixosConfigurations."thancred" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = {
+        inherit userName userEmail nur;
+        hostname = "thancred";
+        role = "server";
+      };
+      modules = [
+        myOverlays
+        ./modules/common
+        ./modules/machine/thancred
+
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "server"; };
+          home-manager.backupFileExtension = "bak";
+          home-manager.users.${userName}.imports = [
+            ./home
+          ];
+        }
+      ];
+    };
+
+    # Vintage story server - for a friend
+    nixosConfigurations."raubahn" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = {
+        inherit userName userEmail nur;
+        hostname = "raubahn";
+        role = "server";
+      };
+      modules = [
+        myOverlays
+        ./modules/common
+        ./modules/machine/raubahn
+
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "server"; };
+          home-manager.backupFileExtension = "bak";
+          home-manager.users.${userName}.imports = [
+            ./home
+          ];
+        }
+      ];
+    };
+
+    # Matrix and Mastodon server
+    nixosConfigurations."yshtola" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = {
+        inherit userName userEmail nur;
+        hostname = "yshtola";
+        role = "server";
+      };
+      modules = [
+        myOverlays
+        ./modules/common
+        ./modules/machine/yshtola
+
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "server"; };
+          home-manager.backupFileExtension = "bak";
+          home-manager.users.${userName}.imports = [
+            ./home
+          ];
+        }
+      ];
+    };
+
+    # Discord bot server
+    nixosConfigurations."estinien" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = {
+        inherit userName userEmail nur;
+        hostname = "estinien";
+        role = "server";
+      };
+      modules = [
+        myOverlays
+        ./modules/common
+        ./modules/machine/estinien
+
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "server"; };
+          home-manager.backupFileExtension = "bak";
+          home-manager.users.${userName}.imports = [
+            ./home
+          ];
+        }
+      ];
+    };
+
+    # Homestead 2.0 Minecraft server
+    nixosConfigurations."krile" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = {
+        inherit userName userEmail nur;
+        hostname = "krile";
+        role = "server";
+      };
+      modules = [
+        myOverlays
+        ./modules/common
+        ./modules/machine/krile
+
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "server"; };
+          home-manager.backupFileExtension = "bak";
+          home-manager.users.${userName}.imports = [./home];
+        }
+      ];
+    };
+
+    # generic non-NixOS Linux machine
+    homeConfigurations."generic" = let
+      hostname = builtins.getEnv "HOSTNAME";
+      system = "x86_64-linux";
+    in home-manager.lib.homeManagerConfiguration {
+      pkgs = nixpkgs.legacyPackages.${system};
+      
+      extraSpecialArgs = {
+        inherit userName userEmail hostname nvf;
+        isNixOS = false;
+        role = "workstation";
+      };
+      modules = [
+        {
+          nixpkgs.overlays = [
+            rust-overlay.overlays.default
+            go-overlay.overlays.default
+            self.common.overlays
+          ];
+        }
+        ./home
+      ];
+    };
  };
 }
@@ -1,6 +1,7 @@
 {
  pkgs,
  lib,
+  isNixOS ? true,
  ...
 }: {
  programs.firefox = {
@@ -9,7 +10,7 @@
  };

  programs.chromium = {
-    enable = pkgs.stdenv.isLinux;
+    enable = pkgs.stdenv.isLinux && isNixOS;
    package = pkgs.ungoogled-chromium.override {
      enableWideVine = true;
      commandLineArgs = [
@@ -1,65 +1,58 @@
-{
-  lib,
-  pkgs,
-  userName,
-  userEmail,
-  ghostty,
-  swaytreesave,
-  ...
+{ lib
+, pkgs
+, userName
+, isNixOS ? true
+, ...
 }: let
  # Have a file sturcture that holds all the configuration files that can't be configured by Nix
  # or maybe I'm too lazy to do anything about it? I dunno
  dirs = {
    defaults = ../defaults;
  };
-in {
+in
+{
+  _module.args = {
+    inherit dirs;
+  };
+
  # Import sub modules
  imports = [
-    ./atuin.nix
-    ./shell.nix
    ./packages
-    ./git.nix
-    ./starship.nix
-    ./eza.nix
-    ./neovim.nix
-    ./direnv.nix
-    ./sway.nix
-    ./terminal.nix
-    ./browser.nix
-    ./zellij.nix
-    ./bat.nix
-    ./lazygit.nix
  ];

-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home = {
-    username = userName;
-    homeDirectory =
-      if pkgs.stdenv.isDarwin
-      then "/Users/${userName}"
-      else "/home/${userName}";
+  home = lib.mkMerge [
+    {
+      username = userName;
+      homeDirectory =
+        if pkgs.stdenv.isDarwin
+        then "/Users/${userName}"
+        else "/home/${userName}";

-    sessionVariables = {
-      XDG_CURRENT_DESKTOP = "sway";
-      XDG_SESSION_TYPE = "wayland";
-      XDG_SESSION_DESKTOP="sway";
-      XDG_CONFIG_HOME = "$HOME/.config";
-      XDG_CACHE_HOME = "$HOME/.cache";
-      XDG_DATA_HOME = "$HOME/.local/share";
-      XDG_STATE_HOME = "$HOME/.local/state";
-      NIXOS_OZONE_WL = "1";
-    };
+      stateVersion = "24.11";
+    }

-    pointerCursor = lib.mkIf pkgs.stdenv.isLinux {
-      gtk.enable = true;
-      package = pkgs.catppuccin-cursors.mochaDark;
-      name = "catppuccin-mocha-dark-cursors";
-      size = 22;
-    };
+    (lib.mkIf isNixOS {
+      sessionVariables = {
+        XDG_CURRENT_DESKTOP = "sway";
+        XDG_SESSION_TYPE = "wayland";
+        XDG_SESSION_DESKTOP = "sway";
+        XDG_CONFIG_HOME = "$HOME/.config";
+        XDG_CACHE_HOME = "$HOME/.cache";
+        XDG_DATA_HOME = "$HOME/.local/share";
+        XDG_STATE_HOME = "$HOME/.local/state";
+        NIXOS_OZONE_WL = "1";
+      };
+    })

-    stateVersion = "24.11";
-  };
+    (lib.mkIf pkgs.stdenv.isLinux {
+      pointerCursor = {
+        gtk.enable = true;
+        package = pkgs.catppuccin-cursors.mochaDark;
+        name = "catppuccin-mocha-dark-cursors";
+        size = 22;
+      };
+    })
+  ];

  # Let Home Manager install and manage itself.
  programs.home-manager.enable = true;
@@ -13,11 +13,15 @@
    userEmail = userEmail;

    extraConfig = {
+      commit.gpgsign = true;
+      gpg.format = "ssh";
+      gpg.ssh.allowedSignersFile = "~/.config/git/allowed_signers";
      init.defaultBranch = "master";
-      push.autoSetupRemote = true;
-      pull.rebase = false;
      merge.tool = "nvimdiff";
      mergetool.keepBackup = false;
+      push.autoSetupRemote = true;
+      pull.rebase = false;
+      user.signingkey = "~/.ssh/id_ed25519_sk.pub";
    };

    ignores = [
@@ -31,6 +35,7 @@
      a = "add";
      ap = "add -p";
      br = "branch";
+      cb = "checkout -b";
      co = "checkout";
      st = "status -sb";
      status = "status -sb";
@@ -40,6 +45,11 @@
      ca = "commit -am";
      dc = "diff --cached";
      amend = "commit --amend -m";
+      wipe = "reset --hard";
+      gg = "reset --hard";
+      ggs = "reset --hard";
+      sw = "switch";
+      r = "restore";

      # aliases for submodules
      update = "submodule update --init --recursive";
@@ -0,0 +1,32 @@
+{ pkgs, ... }: {
+  programs.k9s = {
+    enable = true;
+    package = pkgs.k9s;
+    settings.k9s = {
+      refreshRate = "2s";
+      liveViewAutoRefresh = false;
+      apiServerTimeout = "30s";
+      maxConnRetry = 5;
+      # readOnly = true;
+      noExitOnCtrlC = false;
+      portForwardAddress = "localhost";
+      skipLatestRevCheck = false;
+      
+      skin = {
+        catppuccin-mocha = ../defaults/k9s/catppuccin-mocha.yaml;
+      };
+
+      ui = {
+        skin = "catppuccin-mocha";
+        enableMouse = true;
+        headless = false;
+        logoless = true;
+        crumbsless = false;
+        splashless = true;
+        reactive = false;
+        noIcons = false;
+        defaultsToFullscreen = false;
+      };
+    };
+  };
+}
@@ -0,0 +1,14 @@
+{ pkgs, lib, ... }:
+with pkgs;
+let
+  plugins = [
+    "krew"
+    "oidc-login"
+  ];
+in {
+  home.activation.krew = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+    ${lib.concatMapStringsSep "\n" (plugin: ''
+      $DRY_RUN_CMD ${krew}/bin/krew install ${plugin} || true
+    '') plugins}
+  '';
+}
@@ -4,6 +4,7 @@
    package = pkgs.lazygitLatest;

    settings = {
+      gui.skipDiscardChangeWarning = true;
      gui.theme = {
        activeBorderColor = ["#a6e3a1" "bold"];
        inactiveBorderColor = ["#a6adc8"];
@@ -1,18 +1,112 @@
-{...}: let
-  dirs = {
-    defaults = ../defaults;
-  };
-in {
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    vimAlias = true;
-  };
+{ nvf, ... }: {
+  imports = [
+    nvf.homeManagerModules.default
+  ];

-  xdg.configFile = {
-    nvim = {
-      onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall";
-      source = dirs.defaults + /nvim;
+  programs.nvf = {
+    enable = true;
+    settings = {
+      vim = {
+        viAlias = true;
+        vimAlias = true;
+        lsp.enable = true;
+        treesitter.enable = true;
+        autocomplete.nvim-cmp.enable = true;
+        autopairs.nvim-autopairs.enable = true;
+
+        languages = {
+          nix.enable = true;
+          rust.enable = true;
+          go.enable = true;
+          python.enable = true;
+          markdown.enable = true;
+          css.enable = true;
+          scss.enable = true;
+          tsx.enable = true;
+          typescript = {
+            enable = true;
+            lsp.servers = [ "typescript-language-server" "deno" ];
+          };
+          csharp.enable = true;
+        };
+
+        utility.surround.enable = true;
+        telescope.enable = true;
+        mini.icons.enable = true;
+        notes.obsidian = {
+          enable = true;
+          setupOpts.workspaces = [
+            {
+              name = "personal";
+              path = "~/Documents/Obsidian/notes";
+            }
+          ];
+        };
+
+        terminal.toggleterm = {
+          enable = true;
+          lazygit = {
+            enable = true;
+            mappings.open = "<leader>gg";
+          };
+        };
+        filetree.neo-tree.enable = true;
+        binds.whichKey.enable = true;
+
+        clipboard = {
+          enable = true;
+          registers = "unnamedplus";
+          providers = {
+            wl-copy.enable = true;
+            xclip.enable = true;
+          };
+        };
+
+        lsp.null-ls = {
+          enable = true;
+          setupOpts = {};
+        };
+        lsp.trouble.enable = true;
+
+        theme = {
+          enable = true;
+          name = "catppuccin";
+          style = "mocha";
+          transparent = false;
+        };
+
+        dashboard.alpha.enable = true;
+
+        statusline.lualine.enable = true;
+        tabline.nvimBufferline.enable = true;
+
+        keymaps = [
+          {
+            key = "<C-s>";
+            mode = "n";
+            action = "<cmd>w<CR>";
+            silent = true;
+            noremap = true;
+          }
+          { key = "<leader>o"; mode = "n"; action = "<cmd>Neotree toggle<CR>"; silent = true; noremap = true; }
+          { key = "<leader>tf"; mode = "n"; action = "<cmd>ToggleTerm direction=float<CR>"; silent = true; noremap = true; }
+          { key = "<leader>th"; mode = "n"; action = "<cmd>ToggleTerm direction=horizontal<CR>"; silent = true; noremap = true; }
+          { key = "<leader>tv"; mode = "n"; action = "<cmd>ToggleTerm direction=vertical<CR>"; silent = true; noremap = true; }
+          { key = "<leader>n"; mode = "n"; action = "<nop>"; desc = "Notes"; silent = true; noremap = true; }
+          { key = "<leader>nd"; mode = "n"; action = "<cmd>Obsidian today<CR>"; desc = "Obsidian daily note"; silent = true; noremap = true; }
+          { key = "<leader>nf"; mode = "n"; action = "<cmd>Obsidian quick_switch<CR>"; desc = "Obsidian find note"; silent = true; noremap = true; }
+          { key = "<leader>ns"; mode = "n"; action = "<cmd>Obsidian search<CR>"; desc = "Obsidian search notes"; silent = true; noremap = true; }
+          { key = "<leader>nn"; mode = "n"; action = "<cmd>Obsidian new<CR>"; desc = "Obsidian new note"; silent = true; noremap = true; }
+          { key = "<leader>ff"; mode = "n"; action = "<cmd>Telescope find_files<CR>"; silent = true; noremap = true; }
+          { key = "<leader>fD"; mode = "n"; action = "<cmd>lua require('telescope.builtin').find_files({ cwd = vim.fn.input('Dir: ', vim.loop.cwd() .. '/', 'dir') })<CR>"; silent = true; noremap = true; }
+          { key = "<leader>fg"; mode = "n"; action = "<cmd>Telescope live_grep<CR>"; silent = true; noremap = true; }
+          { key = "<leader>/";  mode = "n"; action = "<cmd>Telescope current_buffer_fuzzy_find<CR>"; silent = true; noremap = true; }
+          { key = "<leader>gb"; mode = "n"; action = "<cmd>Telescope git_branches<CR>"; silent = true; noremap = true; }
+          { key = "<leader>gc"; mode = "n"; action = "<cmd>Telescope git_commits<CR>"; silent = true; noremap = true; }
+          { key = "<leader>gl"; mode = "n"; action = "<cmd>Telescope git_bcommits<CR>"; silent = true; noremap = true; }
+          { key = "<leader>gr"; mode = "n"; action = "<cmd>Telescope git_status<CR>"; silent = true; noremap = true; }
+        ];
+      };
    };
  };
 }
@@ -2,9 +2,19 @@
  pkgs,
  ...
 }: {
-  home.packages = with pkgs; [
-    yazi # terminal file manager
+  imports = [
+    ../atuin.nix
+    ../shell.nix
+    ../git.nix
+    ../starship.nix
+    ../eza.nix
+    ../neovim.nix
+    ../bat.nix
+  ];

+  nixpkgs.config.allowUnfree = true;
+
+  home.packages = with pkgs; [
    # archives
    zip
    xz
@@ -12,39 +22,21 @@
    p7zip

    # utils
+    yazi
    tmux
    bottom
    ripgrep
    jq
    yq-go
    fzf
-    fh
    aria2
-    yt-dlp
-    obsidian
-    vscode
-    weechat
-    inetutils
+    gnupg

    # misc
-    cowsay
    file
    which
    tree
    gnutar
-    gnupg
-    zoxide
    babelfish
-
-    # language-specific package managers
-    nodejs
-    cargo
-    python3
-
-    # nix specific stuff
-    nixd
-    deadnix
-    alejandra
-    statix
  ];
 }
@@ -1,10 +1,7 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [
+{ lib, pkgs, ... }:
+lib.mkIf pkgs.stdenv.isDarwin {
+  home.packages = with pkgs; [
    discord
    ollama
-  ]);
+  ];
 }
@@ -1,11 +1,11 @@
+{ lib, role ? "workstation", ... }:
 {
-  pkgs,
-  lib,
-  ...
-}: {
-  imports = [
-    ./common.nix
-    ./darwin.nix
-    ./linux.nix
-  ];
+  imports =
+    [
+      ./common.nix
+      ./darwin.nix
+      ./linux.nix
+    ]
+    ++ lib.optional (role == "workstation") ./workstation.nix
+    ++ lib.optional (role == "server") ./server.nix;
 }
@@ -1,21 +1,21 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
+{ lib, pkgs, isNixOS ? true, ... }:
+lib.mkIf pkgs.stdenv.isLinux {
+  home.packages = with pkgs; [
    imv
-    betterdiscordctl
-    vesktop
    xdg-utils
-    mcrcon
-    xfce.thunar
+  ] ++ lib.optionals isNixOS [
+    vesktop
+    thunar
+    thunar-volman
+    thunar-shares-plugin
+    thunar-vcs-plugin
+    thunar-archive-plugin
+    thunar-media-tags-plugin
    pavucontrol
-    godot
-    aseprite
    zathura
    gpu-screen-recorder
    gpu-screen-recorder-gtk
-    # ungoogled-chromium
-  ]);
+    inetutils
+    easyeffects
+  ];
 }
@@ -0,0 +1,4 @@
+{ pkgs, ... }: {
+  home.packages = [
+  ];
+}
@@ -0,0 +1,37 @@
+{
+  lib,
+  pkgs,
+  isNixOS ? true,
+  ...
+}: {
+  imports = [
+    ../terminal.nix
+    ../browser.nix
+    ../zellij.nix
+    ../lazygit.nix
+    ../k9s.nix
+    ../krew.nix
+    ../direnv.nix
+  ] ++ lib.optional isNixOS ../sway.nix;
+
+  home.packages = with pkgs; [
+    fh
+    kubectl # kube config is deliberately not included
+    kubectx
+    vscode
+    yt-dlp
+    weechat
+    nodejs
+    cargo
+    python3
+    nixd
+    deadnix
+    alejandra
+    statix
+    gh
+    ghDashLatest
+    diffNavLatest
+  ] ++ lib.optionals isNixOS [
+    obsidian
+  ];
+}
@@ -1,9 +1,11 @@
 {pkgs, lib, ...}: {
  programs.fish = {
    enable = true;
-    # initExtra = ''
-    #   export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
-    # '';
+    shellInit = ''
+      if test -d $HOME/.krew/bin
+        set -gx PATH $HOME/.krew/bin $PATH
+      end
+    '';

    shellAliases = {
      # ls aliases
@@ -29,7 +31,6 @@
        body = ''
          set memes \
            "Crazy? I was crazy once. They locked me in a room. A rubber room. A rubber room with rats. And rats make me crazy." \
-            "Daddy, chill!" \
            "What the hell is even that?!" \
            "Road work ahead? Yeah, I sure hope it does!" \
            "Look at all those chickens!" \
@@ -38,7 +39,6 @@
            "I didn't get no sleep cause of y'all, y'all not gone get any sleep cause of me!" \
            "This is the dollar store, how good can it be?" \
            "That was legitness" \
-            "Deez nuts" \
            "I wanna be a cowboy baby" \
            "Can I get a waffle? Can I please get a waffle?" \
            "I'm lesbian. I thought you were American." \
@@ -60,8 +60,20 @@
            "If you’ve brought your ivory standard, I’ll be happy to tell you where you can stick it" \
            "Speeches? Oh, yes, I love them. There's nothing like a good exposition when you're having trouble sleeping!" \
            "Somehow, the boy just isn't very buoyant" \
-            "I am...not interested, little sun. Try again when you have become a man"
-
+            "I am...not interested, little sun. Try again when you have become a man" \
+            "I am rightousness! And rightousness shall previal!" \
+            "Ahhh such bliss!" \
+            "The gods themselves will be my meal. Your dear companions my dessert. Upon this world I'll feast, and death shall follow in my wake. All your hate, all your rage, you will render unto me." \
+            "Boring, boring, boring" \
+            "Would you be 'happier' had I a 'good reason'?" \
+            "A test of your reflexes!" \
+            "Yer a wizard, Wyatt" \
+            "Yer a lizard, Wyatt" \
+            "Po-Tay-To boil em mash em stick em in a stew" \
+            "Oh look it's the cutie patootie potato!" \
+            "What a charming young man" \
+            "Wyatt, you are smart, kind, and resilient. I believe in you no matter what life throws at you! Kick this project's butt!! - Nico" \
+            "Ganbatte!"

          set choose_meme (random)"%"(count $memes)
          set choose_meme $memes[(math $choose_meme"+1")]
@@ -1,7 +1,7 @@
 {
  lib,
  pkgs,
-  swaytreesave,
+  nur,
  ...
 }: let
  dirs = {
@@ -17,7 +17,7 @@
  };
 in {
  imports = [
-    swaytreesave.homeManagerModules.default
+    nur.homeManagerModules.swaytreesave
  ];

  programs.swaytreesave.enable = if pkgs.stdenv.isLinux then true else false;
@@ -155,5 +155,4 @@ in {
    enable = pkgs.stdenv.isLinux;
    systemd.enable = true;
  };
-
 }
@@ -1,4 +1,4 @@
-{ lib, pkgs, ghostty, ... }: {
+{ pkgs, ... }: {
  programs.alacritty = {
    enable = pkgs.stdenv.isLinux;
    settings = {
@@ -103,9 +103,4 @@
  programs.kitty = {
    enable = false; # TODO: to enable later
  };
-
-  home.packages = if pkgs.stdenv.isLinux then
-    [ ghostty.packages.${pkgs.system}.default ]
-  else
-    [ ];
 }
@@ -3,11 +3,14 @@
  lib,
  pkgs,
  aagl,
+  nur,
  ...
 }: let
  cfg = config.gaming;
 in {
-  imports = [ aagl.nixosModules.default ];
+  imports = [ 
+    aagl.nixosModules.default 
+  ];

  options.gaming = {
    steam = {
@@ -73,6 +76,16 @@ in {
      enable = lib.mkEnableOption "OpenGL/Vulkan overlay tool shown in games presenting FPS, CPU/GPU/memory utilization, load, etc.";
    };

+    proton = {
+      enable = lib.mkEnableOption "Proton compatibility tool management";
+
+      manager = lib.mkOption {
+        type = lib.types.enum ["protonplus" "protonup-qt"];
+        default = "protonup-qt";
+        description = "Graphical Proton compatibility tool manager to install";
+      };
+    };
+
    lutris = {
      enable = lib.mkEnableOption "Lutris game manager and launcher";
      package = lib.mkOption {
@@ -90,14 +103,7 @@ in {
        };
      };

-      # Compatibility layers for Lutris
      compatibility = {
-        protonSupport = lib.mkOption {
-          type = lib.types.bool;
-          default = true;
-          description = "Enable Proton-like compatibility layers for Lutris";
-        };
-
        extraTools = lib.mkOption {
          type = lib.types.listOf lib.types.package;
          default = [];
@@ -142,13 +148,35 @@ in {
        enable = lib.mkEnableOption "Zenless Zone Zero (ZZZ) launcher";
      };
    };
+
+    vintage-story = {
+      enable = lib.mkEnableOption "Vintage Story client and server";
+    };
+
+    archon = {
+      enable = lib.mkEnableOption "Archon from NUR";
+    };
+
+    opengoal = {
+      enable = lib.mkEnableOption "OpenGOAL, a game engine used in a certain PlayStation 2 franchise";
+    };
  };

  config = let 
    agl = cfg.aagl;
+    nurPkgs = import "${nur.outPath}/pkgs" { inherit pkgs; };
+    protonManager = {
+      protonplus = pkgs.protonplus;
+      protonup-qt = pkgs.protonup-qt;
+    }.${cfg.proton.manager};
  in {
    programs.steam = lib.mkIf cfg.steam.enable {
      enable = true;
+      extraPackages = with pkgs; [
+        gamescope
+        gamemode
+      ];
+
      remotePlay.openFirewall = cfg.steam.firewall.remotePlay;
      localNetworkGameTransfers.openFirewall = cfg.steam.firewall.localNetworkGameTransfers;
    };
@@ -202,15 +230,14 @@ in {
          cfg.lutris.wine.package
          pkgs.winetricks
        ]) ++
-        (lib.optionals cfg.lutris.compatibility.protonSupport [
-          pkgs.protonup-ng
-          pkgs.protonup-qt
-        ]) ++
        cfg.lutris.compatibility.extraTools ++
        cfg.lutris.extraPackages
      )) ++
+      (lib.optionals cfg.proton.enable [protonManager]) ++
      (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
      (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++
+      (lib.optionals cfg.vintage-story.enable [nurPkgs.vintage-story]) ++
+      (lib.optionals cfg.archon.enable [nurPkgs.archon]) ++
      (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkbasalt-cli]) ++
      (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++
      (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]);
@@ -218,7 +245,7 @@ in {
    nix.settings = let 
      inherit agl;
    in (lib.mkIf
-      (agl.anime-game-launcher.enable || agl.honkers-railway-laucher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable)
+      (agl.anime-game-launcher.enable || agl.honkers-railway-launcher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable)
      {
        substituters = [ "https://ezkea.cachix.org" ];
        trusted-public-keys = [ "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ];
@@ -1,18 +1,23 @@
 final: prev: let
-  rust_1_90_0 = prev.rust-bin.stable."1.90.0".default;
+  rust_latest = prev.rust-bin.stable.latest.default;
+  golang_latest = prev.go-bin.latestStable;
+  buildGoModuleLatest = prev.buildGoModule.override {
+    go = golang_latest;
+  };
  myRustPlatform = prev.makeRustPlatform {
-    cargo = rust_1_90_0;
-    rustc = rust_1_90_0;
+    cargo = rust_latest;
+    rustc = rust_latest;
  };
 in {
  lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
-    version = "0.55.1";
+    version = "0.61.0";
    src = prev.fetchFromGitHub {
      owner = "jesseduffield";
      repo = "lazygit";
      rev = "v${version}";
-      hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
+      hash = "sha256-G7JulCK9WUVWbp1V7lYuM3fehCdn1cNAJHYjr3aKDvQ=";
    };
+
    vendorHash = null;
    subPackages = [ "." ];
    ldflags = [
@@ -24,21 +29,31 @@ in {
  atuinLatest = (prev.atuin.override {
    rustPlatform = myRustPlatform;
  }).overrideAttrs (oldAttrs: rec {
-    version = "18.10.0";
+    version = "18.13.6";

    src = prev.fetchFromGitHub {
      owner = "atuinsh";
      repo = "atuin";
      rev = "v${version}";
-      hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
+      hash = "sha256-yAw+ty6FUnFbiRTdAe2QQHzj6uU24fZ/bEIXcHl/thg=";
    };

    cargoDeps = myRustPlatform.fetchCargoVendor {
      # name = "atuin-${version}-vendor.tar.gz";
      inherit src;
-      hash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M=";
+      hash = "sha256-jirVe0+N5+UHZWioj8AipUhawMBameqEJJpa8HPTnfw=";
    };

+    cargoBuildFeatures = [
+      "ai"
+      "client"
+      "clipboard"
+      "daemon"
+      "hex"
+      "sync"
+    ];
+    cargoCheckFeatures = cargoBuildFeatures;
+
    preCheck = (oldAttrs.preCheck or "") + ''
      export HOME="$TMPDIR"
      export XDG_CONFIG_HOME="$TMPDIR/.config"
@@ -47,4 +62,67 @@ in {
      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
    '';
  });
+
+  # k9sLatest = prev.k9s.overrideAttrs (oldAttrs: rec {
+  #   version = "0.30.16";
+  #   src = prev.fetchFromGitHub {
+  #     owner = "derailed";
+  #     repo = "k9s";
+  #     rev = "v${version}";
+  #     hash = "sha256-1z6r6v3n1p6vd2q6n4pl5q3f7q3q7q1p7j5j1k3l4m5n6o7p8q9r";
+  #   };
+  #   ldflags = [
+  #     "-X github.com/derailed/k9s/version.Version=${version}"
+  #     "-X github.com/derailed/k9s/version.BuildSource=nix"
+  #   ];
+  # });
+
+  ghDashLatest = (prev.gh-dash.override {
+    buildGoModule = buildGoModuleLatest;
+  }).overrideAttrs (oldAttrs: rec {
+    version = "4.23.2";
+    src = prev.fetchFromGitHub {
+      owner = "dlvhdr";
+      repo = "gh-dash";
+      rev = "v${version}";
+      hash = "sha256-C06LPVoE23ITJpMG0x75Djgeup+eb5uYwA8wL7xxvWU=";
+    };
+
+    vendorHash = "sha256-4AbeoH0l7eIS7d0yyJxM7+woC7Q/FCh0BOJj3d1zyX4=";
+    doCheck = false;
+    checkFlags = [
+      "-skip=TestFullOutput"
+    ];
+
+    ldflags = [
+      "-s"
+      "-w"
+      "-X github.com/dlvhdr/gh-dash/v4/cmd.Version=${version}"
+    ];
+
+    passthru = (oldAttrs.passthru or {}) // {
+      tests = {
+        version = oldAttrs.testers.testVersion { package = final.ghDashLatest; };
+      };
+    };
+  });
+
+  diffNavLatest = (prev.diffnav.override {
+    buildGoModule = buildGoModuleLatest;
+  }).overrideAttrs (_: rec {
+    version = "0.10.0";
+    src = prev.fetchFromGitHub {
+      owner = "dlvhdr";
+      repo = "diffnav";
+      rev = "v${version}";
+      hash = "sha256-6VtAQzZNLQrf8QYVXxLUgb3F6xguFDbwaE9kahPhbSE=";
+    };
+
+    vendorHash = "sha256-gmmckzR0D1oFuTG5TAb6gLMoNbcZl9EsjbFjhPfJqnQ=";
+
+    ldflags = [
+      "-s"
+      "-w"
+    ];
+  });
 }
@@ -0,0 +1,105 @@
+# Homestead 2.0 on krile
+
+This module uses the Minecraft NixOS module and Fabric overlay re-exported by
+the existing `nur` flake input. It pins Minecraft 1.20.1, Fabric 0.19.5, Java 17,
+and the [official Homestead 2.0 server pack](https://cozystudios.org/homestead/server-pack/).
+The archive and all eight additional mods listed in its `startserver.sh` are
+downloaded with fixed SHA-256 hashes during the Nix build. The upstream startup
+script is not run.
+
+`modules/machine/krile/configuration.nix` enables the server, accepts the Minecraft
+EULA, and opens TCP 25565 and UDP 24454 (Simple Voice Chat). Forward those ports
+to krile on your router if players connect from outside your network. Players
+need the Homestead 2.0 client pack.
+
+The default heap is 6 GiB initially and 10 GiB maximum. Give the VM additional
+RAM for the OS, native libraries, and filesystem cache; 16 GiB total is a
+reasonable starting point.
+
+## Deploy
+
+On krile, from the repository root:
+
+```bash
+nix eval --raw path:.#nixosConfigurations.krile.config.system.build.toplevel.drvPath
+sudo nixos-rebuild switch --flake path:.#krile
+```
+
+The `path:.` form includes new files before they have been added to Git. Once the
+new module and krile files are tracked, `--flake .#krile` works as usual.
+
+The service starts on boot and restarts after an unexpected exit. Check it with:
+
+```bash
+systemctl status minecraft-server-homestead
+journalctl -u minecraft-server-homestead -f
+```
+
+The console uses nix-minecraft's systemd FIFO. For example, run a command with:
+
+```bash
+sudo sh -c 'echo list > /run/minecraft/homestead.stdin'
+```
+
+Stop the service with `sudo systemctl stop minecraft-server-homestead` so it can
+save the world cleanly.
+
+## Configuration and state
+
+Worlds, player progress, and other runtime state live in
+`/srv/minecraft/homestead`. Back up that directory, particularly `world/`, before
+changing pack versions. The module does not provide automatic backups.
+
+The `mods` directory and server icon are store symlinks. `config`, `defaultconfigs`,
+`kubejs`, `scripts`, and `patchouli_books` are writable copies of the pinned pack,
+recreated on each start and removed on stop by nix-minecraft. Edits to those
+copies do not persist across restarts. World data is not part of those managed
+directories.
+
+Change memory in the host configuration:
+
+```nix
+services.homestead.jvmOpts = "-Xms6G -Xmx12G -XX:+UseG1GC";
+```
+
+Other server settings use the underlying nix-minecraft options:
+
+```nix
+services.minecraft-servers.servers.homestead = {
+  serverProperties = {
+    server-port = 25566;
+    max-players = 10;
+    white-list = true;
+  };
+  # Add real player UUIDs here, or manage the whitelist through the console.
+  whitelist = { };
+};
+```
+
+Changing `server-port` also changes the opened TCP port. Voice chat remains on
+UDP 24454, matching the pack's `config/voicechat/voicechat-server.properties`.
+
+To use this module on another NixOS host, pass `nur` in `specialArgs`, import
+`modules/games/homestead`, set `services.homestead.enable = true`, and set
+`services.minecraft-servers.eula = true` after accepting the EULA. The host must
+allow unfree packages, as the common modules already do for krile.
+
+## Pack updates
+
+For a new release, inspect the official archive and startup script, update the
+archive URL/hash in `package.nix`, update `required-mods.json` with any separate
+downloads and their hashes, and match the Minecraft/Fabric versions in
+`default.nix`. Evaluate and build before switching, then check the startup log.
+The pack is kept fixed at 2.0 until these declarations change.
+
+## Validation
+
+The krile system derivation evaluates, and the pack, Fabric launcher, and
+nix-minecraft setup/cleanup scripts build successfully. A temporary local server
+reached `Done`, started Simple Voice Chat, and exited with status 0 after `stop`,
+saving every dimension. Setup/cleanup was also checked to preserve world data
+and reset managed configs. Multiplayer gameplay was not tested.
+
+The upstream 2.0 pack emits some nonfatal mixin/recipe warnings and an optional
+Falling Trees/Jade integration error during startup; these did not prevent the
+startup and shutdown check from passing.
@@ -0,0 +1,81 @@
+{
+  config,
+  lib,
+  nur,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.homestead;
+  modpack = pkgs.callPackage ./package.nix { };
+in
+{
+  imports = [ nur.nixosModules.minecraft-servers ];
+
+  options.services.homestead = {
+    enable = lib.mkEnableOption "the Homestead 2.0 Minecraft server";
+
+    openFirewall = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Open the Minecraft TCP port and Simple Voice Chat UDP port (24454).";
+    };
+
+    jvmOpts = lib.mkOption {
+      type = lib.types.str;
+      default = "-Xms6G -Xmx10G -XX:+UseG1GC";
+      description = "JVM options for Homestead. Leave additional RAM for the OS and native allocations.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    nixpkgs.overlays = [ nur.overlays.minecraft ];
+
+    services.minecraft-servers = {
+      enable = true;
+      servers.homestead = {
+        enable = true;
+        inherit (cfg) openFirewall jvmOpts;
+
+        package = pkgs.fabricServers.fabric-1_20_1.override {
+          loaderVersion = "0.19.5";
+          jre_headless = pkgs.jdk17_headless;
+        };
+
+        managementSystem = {
+          tmux.enable = false;
+          systemd-socket.enable = true;
+        };
+
+        # Match the properties generated by the pack's startserver.sh.
+        serverProperties = lib.mapAttrs (_: lib.mkDefault) {
+          motd = "Homestead 2.0";
+          allow-flight = true;
+          max-tick-time = 180000;
+          simulation-distance = 6;
+          view-distance = 10;
+          server-port = 25565;
+          online-mode = true;
+          # keep-inventory = true;
+        };
+
+        symlinks = {
+          mods = "${modpack}/mods";
+          "server-icon.png" = "${modpack}/server-icon.png";
+        };
+
+        # Mods may rewrite their configs or generate files here. nix-minecraft
+        # supplies writable copies on each start and cleans them on stop.
+        files = lib.genAttrs [
+          "config"
+          "defaultconfigs"
+          "kubejs"
+          "scripts"
+          "patchouli_books"
+        ] (dir: "${modpack}/${dir}");
+      };
+    };
+
+    networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ 24454 ];
+  };
+}
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  unzip,
+}:
+let
+  # These eight downloads come from startserver.sh in the official 2.0 pack.
+  requiredMods = map fetchurl (lib.importJSON ./required-mods.json);
+in
+stdenvNoCC.mkDerivation {
+  pname = "homestead-server-pack";
+  version = "2.0";
+
+  src = fetchurl {
+    name = "Homestead-2.0-Server.zip";
+    url = "https://drive.usercontent.google.com/download?id=1SpJBa80o_Jx_yqLjQ49pz7HP1FY2PCJj&export=download&confirm=t";
+    hash = "sha256-QVenE6dz+lZPHkC1hwL7Yy4lw6vg/Cr/8pnmK3iaK4o=";
+  };
+
+  nativeBuildInputs = [ unzip ];
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out"
+    unzip -q "$src" \
+      'mods/*' 'config/*' 'defaultconfigs/*' 'kubejs/*' \
+      'scripts/*' 'patchouli_books/*' 'server-icon.png' -d "$out"
+
+    ${lib.concatMapStringsSep "\n" (mod: ''
+      install -m644 ${mod} "$out/mods/${mod.name}"
+    '') requiredMods}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Homestead 2.0 server assets, including the eight separately downloaded mods";
+    homepage = "https://cozystudios.org/homestead/server-pack/";
+    # The pack contains mods with different licenses; do not redistribute it.
+    license = lib.licenses.unfree;
+    platforms = lib.platforms.linux;
+  };
+}
@@ -0,0 +1,42 @@
+[
+  {
+    "name": "balm-fabric-1.20.1-7.3.44.jar",
+    "url": "https://edge.forgecdn.net/files/8969/704/balm-fabric-1.20.1-7.3.44.jar",
+    "hash": "sha256-hMoKTCjV9cxwjuEqKQ+U4ixMntDxXZNM0MDCMPClpMY="
+  },
+  {
+    "name": "CraftTweaker-fabric-1.20.1-14.0.60.jar",
+    "url": "https://edge.forgecdn.net/files/7772/872/CraftTweaker-fabric-1.20.1-14.0.60.jar",
+    "hash": "sha256-y4Kl3wHCNr6oY8SxxZtgaS/ARGHWVIK/eW1EZizqiQA="
+  },
+  {
+    "name": "libraryferret-fabric-1.20.1-4.0.0.jar",
+    "url": "https://edge.forgecdn.net/files/4601/231/libraryferret-fabric-1.20.1-4.0.0.jar",
+    "hash": "sha256-d/UX69gN5R+fh62cTZIrNMQNfF+2iu1tl0zu0NthuG0="
+  },
+  {
+    "name": "sophisticatedbackpacks-1.20.1-3.23.4.5.110.jar",
+    "url": "https://edge.forgecdn.net/files/7147/929/sophisticatedbackpacks-1.20.1-3.23.4.5.110.jar",
+    "hash": "sha256-Fewy1BGnA4R0OldwrmoitxqEGK9/juu/+se/yKGDbA8="
+  },
+  {
+    "name": "sophisticatedcore-1.20.1-1.2.7.15.166.jar",
+    "url": "https://edge.forgecdn.net/files/7341/57/sophisticatedcore-1.20.1-1.2.7.15.166.jar",
+    "hash": "sha256-Fzmsti4i+ZQk8yQkuZYr2S0p4HUvVJWqEW35p8Hdgxo="
+  },
+  {
+    "name": "sophisticatedstorage-1.20.1-1.3.5.11.142.jar",
+    "url": "https://edge.forgecdn.net/files/8032/765/sophisticatedstorage-1.20.1-1.3.5.11.142.jar",
+    "hash": "sha256-VgjSIGpr0TJlhLUrTFp7Mpvpw/izOqOiQGAHiu0Lz4k="
+  },
+  {
+    "name": "trashslot-fabric-1.20.1-15.1.5.jar",
+    "url": "https://edge.forgecdn.net/files/8019/425/trashslot-fabric-1.20.1-15.1.5.jar",
+    "hash": "sha256-u876a68TrhF8ShNtf/ZrYlx1QLncwNQHe08jcIXuRAg="
+  },
+  {
+    "name": "wirelessredstone-fabric-1.20.1-1.1.2.jar",
+    "url": "https://edge.forgecdn.net/files/5175/782/wirelessredstone-fabric-1.20.1-1.1.2.jar",
+    "hash": "sha256-Kw8xy4ngmAgD9kEvwAjTS6KatJEnA6UPkI1X3xnWf48="
+  }
+]
@@ -43,6 +43,11 @@ in {
        vulkan-tools
        mesa-demos
      ];
+
+      hardware.graphics = {
+        enable = true;
+        enable32Bit = true;
+      };
    }

    (mkIf (cfg.gpuVendor == "nvidia") {
@@ -61,9 +66,6 @@ in {

    (mkIf (cfg.gpuVendor == "amd") {
      services.xserver.videoDrivers = ["amdgpu"];
-      # hardware.graphics.extraPackages = with pkgs; [
-      #   amdvlk
-      # ];
      environment.systemPackages = with pkgs; [
        radeontop
      ];
@@ -82,7 +84,6 @@ in {
      environment.sessionVariables = {
        MOZ_ENABLE_WAYLAND = "1";
        QT_QPA_PLATFORM = "wayland";
-        SDL_VIDEODRIVER = "wayland";
      };
    })

@@ -10,6 +10,10 @@ I like Final Fantasy, alright? Isn't everyone supposed to have a hobby?

 These are named after Final Fantasy VII characters.

-### Servers/Network Infrastructure
+### Servers/Network Infrastructure (bare metal)

 These are named after Final Fantasy summons. There is some infrastructure missing here like my routers and switches that I also name after summons.
+
+### Servers/Network Infrastructure (virtual machines)
+
+These are named after Final Fantasy XIV Online characters (currently, these are named after the Scions of the Seventh Dawn).
@@ -25,6 +25,7 @@ in {
    ../../graphics
    ../../pwrMgmt
    ../../networking/core.nix
+    ../../security/yubico.nix
    ../../sound/pipewire.nix
    ../../sound/shairport.nix
    ../../sound/focusrite.nix
@@ -33,7 +34,20 @@ in {
  ];

  # Enable flakes for NixOS
-  nix.settings.experimental-features = ["nix-command" "flakes"];
+  nix.settings = {
+    experimental-features = ["nix-command" "flakes"];
+    substituters = [
+      "https://attic.home.wyattjmiller.com/wyatt"
+    ];
+
+    trusted-substituters = [
+      "https://attic.home.wyattjmiller.com/wyatt"
+    ];
+
+    trusted-public-keys = [
+      "wyatt:KBM2U2fVUomYUdMsxeNp0MDrUrCU5BECZHLF72o8TOI="
+    ];
+  };

  # Custom kernel/boot stuff
  boot = {
@@ -56,7 +70,7 @@ in {
    grim
    slurp
    playerctl
-    light
+    # light - UNMAINTAINED, brightnessctl is the replacement
    brightnessctl
    wttrbar
    cliphist
@@ -67,6 +81,9 @@ in {
    shared-mime-info
    wl-clipboard
    wl-clip-persist
+    ollama-rocm
+    newelle
+    vlc
  ];

  # Enable Polkit
@@ -93,22 +110,25 @@ in {
    gamemode.enable = true;
    gamescope.enable = true;
    mangohud.enable = true;
+    proton = {
+      enable = true;
+      manager = "protonplus";
+    };
    lutris = {
      enable = true;
      wine = {
        enable = true;
        package = pkgs.wine-staging;
      };
-      compatibility = {
-        protonSupport = true;
-      };
    };

    ffxiv.enable = true;
+    archon.enable = true;
    minecraft.enable = true;
-    aagl.anime-game-launcher.enable = true;
+    vintage-story.enable = true;
  };

+  
  # Power management (see ../../pwrMgmt/default.nix)
  pwrMgmt = {
    enable = true;
@@ -196,5 +216,20 @@ in {
    scheduler = "scx_bpfland";
  };

+  programs.obs-studio = {
+    enable = true;
+    plugins = with pkgs.obs-studio-plugins; [
+      wlrobs
+      obs-backgroundremoval
+      obs-pipewire-audio-capture
+      obs-vaapi #optional AMD hardware acceleration
+      obs-gstreamer
+      obs-vkcapture
+    ];
+  };
+
+  # Tailscale service
+  services.tailscale.enable = true;
+
  system.stateVersion = "24.11";
 }
@@ -0,0 +1,100 @@
+{
+  pkgs,
+  userName,
+  nur,
+  ...
+}: let
+    hildibrand = nur.packages.${pkgs.stdenv.hostPlatform.system}.hildibrand;
+  in {
+  imports = [
+    ../../pwrMgmt
+    ../../networking/core.nix
+  ];
+
+  # Enable flakes for NixOS
+  nix.settings.experimental-features = ["nix-command" "flakes"];
+
+  # Custom kernel/boot stuff
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # Set your timezone
+  time.timeZone = "America/Detroit";
+
+  # Enable OpenSSH
+  services.openssh.enable = true;
+
+  # Enable keyring
+  services.gnome.gnome-keyring.enable = true;
+
+  # Enable GnuPG
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  # Enable SUID wrappers (some programs need them)
+  programs.mtr.enable = true;
+
+  # Enable Polkit
+  security.polkit.enable = true;
+
+  # Power management (see ../../pwrMgmt/default.nix)
+  pwrMgmt = {
+    enable = true;
+    cpuFreqGovernor = "performance";
+    powertop.enable = false;
+  };
+
+  network = {
+    firewall = {
+      enable = true;
+    };
+    networkManager.enable = true;
+  };
+
+  environment.systemPackages = [
+    hildibrand
+  ];
+
+  systemd.services.hildibrand = {
+    description = "Hildibrand - trivia buzzer bot";
+    wantedBy = [ "multi-user.target" ];
+    after = [ "network.target" ];
+    serviceConfig = {
+      Type = "simple";
+      User = userName;
+      WorkingDirectory = "/home/${userName}";
+      ExecStart = "${hildibrand}/bin/hildebrand";
+      Restart = "on-failure";
+      RestartSec = "5s";
+    };
+  };
+
+  # Add username to groups "wheel" and "video" - more may be added here later
+  users = {
+    users = {
+      ${userName} = {
+        extraGroups = [ "wheel" "network" ];
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
+        ];
+      };
+    };
+  };
+
+  services.fail2ban = {
+    enable = true;
+    package = pkgs.fail2ban;
+    maxretry = 5;
+    bantime = "3h";
+    bantime-increment = {
+      enable = true;
+      rndtime = "10m";
+    };
+  };
+
+  system.stateVersion = "24.11";
+}
@@ -0,0 +1,6 @@
+{ ... }: {
+  imports = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+  ];
+}
@@ -0,0 +1,32 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/498ce176-f090-46d8-96bf-9e6141cffa19";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/09A6-B803";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/4a64a2ee-2b32-4e53-b00f-7b1f127162aa"; }
+    ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
@@ -0,0 +1,88 @@
+{
+  pkgs,
+  userName,
+  nur,
+  ...
+}: {
+  imports = [
+    ../../pwrMgmt
+    ../../networking/core.nix
+    ../../virtualization/podman.nix
+    ../../games/homestead
+  ];
+
+  # Enable flakes for NixOS
+  nix.settings.experimental-features = ["nix-command" "flakes"];
+
+  # Custom kernel/boot stuff
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # Set your timezone
+  time.timeZone = "America/Detroit";
+
+  # Enable OpenSSH
+  services.openssh.enable = true;
+
+  # Enable keyring
+  services.gnome.gnome-keyring.enable = true;
+
+  # Enable GnuPG
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  # Enable SUID wrappers (some programs need them)
+  programs.mtr.enable = true;
+
+  # Enable Polkit
+  security.polkit.enable = true;
+
+  # Power management (see ../../pwrMgmt/default.nix)
+  pwrMgmt = {
+    enable = true;
+    cpuFreqGovernor = "performance";
+    powertop.enable = false;
+  };
+
+  network = {
+    firewall = {
+      enable = true;
+    };
+    networkManager.enable = true;
+  };
+
+  # Add username to groups "wheel" and "video" - more may be added here later
+  users = {
+    users = {
+      ${userName} = {
+        extraGroups = [ "wheel" "network" ];
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
+        ];
+      };
+    };
+  };
+
+  services.fail2ban = {
+    enable = true;
+    package = pkgs.fail2ban;
+    maxretry = 5;
+    bantime = "3h";
+    bantime-increment = {
+      enable = true;
+      rndtime = "10m";
+    };
+  };
+
+  services.homestead = {
+    enable = true;
+    openFirewall = true;
+  };
+  services.minecraft-servers.eula = true;
+
+  system.stateVersion = "26.05";
+}
@@ -0,0 +1,6 @@
+{ ... }: {
+  imports = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+  ];
+}
@@ -0,0 +1,32 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/ec4c43ec-efcc-40ea-a4c8-411e60ee7c4e";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/140E-FE19";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/547bbd78-85be-4d17-a519-c4a2a923bdab"; }
+    ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
@@ -0,0 +1,105 @@
+{
+  pkgs,
+  userName,
+  nur,
+  ...
+}: {
+  imports = [
+    ../../pwrMgmt
+    ../../networking/core.nix
+    ../../virtualization/podman.nix
+  ];
+
+  # Enable flakes for NixOS
+  nix.settings.experimental-features = ["nix-command" "flakes"];
+
+  # Custom kernel/boot stuff
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # Set your timezone
+  time.timeZone = "America/Detroit";
+
+  # Enable OpenSSH
+  services.openssh.enable = true;
+
+  # Enable keyring
+  services.gnome.gnome-keyring.enable = true;
+
+  # Enable GnuPG
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  # Enable SUID wrappers (some programs need them)
+  programs.mtr.enable = true;
+
+  # Enable Polkit
+  security.polkit.enable = true;
+
+  # Power management (see ../../pwrMgmt/default.nix)
+  pwrMgmt = {
+    enable = true;
+    cpuFreqGovernor = "performance";
+    powertop.enable = false;
+  };
+
+  network = {
+    firewall = {
+      enable = true;
+      tcpPorts = {
+        allowedPorts = [ 42420 ];
+      };
+      udpPorts = {
+        allowedPorts = [ 42420 ];
+      };
+    };
+    networkManager.enable = true;
+  };
+
+  environment.systemPackages = [
+    nur.packages.${pkgs.system}.vintage-story
+  ];
+
+  systemd.services.vintagestory-server = {
+    description = "Vintage Story Server";
+    wantedBy = [ "multi-user.target" ];
+    after = [ "network.target" ];
+    serviceConfig = {
+      Type = "simple";
+      User = userName;
+      WorkingDirectory = "/home/${userName}";
+      ExecStart = "${nur.packages.${pkgs.system}.vintage-story}/bin/vintagestory-server";
+      Restart = "on-failure";
+      RestartSec = "5s";
+    };
+  };
+
+  # Add username to groups "wheel" and "video" - more may be added here later
+  users = {
+    users = {
+      ${userName} = {
+        extraGroups = [ "wheel" "network" ];
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
+        ];
+      };
+    };
+  };
+
+  services.fail2ban = {
+    enable = true;
+    package = pkgs.fail2ban;
+    maxretry = 5;
+    bantime = "3h";
+    bantime-increment = {
+      enable = true;
+      rndtime = "10m";
+    };
+  };
+
+  system.stateVersion = "24.11";
+}
@@ -0,0 +1,6 @@
+{ ... }: {
+  imports = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+  ];
+}
@@ -0,0 +1,32 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/ec4c43ec-efcc-40ea-a4c8-411e60ee7c4e";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/140E-FE19";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/547bbd78-85be-4d17-a519-c4a2a923bdab"; }
+    ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
@@ -2,6 +2,7 @@
  environment.systemPackages = with pkgs; [
    neovim
    git
+    tailscale
  ];

  environment.variables.EDITOR = "nvim";
@@ -0,0 +1,121 @@
+{
+  pkgs,
+  userName,
+  nur,
+  ...
+}: {
+  imports = [
+    ../../pwrMgmt
+    ../../networking/core.nix
+    ../../virtualization/podman.nix
+  ];
+
+  # Enable flakes for NixOS
+  nix.settings.experimental-features = ["nix-command" "flakes"];
+
+  # Custom kernel/boot stuff
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # Set your timezone
+  time.timeZone = "America/Detroit";
+
+  # Enable OpenSSH
+  services.openssh.enable = true;
+
+  # Enable keyring
+  services.gnome.gnome-keyring.enable = true;
+
+  # Enable GnuPG
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  # Enable SUID wrappers (some programs need them)
+  programs.mtr.enable = true;
+
+  # Enable Polkit
+  security.polkit.enable = true;
+
+  # Power management (see ../../pwrMgmt/default.nix)
+  pwrMgmt = {
+    enable = true;
+    cpuFreqGovernor = "performance";
+    powertop.enable = false;
+  };
+
+  network = {
+    firewall = {
+      enable = true;
+      tcpPorts = {
+        allowedPorts = [ 42420 ];
+      };
+      udpPorts = {
+        allowedPorts = [ 42420 ];
+      };
+    };
+    networkManager.enable = true;
+  };
+
+  environment.systemPackages = [
+    nur.packages.${pkgs.system}.vintage-story
+  ];
+
+  systemd.services.vintagestory-server = {
+    description = "Vintage Story Server";
+    wantedBy = [ "multi-user.target" ];
+    after = [ "network.target" ];
+    serviceConfig = {
+      Type = "simple";
+      User = userName;
+      WorkingDirectory = "/home/${userName}";
+      ExecStart = "${nur.packages.${pkgs.system}.vintage-story}/bin/vintagestory-server";
+      Restart = "on-failure";
+      RestartSec = "5s";
+    };
+  };
+
+  # Add username to groups "wheel" and "video" - more may be added here later
+  users = {
+    groups.hazel = {};
+    users = {
+      ${userName} = {
+        extraGroups = [ "wheel" "network" ];
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
+        ];
+      };
+      "hazel" = {
+        home = "/home/hazel";
+        group = "hazel";
+        extraGroups = [ "wheel" ];
+        description = "hazel";
+        isNormalUser = true;
+        openssh.authorizedKeys.keys = [
+          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDZnyiQx+k1ygX8E1lsUCB6aTdMc+OKzlZ4admlzknc5ulj0YrtUyqhbNhkNd6pP0QDBFMnXO/rzUvHp4TAyZXKFfpcBCa4zhK97ufymAfvzAjM4vRBqRNcr2n+2iRzxtolbklfjs3ocBQVxXW+pRT5wWxTgK2fcmP2xviDVldr7qte37x5YkQb5SAhYNH8tqJRnuGPe+Q0A3oN4HyHZFnrMq/HlbL5yg/0VKPTtF/IgHf+2dDz5OQQpBx3/N9u/QLwuIm9lkyOG03s0TGmE7up/i0jX2vIqp2BbGSnwdQEL/eSVZx73qQB/J62VFafg13P5yQWDJ33WSoiwhac6bg26HPmPOnCJp5R3c+7jM8N1F1ZbtsKicHSVsRg1RQSree4lchPy7FOPkCuUrB7LNE71mbpOzZNR767S6UAPaXxRw6QNYGBaDqQBwhlU8ZDF5F7EW6ahSUMOI6ECyoibzIMb56xs9osuNeUhB/BcL5sHSFpJjIbdcDLNkEKggrBl6s="
+        ];
+      };
+    };
+  };
+
+  services.fail2ban = {
+    enable = true;
+    package = pkgs.fail2ban;
+    maxretry = 5;
+    bantime = "3h";
+    bantime-increment = {
+      enable = true;
+      rndtime = "10m";
+    };
+  };
+
+  services.tailscale = {
+    enable = true;
+    package = pkgs.tailscale;
+  };
+
+  system.stateVersion = "24.11";
+}
@@ -0,0 +1,6 @@
+{ ... }: {
+  imports = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+  ];
+}
@@ -0,0 +1,32 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/e2e621c1-0090-472a-99d9-61c6a87bd068";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/663E-15C0";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/60104b1a-4285-4dd1-be5e-3c3dee24515a"; }
+    ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
@@ -0,0 +1,351 @@
+{
+  nur,
+  pkgs,
+  userName,
+  ...
+}:
+let
+  # INFO: set these to your liking
+  matrixFqdn = "chat.wyattjmiller.com";
+  rtcFqdn = "rtc.wyattjmiller.com";
+
+  supportEmail = "wyatt@wyattjmiller.com";
+  livekitKeyFile = "/var/lib/livekit/livekit.key";
+  matrixRegistrationTokenFile = "/var/lib/matrix.key";
+
+  sableWeb = nur.packages.${pkgs.stdenv.hostPlatform.system}.sable-web;
+
+  sableConfig = pkgs.writeTextDir "config.json" (
+    builtins.toJSON {
+      defaultHomeserver = 0;
+      homeserverList = [ matrixFqdn ];
+      allowCustomHomeservers = false;
+
+      disableAccountSwitcher = false;
+      hideUsernamePasswordFields = false;
+
+      hashRouter = {
+        enabled = false;
+        basename = "/";
+      };
+
+      featuredCommunities = {
+        spaces = [
+          "#seventhdawn:chat.wyattjmiller.com"
+        ];
+        rooms = [
+          "#general:chat.wyattjmiller.com"
+          "#gposeglams:chat.wyattjmiller.com"
+          "#lobby-vc:chat.wyattjmiller.com"
+          "#annoucements:chat.wyattjmiller.com"
+        ];
+      };
+    }
+  );
+in
+{
+  imports = [
+    ../../pwrMgmt
+  ];
+
+  # Enable flakes for NixOS
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+
+  nix.settings = {
+    download-buffer-size = 134217728; # 128 MiB in bytes
+  };
+
+  # Custom kernel/boot stuff
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # Set your timezone
+  time.timeZone = "America/Detroit";
+
+  # Enable OpenSSH
+  services.openssh = {
+    enable = true;
+    settings.PermitRootLogin = "no";
+    settings.PasswordAuthentication = false;
+  };
+
+  # Enable keyring
+  services.gnome.gnome-keyring.enable = true;
+
+  # Enable GnuPG
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  # Enable SUID wrappers (some programs need them)
+  programs.mtr.enable = true;
+
+  # Enable Polkit
+  security.polkit.enable = true;
+
+  # Power management (see ../../pwrMgmt/default.nix)
+  pwrMgmt = {
+    enable = true;
+    cpuFreqGovernor = "performance";
+    powertop.enable = false;
+  };
+
+  # Firewall settings (fallback, upstream way of doing things)
+  networking.firewall = {
+    enable = true;
+
+    allowedTCPPorts = [
+      80
+      443
+      8448
+      3478
+      5349
+      7880
+      7881
+      8080
+      8081
+    ];
+
+    allowedUDPPorts = [
+      3478
+      7881
+      8448
+    ];
+
+    allowedUDPPortRanges = [
+      # TURN UDP relays
+      {
+        from = 49000;
+        to = 50000;
+      }
+      #
+      {
+        from = 50100;
+        to = 50200;
+      }
+    ];
+  };
+
+  # Add username to groups "wheel" and "video" - more may be added here later
+  users.users.${userName} = {
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
+    ];
+    extraGroups = [
+      "wheel"
+      "video"
+      "network"
+    ];
+  };
+
+  # fail2ban
+  services.fail2ban = {
+    enable = true;
+    package = pkgs.fail2ban;
+    maxretry = 5;
+    bantime = "3h";
+    bantime-increment = {
+      enable = true;
+      rndtime = "10m";
+    };
+  };
+
+  # Matrix server
+  services.matrix-tuwunel = {
+    enable = true;
+    package = pkgs.matrix-tuwunel;
+    settings = {
+      global = {
+        server_name = matrixFqdn;
+        allow_encryption = true;
+        allow_federation = true;
+        allow_registration = true;
+        registration_token = matrixRegistrationTokenFile;
+        allow_unstable_room_versions = false;
+        allow_experimental_room_versions = false;
+        zstd_compression = true;
+        new_user_displayname_suffix = "✨";
+        max_request_size = 1048575600; # 100MB in bytes, for file uploads
+        database_backup_path = "/var/lib/tuwunel/database_backups";
+        database_backups_to_keep = 2;
+
+        address = [
+          "127.0.0.1"
+          "::1"
+        ];
+        port = [ 8008 ];
+
+        well_known = {
+          client = "https://${matrixFqdn}";
+          server = "${matrixFqdn}:443";
+          support_email = supportEmail;
+          support_mxid = "@wymiller:${matrixFqdn}";
+
+          rtc_transports = [
+            {
+              type = "livekit";
+              livekit_service_url = "https://${rtcFqdn}";
+            }
+          ];
+        };
+      };
+    };
+  };
+
+  # LiveKit (Matrix RTC)
+  services.livekit = {
+    enable = true;
+    package = pkgs.livekit;
+    openFirewall = true;
+    keyFile = livekitKeyFile;
+    settings = {
+      port = 7880;
+      room.auto_create = true;
+      rtc = {
+        use_external_ip = true;
+      };
+    };
+  };
+
+  # Reverse proxy
+  services.caddy = {
+    enable = true;
+    package = pkgs.caddy;
+    virtualHosts = {
+      "${matrixFqdn}" = {
+        extraConfig = ''
+          @matrixEndpoints path \
+            /_matrix/* \
+            /_tuwunel/* \
+            /.well-known/matrix/*
+
+          handle @matrixEndpoints {
+            reverse_proxy 127.0.0.1:8008
+          }
+
+          @sableConfig path /config.json
+          handle @sableConfig {
+            root * ${sableConfig}
+            header Cache-Control "no-store"
+            file_server
+          }
+
+          handle {
+            root * ${sableWeb}
+
+            encode zstd gzip
+            try_files {path} /index.html
+
+            file_server {
+              precompressed br
+            }
+
+            header /assets/* Cache-Control "public, max-age=31536000, immutable"
+            header /sw.js Cache-Control "no-cache"
+            header /index.html Cache-Control "no-cache"
+            header Document-Policy "js-profiling"
+          }
+        '';
+      };
+      "${matrixFqdn}:8448" = {
+        extraConfig = ''
+          encode zstd gzip
+          reverse_proxy localhost:8008
+        '';
+      };
+      "${rtcFqdn}" = {
+        extraConfig = ''
+          @jwt_service {
+            path /sfu/get* /healthz*
+          }
+
+          handle @jwt_service {
+            reverse_proxy localhost:8080
+          }
+
+          handle {
+            reverse_proxy localhost:7880 {
+              header_up Connection "upgrade"
+              header_up Upgrade {http.request.header.Upgrade}
+            }
+          }
+        '';
+      };
+    };
+  };
+
+  # LiveKit JWT service
+  services.lk-jwt-service = {
+    enable = true;
+    port = 8080;
+    livekitUrl = "wss://rtc.wyattjmiller.com";
+    keyFile = livekitKeyFile;
+  };
+
+  # Generate LiveKit key if it doesn't exist
+  systemd.services = {
+    matrix-registration-token-gen = {
+      before = [ "tuwunel.service" ];
+      wantedBy = [ "multi-user.target" ];
+      path = with pkgs; [
+        coreutils
+        openssl
+      ];
+      script = ''
+        set -eu
+
+        if [ -f "${matrixRegistrationTokenFile}" ]; then
+          exit 0
+        fi
+
+        install -d -m 0700 "$(dirname "${matrixRegistrationTokenFile}")"
+
+        TOKEN="$(openssl rand -hex 32)"
+
+        umask 077
+        printf '%s\n' "$TOKEN" > "${matrixRegistrationTokenFile}"
+      '';
+      serviceConfig = {
+        Type = "oneshot";
+        User = "root";
+      };
+    };
+
+    livekit-key-gen = {
+      before = [
+        "lk-jwt-service.service"
+        "livekit.service"
+      ];
+      wantedBy = [ "multi-user.target" ];
+      path = with pkgs; [
+        coreutils
+        openssl
+      ];
+      script = ''
+        set -eu
+
+        if [ -f "${livekitKeyFile}" ]; then
+          exit 0
+        fi
+
+        install -d -m 0700 "$(dirname "${livekitKeyFile}")"
+
+        API_KEY="$(openssl rand -hex 8)"
+        API_SECRET="$(openssl rand -hex 32)"
+
+        umask 077
+        printf '%s: %s\n' "$API_KEY" "$API_SECRET" > "${livekitKeyFile}"
+      '';
+      serviceConfig = {
+        Type = "oneshot";
+        User = "root";
+      };
+    };
+  };
+
+  system.stateVersion = "25.11";
+}
@@ -0,0 +1,6 @@
+{ ... }: {
+  imports = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+  ];
+}
@@ -0,0 +1,35 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ];
+  boot.kernelParams = [ "console=ttyS0,19200n8" ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+  boot.loader.grub.extraConfig = ''
+    serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1;
+    terminal_input serial;
+    terminal_output serial;
+  '';
+  boot.loader.grub.forceInstall = true;
+#  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "nodev";
+  boot.loader.timeout = 10;
+
+  fileSystems."/" =
+    { device = "/dev/sda";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/sdb"; }
+    ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
@@ -0,0 +1,8 @@
+{
+  ...
+}: let in {
+  security.pam.services = {
+    login.u2fAuth = true;
+    sudo.u2fAuth = true;
+  };
+}
@@ -3,9 +3,15 @@
  services.pipewire = {
    enable = true;
    pulse.enable = true;
+
+    alsa = {
+      enable = true;
+      support32Bit = true;
+    };
  };

  environment.systemPackages = with pkgs; [
-    helvum
+    # helvum - UNMAINTAINED
+    crosspipe
  ];
 }
Author	SHA1	Message	Date
wymiller	1bf77e4eb6	add: krile configuration	2026-10-27 13:47:25 -04:00
gitea-actions[bot]	4965e9ed1d	chore: update flake lock	2026-10-25 07:04:48 +00:00
wymiller	b42f545195	mod: fix fish_greeting	2026-10-19 00:52:55 -04:00
gitea-actions[bot]	b27fa2440e	chore: update flake lock	2026-10-18 19:38:14 +00:00
gitea-actions[bot]	6ae398abdc	chore: update flake lock	2026-10-18 07:01:16 +00:00
wymiller	57490387aa	Merge pull request 'Update home/shell.nix' (#16 ) from cosmic_lunaria/nix-config-v2:cosmic_lunaria-patch-1 into master Reviewed-on: #16	2026-10-17 20:32:59 -05:00
cosmic_lunaria	b76df1881b	Update home/shell.nix	2026-10-17 20:02:48 -05:00
gitea-actions[bot]	3fa4fb8ef7	chore: update flake lock	2026-10-11 07:08:06 +00:00
gitea-actions[bot]	bf799ca883	chore: update flake lock	2026-10-04 07:06:46 +00:00
wymiller	828154845b	Merge branch 'master' of ssh://scm.wyattjmiller.com:222/wymiller/nix-config-v2	2026-09-27 18:05:15 -04:00
wymiller	880d1508cc	mod: add csharp lsp support to neovim	2026-09-27 18:05:07 -04:00
gitea-actions[bot]	c75ecae2dc	chore: update flake lock	2026-09-27 07:06:30 +00:00
wymiller	6405a3f0aa	mod: forgot nur inherit	2026-09-20 20:22:21 -04:00
wymiller	9f14456ecc	mod: added sable web to yshtola config added formatter	2026-09-20 20:02:44 -04:00
gitea-actions[bot]	c6b1eb5337	chore: update flake lock	2026-09-20 07:07:12 +00:00
wymiller	a3f1b26f31	Merge pull request '✨ Neovim refactoring' (#15 ) from neovim-refactoring into master Reviewed-on: #15	2026-09-14 18:48:46 -05:00
wymiller	c78fb3019c	mod: added autopair, bufferline plugins	2026-09-14 19:31:56 -04:00
wymiller	a70cb42d04	Merge remote-tracking branch 'origin' into neovim-refactoring	2026-09-14 19:24:53 -04:00
wymiller	f8065ad6e1	Merge branch 'master' of ssh://scm.wyattjmiller.com:222/wymiller/nix-config-v2	2026-09-14 19:14:36 -04:00
wymiller	0b4027f0c0	mod: added proton manager to gaming module, added alsa to sound, added 32-bit libs to graphics	2026-09-14 19:14:30 -04:00
gitea-actions[bot]	ee60d5de02	chore: update flake lock	2026-09-13 07:06:14 +00:00
gitea-actions[bot]	6cf609acc1	chore: update flake lock	2026-09-06 07:08:23 +00:00
gitea-actions[bot]	7853a1b457	chore: update flake lock	2026-08-30 07:05:21 +00:00
wymiller	ce3a1bc06d	chore: add flake lock update workflow	2026-08-27 13:07:46 -04:00
wymiller	b8340019e8	Merge pull request '⚙️ Estinien configuration' (#14 ) from estinien into master Reviewed-on: #14	2026-08-11 19:02:55 -05:00
wymiller	b4390109c9	Merge branch 'master' into estinien	2026-08-11 19:02:46 -05:00
wymiller	d602b3ba45	Merge pull request '⚙️ Raubahn configuration' (#13 ) from raubahn into master Reviewed-on: #13	2026-08-11 19:02:22 -05:00
wymiller	a1f77ed407	add: added hardware config	2026-08-11 20:05:11 -04:00
wymiller	d7a2d4cf38	mod: update flake	2026-08-11 00:21:04 -04:00
wymiller	04518129d5	mod: adjusted hildibrand	2026-08-10 23:38:39 -04:00
wymiller	0769fe1e0d	mod: adjusted again	2026-08-10 23:01:53 -04:00
wymiller	fee14618b8	mod: added input	2026-08-10 22:44:07 -04:00
wymiller	7bc8e821b5	mod: adjust flake to add new config	2026-08-10 22:36:24 -04:00
wymiller	9f61ec8200	add: add estinien configuration	2026-08-10 22:02:49 -04:00
wymiller	28a8ccc532	flake update needed changes cause of input	2026-08-09 17:26:26 -04:00
wymiller	76ea6e6e13	add: added raubahn config	2026-08-08 14:39:39 -04:00
wymiller	3fa654f774	mod: added nix support	2026-08-07 21:35:02 -04:00
wymiller	f2be3130a2	Merge remote-tracking branch 'origin' into neovim-refactoring	2026-07-19 12:08:52 -04:00
wymiller	23999ee3a4	mod: added archon logs report tool	2026-07-19 12:05:28 -04:00
wymiller	593ab20414	mod: add thunar file manager plugins	2026-07-12 15:31:27 -04:00
wymiller	e4614dbee5	mod: remove genshin impact, add wuwa, vlc, makemkv, tailscale service	2026-07-12 15:29:45 -04:00
wymiller	1070f65c6e	mod: start neovim refactoring	2026-07-12 15:27:37 -04:00
wymiller	884999f719	added tailscale	2026-07-01 09:33:23 -04:00
wymiller	d3dbf8583a	mod: fixed valefor	2026-06-16 00:38:35 -04:00
wymiller	cf2a710a79	Merge pull request 'Personal NUR' (#11 ) from nix-self-hosted into master Reviewed-on: #11	2026-06-12 01:08:39 -05:00
wymiller	927628a576	Merge remote-tracking branch 'origin' into nix-self-hosted	2026-06-12 02:10:32 -04:00
wymiller	0b16eaf3b0	Merge pull request '📦 Nixpkgs 26.05' (#12 ) from 26.05-move into master Reviewed-on: #12	2026-06-12 00:29:05 -05:00
wymiller	c89fc1366d	mod: remove unmaintained packages	2026-06-10 19:47:05 -04:00
wymiller	4c29cc3bfc	mod: update nixpkgs, nix-darwin, home-manager to 26.05	2026-06-08 22:01:09 -04:00
wymiller	ad717d64b8	mod: add personal nix user repository switched out all personal flakes, inputs	2026-06-08 21:55:50 -04:00
wymiller	4acbd22078	add: ai agent harnesses currently copilot and opencode for starters, might be more	2026-05-27 22:27:50 -04:00
wymiller	75982f5f5e	removed some memes	2026-05-21 20:13:29 -04:00
wymiller	ce65a70de4	Merge branch 'master' of https://scm.wyattjmiller.com/wymiller/nix-config-v2	2026-05-21 13:16:41 -04:00
wymiller	8567e7b671	added git signing	2026-05-21 13:16:31 -04:00
wymiller	a1f37f6b19	added yubico security module	2026-05-15 23:54:55 -04:00
wymiller	9fa85be412	flake update	2026-05-07 21:49:43 -04:00
wymiller	23500b07fa	lazygit skip discard warning	2026-05-07 21:49:27 -04:00
wymiller	fdf4e5e1b9	Merge pull request 'overlay-update' (#10 ) from overlay-update into master Reviewed-on: #10	2026-04-14 19:11:09 -05:00
wymiller	67648eda89	Merge branch 'master' into overlay-update	2026-04-14 19:11:01 -05:00
wymiller	76ac41a965	update community packages	2026-04-14 16:04:17 -04:00
wymiller	5c70cdc20f	Merge pull request 'Neovim editor updates' (#9 ) from wm/term-editor-updates into master Reviewed-on: #9	2026-04-10 20:37:34 -05:00
wymiller	c21066e810	added k9s skin, modified k9s settings	2026-04-10 17:02:30 -04:00
wymiller	93b15391ca	feat: added k9s, gh-dash to nvim config	2026-04-10 16:36:47 -04:00
wymiller	317571499e	update atuin, lazygit there are overlays and are out of date	2026-04-09 10:29:20 -04:00
wymiller	971a263963	Merge branch 'master' of https://scm.wyattjmiller.com/wymiller/nix-config-v2	2026-04-09 09:44:52 -04:00
wymiller	2fb3e2867c	added overlay packages, added go overlay needed go overlay for diffnav	2026-04-09 09:44:50 -04:00
wymiller	4492dcdff5	added easyeffects	2026-04-08 19:53:03 -04:00
wymiller	7d8dcee57c	Merge pull request 'Thancred (Game server)' (#8 ) from thancred into master Reviewed-on: #8	2026-04-04 22:25:32 -05:00
wymiller	3bd43f72a2	Merge branch 'master' into thancred	2026-04-02 13:00:37 -05:00
wymiller	915ecc73e8	fixed new aliases	2026-03-25 11:33:20 -04:00
wymiller	43c5308feb	added more git aliases	2026-03-25 02:11:06 -04:00
wymiller	a1c0407f02	update flake lock	2026-03-24 20:13:51 -04:00
wymiller	33f590b214	added systemd service for vintagestory-server	2026-03-23 21:46:54 -04:00
wymiller	89cdef92a7	Merge remote-tracking branch 'origin' into thancred	2026-03-23 21:25:36 -04:00
wymiller	2f378ddc22	added some shell quotes	2026-03-23 21:15:36 -04:00
wymiller	937deb7079	added some git aliases	2026-03-23 20:39:02 -04:00
wymiller	4c462c21f3	Merge branch 'master' of ssh://scm.wyattjmiller.com:222/wymiller/nix-config-v2	2026-03-23 20:21:55 -04:00
wymiller	eb26a93944	modified linux home packages why did i ever get rid of this in the first place?	2026-03-23 20:21:52 -04:00
wymiller	098478fa0f	added login quotes	2026-03-18 11:42:59 -04:00
wymiller	80fd89c5ac	added groups	2026-02-25 21:52:36 -05:00
wymiller	1a8c910e3a	group, extraGroups fix	2026-02-25 21:44:12 -05:00
wymiller	3992cab7c8	added user to thancred	2026-02-25 21:39:35 -05:00
wymiller	f0eb5678c8	modifications	2026-02-25 20:09:06 -05:00
wymiller	bd262d3fb6	wtf is that doing here??	2026-02-25 20:00:40 -05:00
wymiller	f1a426bd2e	Merge branch 'master' of https://scm.wyattjmiller.com/wymiller/nix-config-v2	2026-02-24 01:00:44 -05:00
wymiller	9fe67f2b97	updated machine module readme	2026-02-24 01:00:06 -05:00
wymiller	245b5b1e08	Merge pull request 'Y'shtola (Matrix server)' (#7 ) from yshtola-build into master Reviewed-on: #7	2026-02-23 23:45:39 -06:00
wymiller	b3954838d2	modularized yshtola pulled out the FQDNs and repeating strings that i don't need repeated	2026-02-24 00:42:55 -05:00
wymiller	6b586d80ab	final touches to matrix, livekit, lk-jwt-service	2026-02-24 00:08:30 -05:00
wymiller	0718c9f18d	Merge branch 'yshtola-build' of https://scm.wyattjmiller.com/wymiller/nix-config-v2 into yshtola-build	2026-02-23 22:31:15 -05:00
wymiller	14dbc1363e	things happened	2026-02-23 22:30:45 -05:00
wymiller	7e0d58c097	wip: modified livekit-key service	2026-02-23 21:29:11 -06:00
wymiller	f2ae159c67	wip: added configuration changes to tuwunel, livekit, lk-jwt-service	2026-02-23 21:53:20 -05:00
wymiller	a3ef9fa59e	changes to hardware config	2026-02-19 02:44:23 +00:00
wymiller	aea71bb49b	wip: ready for hardware configuration	2026-02-18 19:55:43 -05:00
wymiller	e7b2a1bc1e	wip: still in progress	2026-02-18 14:57:21 -05:00
wymiller	bdf4d54e99	wip: build still in progress	2026-02-18 08:40:47 -05:00
wymiller	26662e1419	wip: yshtola build in progress	2026-02-17 18:24:34 -05:00
wymiller	f2ee981953	modifying thancred to match updated flake config	2026-02-16 20:39:20 -05:00
wymiller	eb666f6a01	Merge remote-tracking branch 'origin' into thancred	2026-02-16 20:34:09 -05:00
wymiller	b8db103e08	Merge pull request 'Standalone Home Manager configuration' (#6 ) from hm-standalone-config into master Reviewed-on: #6	2026-02-16 19:24:07 -06:00
wymiller	08adc255d6	darwin changes	2026-02-16 19:59:35 -05:00
wymiller	c81ca5ee4c	works on cloud	2026-02-16 19:33:25 -05:00
wymiller	9cfe456cb9	Merge remote-tracking branch 'origin' into hm-standalone-config	2026-02-16 19:19:04 -05:00
wymiller	ad7f01e41e	commit	2026-02-15 19:10:58 -05:00
wymiller	c452ebff3c	real commit this time	2026-02-15 19:05:42 -05:00
wymiller	a1e71488d8	Revert "modified gaming apps" This reverts commit `67fda15ca9`.	2026-02-15 18:52:30 -05:00
wymiller	45c8f7ec27	Revert "added hardware config" This reverts commit `769ab6f72d`.	2026-02-15 18:51:41 -05:00
wymiller	67fda15ca9	modified gaming apps	2026-02-15 18:31:15 -05:00
wymiller	769ab6f72d	added hardware config	2026-02-15 22:49:56 +00:00
wymiller	1769e583d8	created vs vm	2026-02-14 19:21:25 -05:00
wymiller	2592a1cd72	update flake	2026-02-14 18:30:51 -05:00
wymiller	6dbfc5805e	updated flake to 25.11	2026-02-01 21:32:32 -05:00
wymiller	1f9ff31234	added vintage story flake	2026-01-28 08:25:51 -05:00
wymiller	7a3c83f088	add shell init path	2025-12-19 15:37:16 -05:00
wymiller	1cbfb37409	darwin build success ready for pr ig	2025-12-13 17:04:28 -05:00
wymiller	83d1494d4a	nixos build success darwin next maybe?	2025-12-13 14:04:54 -05:00
wymiller	f8da56fe52	working build fixed up krew home module	2025-12-12 15:52:04 -05:00
wymiller	bcf5b224cb	trying this	2025-12-12 15:39:23 -05:00
wymiller	b762b06f05	cleanup?	2025-12-12 14:15:19 -05:00
wymiller	9fedd2d61e	removed k9s overlay this commit got builds working, working in the sense that the build actually threw an error! have to fix that	2025-12-10 17:09:19 -05:00
wymiller	4207b320c9	working? plus cleanup and fallbacks	2025-11-17 12:12:17 -05:00
wymiller	6561e37119	wip: still broken	2025-11-06 17:14:39 -05:00
wymiller	717e8c452d	wip: broken, still working on it'	2025-10-31 17:07:59 -04:00
wymiller	8fd3ca8c9a	wip: modularizing?	2025-10-30 17:34:55 -04:00