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
30 changed files with 1323 additions and 335 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
@@ -1,5 +1,7 @@
-local function toggle_floating_tui(cmd)
+local function toggle_tui(cmd, direction, size)
  local terminal
+  local dir = direction or "float"
+  local term_size = size

  return function()
    if not terminal then
@@ -8,17 +10,19 @@ local function toggle_floating_tui(cmd)
        cmd = cmd,
        hidden = true,
        close_on_exit = true,
-        direction = "float",
+        direction = dir,
        on_open = function() vim.cmd "startinsert!" end,
      }
    end

-    terminal:toggle()
+    terminal:toggle(term_size, dir)
  end
 end

-local toggle_k9s = toggle_floating_tui "k9s"
-local toggle_ghdash = toggle_floating_tui "gh-dash"
+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 {
  {
@@ -36,6 +40,15 @@ return {
            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": 1774186997,
-        "narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=",
+        "lastModified": 1789138122,
+        "narHash": "sha256-mh+ZiGCtHAo0xIi1yaNjHsftfnlWz9JiYwHCyT16yIE=",
        "owner": "ezKEa",
        "repo": "aagl-gtk-on-nix",
-        "rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd",
+        "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": 1772129556,
-        "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=",
+        "lastModified": 1783744694,
+        "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "ebec37af18215214173c98cf6356d0aca24a2585",
+        "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"
      }
@@ -62,27 +106,59 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "edolstra",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
        "type": "github"
      },
      "original": {
-        "owner": "edolstra",
+        "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",
@@ -91,12 +167,12 @@
    },
    "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",
@@ -108,11 +184,29 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "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": {
@@ -124,18 +218,17 @@
    "git-hooks": {
      "inputs": {
        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
        "nixpkgs": [
          "go-overlay",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1765016596,
-        "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=",
+        "lastModified": 1788267358,
+        "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c",
+        "rev": "27555e2624241fb116b49095df4caaee85a25691",
        "type": "github"
      },
      "original": {
@@ -144,25 +237,26 @@
        "type": "github"
      }
    },
-    "gitignore": {
+    "git-hooks_2": {
      "inputs": {
+        "flake-compat": "flake-compat_3",
        "nixpkgs": [
+          "nur",
          "go-overlay",
-          "git-hooks",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "lastModified": 1788267358,
+        "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "27555e2624241fb116b49095df4caaee85a25691",
        "type": "github"
      },
      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
        "type": "github"
      }
    },
@@ -170,14 +264,14 @@
      "inputs": {
        "flake-utils": "flake-utils",
        "git-hooks": "git-hooks",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1775676807,
-        "narHash": "sha256-l7B5l6cGBZoW4bs+4Zq/FMgxaZWWJqdUDkCVuH98hMY=",
+        "lastModified": 1789623807,
+        "narHash": "sha256-pqmP+T+fR2+MDen+ro2iF7mdH7S83AUuvNZwVDl3jUk=",
        "owner": "purpleclay",
        "repo": "go-overlay",
-        "rev": "c5bd812957211f42c207da6b1415f49de30e183f",
+        "rev": "b19679b19d64dc29b96caf07e3282c250611ac57",
        "type": "github"
      },
      "original": {
@@ -186,6 +280,52 @@
        "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": [
@@ -193,20 +333,56 @@
        ]
      },
      "locked": {
-        "lastModified": 1774274588,
-        "narHash": "sha256-dnHvv5EMUgTzGZmA+3diYjQU2O6BEpGLEOgJ1Qe9LaY=",
+        "lastModified": 1789267039,
+        "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "cf9686ba26f5ef788226843bc31fda4cf72e373b",
+        "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,
@@ -225,27 +401,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1744536153,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1765779637,
-        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
+        "lastModified": 1789286504,
+        "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
+        "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec",
        "type": "github"
      },
      "original": {
@@ -255,23 +415,52 @@
        "type": "github"
      }
    },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1774244481,
-        "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
+        "lastModified": 1789749394,
+        "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "4590696c8693fea477850fe379a01544293ca4e2",
+        "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=",
@@ -287,32 +476,48 @@
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "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_6": {
+    "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": {
@@ -322,22 +527,25 @@
        "go-overlay": "go-overlay",
        "home-manager": "home-manager",
        "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3",
-        "rust-overlay": "rust-overlay_2",
-        "swaytreesave": "swaytreesave",
-        "vintage-story": "vintage-story"
+        "nixpkgs": "nixpkgs_2",
+        "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": {
@@ -348,14 +556,18 @@
    },
    "rust-overlay_2": {
      "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": [
+          "nur",
+          "caitsith",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1774321696,
-        "narHash": "sha256-g18xMjMNla/nsF5XyQCNyWmtb2UlZpkY0XE8KinIXAA=",
+        "lastModified": 1789196581,
+        "narHash": "sha256-yJr1Bt4fKkKIpPYbsKGqJ0VFdoDnURgRwuffmBQ2WzY=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "49a67e6894d4cb782842ee6faa466aa90c92812d",
+        "rev": "228ecefb6329d5a531b77b46b581a2f0c26ee056",
        "type": "github"
      },
      "original": {
@@ -364,23 +576,65 @@
        "type": "github"
      }
    },
-    "swaytreesave": {
+    "rust-overlay_3": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "hildibrand",
+          "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_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",
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1767148467,
-        "narHash": "sha256-W0O7SWq8ucokt4ctEAEvRvNoSM/oF7fBfb2kTN+lwTs=",
-        "ref": "refs/heads/master",
-        "rev": "0f4bb9bb450b28aa4f29d5eb2062deac6c26687a",
-        "revCount": 4,
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
+        "lastModified": 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"
      }
    },
    "systems": {
@@ -398,23 +652,19 @@
        "type": "github"
      }
    },
-    "vintage-story": {
-      "inputs": {
-        "flake-schemas": "flake-schemas_2",
-        "nixpkgs": "nixpkgs_6"
-      },
+    "systems_2": {
      "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": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
      },
      "original": {
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
      }
    }
  },
@@ -1,14 +1,14 @@
 {
  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";
@@ -17,10 +17,8 @@
      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 @ {
@@ -32,14 +30,14 @@
    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 = { ... }: {
@@ -52,6 +50,10 @@
    };
  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;
@@ -86,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";
      };
@@ -126,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
@@ -169,7 +171,7 @@
    nixosConfigurations."thancred" = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
      specialArgs = {
-        inherit userName userEmail vintage-story;
+        inherit userName userEmail nur;
        hostname = "thancred";
        role = "server";
      };
@@ -191,11 +193,37 @@
      ];
    };

+    # 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";
      };
