add: desktop xdg integration

Merge remote-tracking branch 'origin' into desktops
mod: forgot nur inherit
2026-09-23 18:43:38 -04:00 · 2026-09-22 15:27:38 -04:00 · 2026-09-20 20:22:21 -04:00 · 2026-09-20 20:02:44 -04:00 · 2026-09-20 07:07:12 +00:00 · 2026-09-14 18:48:46 -05:00
38 changed files with 1836 additions and 417 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": 1771170334,
-        "narHash": "sha256-tCgoCWORfNHaRXTh2QS44LwxlV8q28jVvjN5ioMicv8=",
+        "lastModified": 1789138122,
+        "narHash": "sha256-mh+ZiGCtHAo0xIi1yaNjHsftfnlWz9JiYwHCyT16yIE=",
        "owner": "ezKEa",
        "repo": "aagl-gtk-on-nix",
-        "rev": "821b4f92c2c0981ea5b571b03403df87d2b2e2ae",
+        "rev": "d82d6d6f66caf4b63fb154e62fad83c627874127",
        "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": 1789283312,
+        "narHash": "sha256-Sv/2AyUTydH5d4eNk/ej1lHD1rpDvNjiB5Y3hmg/EGk=",
+        "ref": "refs/heads/master",
+        "rev": "31673a5c64497a0f40487d51820d3738dec13d60",
+        "revCount": 24,
+        "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": 1767634391,
-        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
+        "lastModified": 1783744694,
+        "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
+        "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74",
        "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": 1786845137,
+        "narHash": "sha256-oQFip+v0luP8NIxJzmiW4Wu8bILsbFWom5l0zonl8hQ=",
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "rev": "4cff07de74b50e64bdd68cd4e722ab5b6b35ee48",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LnL7",
        "repo": "nix-darwin",
        "type": "github"
      }
@@ -59,14 +103,62 @@
        "type": "github"
      }
    },
+    "flake-compat_2": {
+      "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_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": 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",
@@ -75,18 +167,165 @@
    },
    "flake-schemas_2": {
      "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-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "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": 1789623807,
+        "narHash": "sha256-pqmP+T+fR2+MDen+ro2iF7mdH7S83AUuvNZwVDl3jUk=",
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "rev": "b19679b19d64dc29b96caf07e3282c250611ac57",
+        "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": 1789623807,
+        "narHash": "sha256-pqmP+T+fR2+MDen+ro2iF7mdH7S83AUuvNZwVDl3jUk=",
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "rev": "b19679b19d64dc29b96caf07e3282c250611ac57",
+        "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": 1789887932,
+        "narHash": "sha256-ryX9MgESeWwjpFMgxlaF97FgtaRyfIELgFLEeUR8xLQ=",
+        "ref": "refs/heads/master",
+        "rev": "70288a728cc39eb5f390f71ae24d4a58763216b1",
+        "revCount": 14,
+        "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": [
@@ -94,20 +333,56 @@
        ]
      },
      "locked": {
-        "lastModified": 1770260404,
-        "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
+        "lastModified": 1789267039,
+        "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
+        "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1789867870,
+        "narHash": "sha256-sOag/7DTqw4tXLI7UxjrZxPGV+dlTe6zFtJn0VSkgFM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "d2a22a3659a6ae99847ea9176114f6957b8ac62e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "mnw": {
+      "locked": {
+        "lastModified": 1780772958,
+        "narHash": "sha256-VKKe8r4pwCGWZ3Yr9CPN129R4S3CKLSrlYqdYz3vKpM=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "0871dbf63a53610c95db04439ed8ea4d6ec9c160",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
    "nix-flatpak": {
      "locked": {
        "lastModified": 1739444422,
@@ -126,37 +401,66 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1744536153,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
-        "owner": "NixOS",
+        "lastModified": 1789286504,
+        "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=",
+        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1771043024,
-        "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=",
+        "lastModified": 1789749394,
+        "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44",
+        "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1789749394,
+        "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1787498568,
+        "narHash": "sha256-FoOSoBG7tEvOlGRTpWnVdY506Ner4y7r7UYO3OGgmE8=",
+        "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1060451.56c02bc00adc/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=",
@@ -172,56 +476,76 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nur": {
+      "inputs": {
+        "caitsith": "caitsith",
+        "darwin": "darwin_2",
+        "go-overlay": "go-overlay_2",
+        "hildibrand": "hildibrand",
+        "home-manager": "home-manager_2",
+        "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": 1789887979,
+        "narHash": "sha256-ln0cOIfvEFNd4IdVbiYfdtxS01E5npnstm0YCTOxpJY=",
+        "ref": "refs/heads/master",
+        "rev": "39c33599b191ae2d595b3cc38e8ad4bf2766cd89",
+        "revCount": 99,
+        "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"
      }
    },
-    "nixpkgs_5": {
+    "nvf": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "mnw": "mnw",
+        "nixpkgs": "nixpkgs_4"
+      },
      "locked": {
-        "lastModified": 1769089682,
-        "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
-        "rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
-        "revCount": 906333,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.906333%2Brev-078d69f03934859a181e81ba987c2bb033eebfc5/019bebf2-031c-7119-8fdc-ce9d29d005fa/source.tar.gz"
+        "lastModified": 1789854559,
+        "narHash": "sha256-6GDssza3F+ukpUujSuTL50vW5AHaoG+4vjsDgWqRyeQ=",
+        "owner": "notashelf",
+        "repo": "nvf",
+        "rev": "85bf39cd0409ad8a7fa5b3ad0d29e89e9da97a0e",
+        "type": "github"
      },
      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
+        "owner": "notashelf",
+        "repo": "nvf",
+        "type": "github"
      }
    },
    "root": {
      "inputs": {
        "aagl": "aagl",
        "darwin": "darwin",
+        "go-overlay": "go-overlay",
        "home-manager": "home-manager",
        "nix-flatpak": "nix-flatpak",
        "nixpkgs": "nixpkgs_2",
-        "rust-overlay": "rust-overlay_2",
-        "swaytreesave": "swaytreesave",
-        "vintage-story": "vintage-story"
+        "nur": "nur",
+        "nvf": "nvf",
+        "rust-overlay": "rust-overlay_5"
      }
    },
    "rust-overlay": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "aagl",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1770952264,
-        "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=",
+        "lastModified": 1785476452,
+        "narHash": "sha256-/CXwCFPS41rb/JI2VitKCgVK6V5E6/sfw5ke3B9zyVQ=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188",
+        "rev": "6ef009bf4c4873cdc1a621826722bdea7c03e62c",
        "type": "github"
      },
      "original": {
@@ -232,14 +556,18 @@
    },
    "rust-overlay_2": {
      "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "nur",
+          "caitsith",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1771211437,
-        "narHash": "sha256-lcNK438i4DGtyA+bPXXyVLHVmJjYpVKmpux9WASa3ro=",
+        "lastModified": 1789196581,
+        "narHash": "sha256-yJr1Bt4fKkKIpPYbsKGqJ0VFdoDnURgRwuffmBQ2WzY=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "c62195b3d6e1bb11e0c2fb2a494117d3b55d410f",
+        "rev": "228ecefb6329d5a531b77b46b581a2f0c26ee056",
        "type": "github"
      },
      "original": {
@@ -248,42 +576,95 @@
        "type": "github"
      }
    },
-    "swaytreesave": {
+    "rust-overlay_3": {
      "inputs": {
-        "flake-schemas": "flake-schemas",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": [
+          "nur",
+          "hildibrand",
+          "nixpkgs"
+        ]
      },
      "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": 1789802016,
+        "narHash": "sha256-QVFfArbYaQMGK4dFV+5RUL72Ci+hNHVhaF/R9qJfDhs=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "26a71e661c47bd21a05d06fec749f3f7c75e9d12",
+        "type": "github"
      },
      "original": {
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
      }
    },