@@ -217,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";
@@ -225,7 +279,7 @@
      pkgs = nixpkgs.legacyPackages.${system};
      
      extraSpecialArgs = {
-        inherit userName userEmail hostname;
+        inherit userName userEmail hostname nvf;
        isNixOS = false;
        role = "workstation";
      };
@@ -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 = [
@@ -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; }
+        ];
+      };
    };
  };
 }
@@ -5,7 +5,12 @@ lib.mkIf pkgs.stdenv.isLinux {
    xdg-utils
  ] ++ lib.optionals isNixOS [
    vesktop
-    xfce.thunar
+    thunar
+    thunar-volman
+    thunar-shares-plugin
+    thunar-vcs-plugin
+    thunar-archive-plugin
+    thunar-media-tags-plugin
    pavucontrol
    zathura
    gpu-screen-recorder
@@ -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." \
@@ -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=" ];
@@ -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";
      };
    })

@@ -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";
@@ -1,7 +1,7 @@
 {
  pkgs,
  userName,
-  vintage-story,
+  nur,
  ...
 }: {
  imports = [
@@ -60,7 +60,7 @@
  };

  environment.systemPackages = [
-    vintage-story.packages.${pkgs.system}.default
+    nur.packages.${pkgs.system}.vintage-story
  ];

  systemd.services.vintagestory-server = {
@@ -71,7 +71,7 @@
      Type = "simple";
      User = userName;
      WorkingDirectory = "/home/${userName}";
-      ExecStart = "${vintage-story.packages.${pkgs.system}.default}/bin/vintagestory-server";
+      ExecStart = "${nur.packages.${pkgs.system}.vintage-story}/bin/vintagestory-server";
      Restart = "on-failure";
      RestartSec = "5s";
    };
@@ -1,8 +1,10 @@
 {
+  nur,
  pkgs,
  userName,
  ...
-}: let
+}:
+let
  # INFO: set these to your liking
  matrixFqdn = "chat.wyattjmiller.com";
  rtcFqdn = "rtc.wyattjmiller.com";
@@ -10,16 +12,50 @@
  supportEmail = "wyatt@wyattjmiller.com";
  livekitKeyFile = "/var/lib/livekit/livekit.key";
  matrixRegistrationTokenFile = "/var/lib/matrix.key";
-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
@@ -79,13 +115,13 @@ in {
      8448
    ];

-    allowedUDPPortRanges =[
+    allowedUDPPortRanges = [
      # TURN UDP relays
-      { 
+      {
        from = 49000;
        to = 50000;
      }
-      # 
+      #
      {
        from = 50100;
        to = 50200;
@@ -99,7 +135,11 @@ in {
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
    ];
-    extraGroups = ["wheel" "video" "network"];
+    extraGroups = [
+      "wheel"
+      "video"
+      "network"
+    ];
  };

  # fail2ban
@@ -144,11 +184,13 @@ in {
          server = "${matrixFqdn}:443";
          support_email = supportEmail;
          support_mxid = "@wymiller:${matrixFqdn}";
-          
-          rtc_transports = [{
-            type = "livekit";
-            livekit_service_url = "https://${rtcFqdn}";
-          }];
+
+          rtc_transports = [
+            {
+              type = "livekit";
+              livekit_service_url = "https://${rtcFqdn}";
+            }
+          ];
        };
      };
    };
@@ -176,8 +218,37 @@ in {
    virtualHosts = {
      "${matrixFqdn}" = {
        extraConfig = ''
-          encode zstd gzip
-          reverse_proxy localhost:8008
+          @matrixEndpoints path \
+            /_matrix/* \
+            /_tuwunel/* \
+            /.well-known/matrix/*
+
+          handle @matrixEndpoints {
+            reverse_proxy 127.0.0.1:8008
+          }
+
+          @sableConfig path /config.json
+          handle @sableConfig {
+            root * ${sableConfig}
+            header Cache-Control "no-store"
+            file_server
+          }
+
+          handle {
+            root * ${sableWeb}
+
+            encode zstd gzip
+            try_files {path} /index.html
+
+            file_server {
+              precompressed br
+            }
+
+            header /assets/* Cache-Control "public, max-age=31536000, immutable"
+            header /sw.js Cache-Control "no-cache"
+            header /index.html Cache-Control "no-cache"
+            header Document-Policy "js-profiling"
+          }
        '';
      };
      "${matrixFqdn}:8448" = {
@@ -220,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

@@ -242,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

@@ -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