-    "vintage-story": {
+    "rust-overlay_4": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1789802016,
+        "narHash": "sha256-QVFfArbYaQMGK4dFV+5RUL72Ci+hNHVhaF/R9qJfDhs=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "26a71e661c47bd21a05d06fec749f3f7c75e9d12",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_5": {
      "inputs": {
-        "flake-schemas": "flake-schemas_2",
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1769397199,
-        "narHash": "sha256-MSajncUGZtlpl88rqFdj42eGGyWnk2jw84VbK3AgUBA=",
-        "ref": "refs/heads/master",
-        "rev": "4d2313c50933645040a0d12556016fc2916bfa65",
-        "revCount": 1,
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"
+        "lastModified": 1789802016,
+        "narHash": "sha256-QVFfArbYaQMGK4dFV+5RUL72Ci+hNHVhaF/R9qJfDhs=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "26a71e661c47bd21a05d06fec749f3f7c75e9d12",
+        "type": "github"
      },
      "original": {
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
      }
    }
  },
@@ -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";
    };
    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";
-    vintage-story.url = "git+https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git";
+    nvf.url = "github:notashelf/nvf";
+    nur.url = "git+https://scm.wyattjmiller.com/wymiller/nur.git";
  };

  outputs = inputs @ {
@@ -29,26 +28,32 @@
    darwin,
    home-manager,
    rust-overlay,
+    go-overlay,
    aagl,
-    swaytreesave,
-    vintage-story,
+    nur,
+    nvf,
    ...
  }: let
    userName = "wyatt";
    userEmail = "wyatt@wyattjmiller.com";
    extraSpecialArgs = {
-      inherit userName userEmail 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;
@@ -83,7 +88,7 @@
    nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
      specialArgs = {
-        inherit userName userEmail aagl vintage-story;
+        inherit userName userEmail aagl nur;
        hostname = "cloud";
        role = "workstation";
      };
@@ -123,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
@@ -162,10 +167,63 @@
      # ];
    };

+    # 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;
+        inherit userName userEmail nur;
        hostname = "yshtola";
        role = "server";
      };
@@ -187,6 +245,32 @@
      ];
    };

+    # 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
+          ];
+        }
+      ];
+    };
+
    # generic non-NixOS Linux machine
    homeConfigurations."generic" = let
      hostname = builtins.getEnv "HOSTNAME";
@@ -195,7 +279,7 @@
      pkgs = nixpkgs.legacyPackages.${system};
      
      extraSpecialArgs = {
-        inherit userName userEmail hostname;
+        inherit userName userEmail hostname nvf;
        isNixOS = false;
        role = "workstation";
      };
@@ -203,6 +287,7 @@
        {
          nixpkgs.overlays = [
            rust-overlay.overlays.default
+            go-overlay.overlays.default
            self.common.overlays
          ];
        }
@@ -1,8 +1,6 @@
 { lib
 , pkgs
 , userName
-, swaytreesave
-, isNixOS ? true
 , ...
 }: let
  # Have a file sturcture that holds all the configuration files that can't be configured by Nix
@@ -32,19 +30,6 @@ in
      stateVersion = "24.11";
    }

-    (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";
-      };
-    })
-
    (lib.mkIf pkgs.stdenv.isLinux {
      pointerCursor = {
        gtk.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";
@@ -7,7 +7,7 @@
      liveViewAutoRefresh = false;
      apiServerTimeout = "30s";
      maxConnRetry = 5;
-      readOnly = true;
+      # readOnly = true;
      noExitOnCtrlC = false;
      portForwardAddress = "localhost";
      skipLatestRevCheck = false;
@@ -4,6 +4,7 @@
    package = pkgs.lazygitLatest;

    settings = {
+      gui.skipDiscardChangeWarning = true;
      gui.theme = {
        activeBorderColor = ["#a6e3a1" "bold"];
        inactiveBorderColor = ["#a6adc8"];
@@ -1,18 +1,111 @@
-{...}: 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" ];
+          };
+        };
+
+        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; }
+        ];
+      };
    };
  };
 }
@@ -1,4 +1,21 @@
 { lib, pkgs, isNixOS ? true, ... }:
 lib.mkIf pkgs.stdenv.isLinux {
-
+  home.packages = with pkgs; [
+    imv
+    xdg-utils
+  ] ++ lib.optionals isNixOS [
+    vesktop
+    thunar
+    thunar-volman
+    thunar-shares-plugin
+    thunar-vcs-plugin
+    thunar-archive-plugin
+    thunar-media-tags-plugin
+    pavucontrol
+    zathura
+    gpu-screen-recorder
+    gpu-screen-recorder-gtk
+    inetutils
+    easyeffects
+  ];
 }
@@ -18,7 +18,6 @@
    fh
    kubectl # kube config is deliberately not included
    kubectx
-    obsidian
    vscode
    yt-dlp
    weechat
@@ -29,5 +28,10 @@
    deadnix
    alejandra
    statix
+    gh
+    ghDashLatest
+    diffNavLatest
+  ] ++ lib.optionals isNixOS [
+    obsidian
  ];
 }
@@ -31,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!" \
@@ -40,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." \
@@ -62,7 +60,13 @@
            "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!"


          set choose_meme (random)"%"(count $memes)
@@ -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;
@@ -153,7 +153,6 @@ in {

  programs.waybar = {
    enable = pkgs.stdenv.isLinux;
-    systemd.enable = true;
+    systemd.enable = false;
  };
-
 }
@@ -3,7 +3,7 @@
  lib,
  pkgs,
  aagl,
-  vintage-story,
+  nur,
  ...
 }: let
  cfg = config.gaming;
@@ -76,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 {
@@ -93,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 = [];
@@ -149,13 +152,31 @@ in {
    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;
    };
@@ -209,16 +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 [vintage-story.packages.${pkgs.system}.default]) ++
+      (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]);
@@ -226,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,19 +1,23 @@
 final: prev: let
-  # Use latest rust from overlay which should work on non-NixOS
  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_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 = [
@@ -25,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"
@@ -62,4 +76,53 @@ in {
  #     "-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,178 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.desktop;
+
+  defaultWaylandPackages = with pkgs; [
+    brightnessctl
+    cliphist
+    foot
+    grim
+    libnotify
+    mako
+    networkmanagerapplet
+    playerctl
+    polkit_gnome
+    pavucontrol
+    rofi
+    slurp
+    waybar
+    wl-clipboard
+    xdg-utils
+  ];
+
+  defaultSwayPackages =
+    defaultWaylandPackages
+    ++ (with pkgs; [
+      pulseaudio
+      swayidle
+      swaylock
+      wmenu
+    ]);
+
+  resolvedDisplayManager =
+    if cfg.displayManager != "auto"
+    then cfg.displayManager
+    else if cfg.gnome.enable
+    then "gdm"
+    else if cfg.xfce.enable
+    then "lightdm"
+    else "none";
+in {
+  imports = [./xdg.nix];
+
+  options.desktop = {
+    displayManager = lib.mkOption {
+      type = lib.types.enum ["auto" "none" "gdm" "lightdm" "ly"];
+      default = "auto";
+      description = ''
+        Display manager to enable. In auto mode, GDM is used when GNOME is
+        enabled, LightDM is used when XFCE is enabled, and no display manager
+        is enabled for compositor-only configurations.
+      '';
+    };
+
+    gnome.enable = lib.mkEnableOption "the vanilla GNOME desktop environment";
+
+    xfce.enable = lib.mkEnableOption "the vanilla XFCE desktop environment";
+
+    sway = {
+      enable = lib.mkEnableOption "the Sway Wayland compositor";
+
+      extraPackages = lib.mkOption {
+        type = with lib.types; listOf package;
+        default = defaultSwayPackages;
+        defaultText = lib.literalExpression ''
+          with pkgs; [
+            brightnessctl
+            cliphist
+            foot
+            grim
+            libnotify
+            mako
+            networkmanagerapplet
+            playerctl
+            polkit_gnome
+            pulseaudio
+            pavucontrol
+            rofi
+            slurp
+            swayidle
+            swaylock
+            waybar
+            wl-clipboard
+            wmenu
+            xdg-utils
+          ]
+        '';
+        description = "Packages installed alongside Sway.";
+      };
+    };
+
+    hyprland = {
+      enable = lib.mkEnableOption "the Hyprland Wayland compositor";
+
+      extraPackages = lib.mkOption {
+        type = with lib.types; listOf package;
+        default = defaultWaylandPackages;
+        defaultText = lib.literalExpression ''
+          with pkgs; [
+            brightnessctl
+            cliphist
+            foot
+            grim
+            libnotify
+            mako
+            networkmanagerapplet
+            playerctl
+            polkit_gnome
+            pavucontrol
+            rofi
+            slurp
+            waybar
+            wl-clipboard
+            xdg-utils
+          ]
+        '';
+        description = ''
+          Packages installed alongside Hyprland. Hyprlock and Hypridle are
+          enabled separately so their NixOS integration, including PAM, is
+          configured as well.
+        '';
+      };
+    };
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.gnome.enable {
+      services.desktopManager.gnome.enable = true;
+    })
+
+    (lib.mkIf cfg.xfce.enable {
+      services.xserver = {
+        enable = true;
+        desktopManager.xfce.enable = true;
+      };
+    })
+
+    (lib.mkIf cfg.sway.enable {
+      programs.sway = {
+        enable = true;
+        wrapperFeatures.gtk = true;
+        extraPackages = cfg.sway.extraPackages;
+        extraSessionCommands = ''
+          export XDG_SESSION_TYPE=wayland
+          export XDG_SESSION_DESKTOP=sway
+          export NIXOS_OZONE_WL=1
+        '';
+      };
+    })
+
+    (lib.mkIf cfg.hyprland.enable {
+      programs = {
+        hyprland.enable = true;
+        hyprlock.enable = lib.mkDefault true;
+      };
+
+      environment.systemPackages = cfg.hyprland.extraPackages;
+    })
+
+    (lib.mkIf (resolvedDisplayManager == "gdm") {
+      services.displayManager.gdm.enable = true;
+    })
+
+    (lib.mkIf (resolvedDisplayManager == "lightdm") {
+      services.xserver = {
+        enable = true;
+        displayManager.lightdm.enable = true;
+      };
+    })
+
+    (lib.mkIf (resolvedDisplayManager == "ly") {
+      services.displayManager.ly.enable = true;
+    })
+  ];
+}
@@ -0,0 +1,42 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.desktop;
+  needsGtkPortal = cfg.xfce.enable || cfg.hyprland.enable;
+  usesPortal = cfg.gnome.enable || cfg.xfce.enable || cfg.sway.enable || cfg.hyprland.enable;
+in {
+  config = lib.mkMerge [
+    # GNOME and Sway configure their own portals in NixOS. XFCE needs a
+    # portal; Hyprland benefits from GTK as a fallback to its native one.
+    (lib.mkIf needsGtkPortal {
+      xdg.portal = {
+        enable = true;
+        extraPortals = [pkgs.xdg-desktop-portal-gtk];
+      };
+    })
+
+    (lib.mkIf (cfg.sway.enable || needsGtkPortal) {
+      xdg.portal.config.common.default = ["gtk"];
+    })
+
+    (lib.mkIf (usesPortal && config.services.gnome.gnome-keyring.enable) {
+      xdg.portal.config.common."org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+    })
+
+    (lib.mkIf (cfg.sway.enable && config.services.gnome.gnome-keyring.enable) {
+      xdg.portal.config.sway."org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+    })
+
+    # A per-desktop config takes precedence over Hyprland's packaged config,
+    # so include its native portal whenever adding a Secret preference.
+    (lib.mkIf (cfg.hyprland.enable && config.services.gnome.gnome-keyring.enable) {
+      xdg.portal.config.hyprland = {
+        default = ["hyprland" "gtk"];
+        "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+      };
+    })
+  ];
+}
@@ -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).
@@ -22,9 +22,11 @@ in {
    })
    ../../apps/gaming.nix
    ../../apps/appimage.nix
+    ../../desktop
    ../../graphics
    ../../pwrMgmt
    ../../networking/core.nix
+    ../../security/yubico.nix
    ../../sound/pipewire.nix
    ../../sound/shairport.nix
    ../../sound/focusrite.nix
@@ -33,7 +35,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,22 +71,28 @@ in {
    grim
    slurp
    playerctl
-    light
+    # light - UNMAINTAINED, brightnessctl is the replacement
    brightnessctl
    wttrbar
    cliphist
-    xdg-desktop-portal-gtk
    xdg-utils
    flatpak-xdg-utils
    desktop-file-utils
    shared-mime-info
    wl-clipboard
    wl-clip-persist
+    ollama-rocm
+    newelle
+    vlc
  ];

  # Enable Polkit
  security.polkit.enable = true;

+  # Enable desktop support (sway)
+  desktop.sway.enable = true;
+  desktop.displayManager = "ly";
+
  # Graphics module (../../graphics/default.nix)
  graphics = {
    enable = true;
@@ -93,23 +114,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;
@@ -170,27 +193,6 @@ in {
  # AppImage support
  appimage.enable = true;

-  # XDG stuff
-  xdg = {
-    portal = {
-      enable = true;
-      config = {
-        sway = {
-          default = ["wlr" "gtk"];
-          "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
-        };
-        common = {
-          default = ["gtk"];
-          "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
-        };
-      };
-      extraPortals = with pkgs; [
-        xdg-desktop-portal-wlr
-        xdg-desktop-portal-gtk
-      ];
-    };
-  };
-
  # sched_ext userspace CPU scheduling stuff - idk
  services.scx = {
    enable = true;
@@ -209,5 +211,8 @@ in {
    ];
  };

+  # 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,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";
+}
@@ -1,10 +1,10 @@
 {
-  lib,
+  nur,
  pkgs,
-  config,
  userName,
  ...
-}: let
+}:
+let
  # INFO: set these to your liking
  matrixFqdn = "chat.wyattjmiller.com";
  rtcFqdn = "rtc.wyattjmiller.com";
@@ -12,26 +12,50 @@
  supportEmail = "wyatt@wyattjmiller.com";
  livekitKeyFile = "/var/lib/livekit/livekit.key";
  matrixRegistrationTokenFile = "/var/lib/matrix.key";
-  mastodonFqdn = "social.wyattjmiller.com";
-  mastodonSecretsDir = "/var/lib/mastodon/secrets";

-  # After deploying Mastodon, register an OAuth application at
-  # https://social.wyattjmiller.com/settings/applications and write the
-  # client ID / secret to these paths (chmod 400, owned by the tuwunel user):
-  mastodonOauthClientIdFile = "/var/lib/private/tuwunel/matrix-oauth-client-id";
-  mastodonOauthClientSecretFile = "/var/lib/private/tuwunel/matrix-oauth-client-secret";
-  mastodonOauthClientId = builtins.readFile mastodonOauthClientIdFile;
-  mastodonOauthClientSecret = builtins.readFile mastodonOauthClientSecretFile;
-in {
+  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.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];

  nix.settings = {
-    download-buffer-size = 134217728;  # 128 MiB in bytes
+    download-buffer-size = 134217728; # 128 MiB in bytes
  };

  # Custom kernel/boot stuff
@@ -91,13 +115,13 @@ in {
      8448
    ];

-    allowedUDPPortRanges =[
+    allowedUDPPortRanges = [
      # TURN UDP relays
-      { 
+      {
        from = 49000;
        to = 50000;
      }
-      # 
+      #
      {
        from = 50100;
        to = 50200;
@@ -106,14 +130,16 @@ in {
  };

  # Add username to groups "wheel" and "video" - more may be added here later
-  users.users.caddy.extraGroups = [ "mastodon" ];
-
  users.users.${userName} = {
    openssh.authorizedKeys.keys = [
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
    ];
-    extraGroups = ["wheel" "video" "network"];
+    extraGroups = [
+      "wheel"
+      "video"
+      "network"
+    ];
  };

  # fail2ban
@@ -128,28 +154,6 @@ in {
    };
  };

-  # Mastodon service — social.wyattjmiller.com
-  services.mastodon = {
-    enable = true;
-    localDomain = mastodonFqdn;
-    webPort = 3000;
-    enableUnixSocket = false;
-    configureNginx = false;
-    secretKeyBaseFile = "${mastodonSecretsDir}/secret_key_base";
-    # otpSecretFile = "${mastodonSecretsDir}/otp_secret";
-    vapidPrivateKeyFile = "${mastodonSecretsDir}/vapid_private_key";
-    vapidPublicKeyFile = "${mastodonSecretsDir}/vapid_public_key";
-    streamingProcesses = 3;
-    # Configure SMTP after initial deploy via mastodonSecretsDir or a separate
-    # NixOS secrets manager (sops-nix / agenix).
-    smtp = {
-      host = "mail.wyattjmiller.com";
-      port = 25;
-      fromAddress = "notifications@${mastodonFqdn}";
-      authenticate = false;
-    };
-  };
-
  # Matrix server
  services.matrix-tuwunel = {
    enable = true;
@@ -180,38 +184,14 @@ in {
          server = "${matrixFqdn}:443";
          support_email = supportEmail;
          support_mxid = "@wymiller:${matrixFqdn}";
-          
-          rtc_transports = [{
-            type = "livekit";
-            livekit_service_url = "https://${rtcFqdn}";
-          }];
-        };

-        # Mastodon as OIDC provider for Matrix login.
-        # Mastodon 4.3+ exposes OpenID Connect discovery at
-        # https://<domain>/.well-known/openid-configuration.
-        #
-        # REQUIRED RUNTIME SETUP (once, after first Mastodon deploy):
-        #   1. Visit https://social.wyattjmiller.com/settings/applications
-        #   2. Create a new application with the redirect URI:
-        #        https://chat.wyattjmiller.com/_matrix/client/v3/login/sso/redirect/oidc-mastodon
-        #      and scopes: profile
-        #   3. Write the Client Key      → /var/lib/private/tuwunel/matrix-oauth-client-id  (chmod 400, owned by tuwunel)
-        #      Write the Client Secret   → /var/lib/private/tuwunel/matrix-oauth-client-secret
-        #   4. nixos-rebuild switch (or restart tuwunel.service)
-        identity_provider = [
-          {
-            brand = "Mastodon";
-            issuer_url = "https://${mastodonFqdn}";
-            # id = mastodonOauthClientId;
-            callback_url = "https://${matrixFqdn}/_matrix/client/unstable/login/sso/callback/${lib.removeSuffix "\n" (mastodonOauthClientId)}";
-            discovery_url = "https://${mastodonFqdn}/.well-known/oauth-authorization-server";
-            client_id = lib.removeSuffix "\n" (mastodonOauthClientId);
-            client_secret = lib.removeSuffix "\n" (mastodonOauthClientSecret);
-            scope = ["profile"];
-            userid_claims = ["preferred_username"];
-          }
-        ];
+          rtc_transports = [
+            {
+              type = "livekit";
+              livekit_service_url = "https://${rtcFqdn}";
+            }
+          ];
+        };
      };
    };
  };
@@ -236,38 +216,41 @@ in {
    enable = true;
    package = pkgs.caddy;
    virtualHosts = {
-      "${mastodonFqdn}" = {
+      "${matrixFqdn}" = {
        extraConfig = ''
-          encode zstd gzip
+          @matrixEndpoints path \
+            /_matrix/* \
+            /_tuwunel/* \
+            /.well-known/matrix/*

-          root * ${config.services.mastodon.package}/public
-
-          handle /system/* {
-            uri strip_prefix /system
-            root * /var/lib/mastodon/public-system
-            file_server
+          handle @matrixEndpoints {
+            reverse_proxy 127.0.0.1:8008
          }

-          @streaming path /api/v1/streaming*
-          handle @streaming {
-            reverse_proxy localhost:4000
+          @sableConfig path /config.json
+          handle @sableConfig {
+            root * ${sableConfig}
+            header Cache-Control "no-store"
+            file_server
          }

          handle {
-            @notfile not file
-            handle @notfile {
-              reverse_proxy localhost:3000
+            root * ${sableWeb}
+
+            encode zstd gzip
+            try_files {path} /index.html
+
+            file_server {
+              precompressed br
            }
-            file_server
+
+            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}" = {
-        extraConfig = ''
-          encode zstd gzip
-          reverse_proxy localhost:8008
-        '';
-      };
      "${matrixFqdn}:8448" = {
        extraConfig = ''
          encode zstd gzip
@@ -308,7 +291,10 @@ in {
    matrix-registration-token-gen = {
      before = [ "tuwunel.service" ];
      wantedBy = [ "multi-user.target" ];
-      path = with pkgs; [ coreutils openssl ];
+      path = with pkgs; [
+        coreutils
+        openssl
+      ];
      script = ''
        set -eu

@@ -330,9 +316,15 @@ in {
    };

    livekit-key-gen = {
-      before = [ "lk-jwt-service.service" "livekit.service" ];
+      before = [
+        "lk-jwt-service.service"
+        "livekit.service"
+      ];
      wantedBy = [ "multi-user.target" ];
-      path = with pkgs; [ coreutils openssl ];
+      path = with pkgs; [
+        coreutils
+        openssl
+      ];
      script = ''
        set -eu

@@ -353,49 +345,6 @@ in {
        User = "root";
      };
    };
-
-    mastodon-secrets-gen = {
-      before = [ "mastodon-web.service" "mastodon-sidekiq-0.service" "mastodon-streaming.service" ];
-      wantedBy = [ "multi-user.target" ];
-      path = with pkgs; [ coreutils openssl ruby_3_4 ];
-      script = ''
-        set -eu
-
-        dir="${mastodonSecretsDir}"
-        install -d -m 0750 -o mastodon -g mastodon "$dir"
-
-        gen_hex() {
-          local f="$1"
-          if [ ! -f "$f" ]; then
-            umask 077
-            openssl rand -hex 64 | install -o mastodon -g mastodon -m 0400 /dev/stdin "$f"
-          fi
-        }
-
-        gen_hex "$dir/secret_key_base"
-        gen_hex "$dir/otp_secret"
-
-        if [ ! -f "$dir/vapid_private_key" ]; then
-          umask 077
-          ruby -ropenssl -rbase64 -e '
-            key = OpenSSL::PKey::EC.generate("prime256v1")
-            priv = Base64.urlsafe_encode64(key.private_key.to_s(2).rjust(32, "\x00"), padding: false)
-            pub  = Base64.urlsafe_encode64(key.public_key.to_bn.to_s(2), padding: false)
-            File.write(ARGV[0], priv)
-            File.write(ARGV[1], pub)
-          ' \
-            "$dir/vapid_private_key" \
-            "$dir/vapid_public_key"
-          chown mastodon:mastodon "$dir/vapid_private_key" "$dir/vapid_public_key"
-          chmod 0400 "$dir/vapid_private_key" "$dir/vapid_public_key"
-        fi
-      '';
-      serviceConfig = {
-        Type = "oneshot";
-        User = "root";
-        RemainAfterExit = true;
-      };
-    };
  };

  system.stateVersion = "25.11";
@@ -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	b427889b06	add: desktop xdg integration	2026-09-23 18:43:38 -04:00
wymiller	9b60cdac2c	Merge remote-tracking branch 'origin' into desktops	2026-09-22 15:27:38 -04: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	a387a4cd07	wip: added assortment of desktops ai generated, needs some work/cleanup	2026-08-29 10:38:22 -04: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	a3ef9fa59e	changes to hardware config	2026-02-19 02:44:23 +00: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	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