nixos: gen 23 @ lilac — 2026-09-02 23:05 26.05.20260814.02e0898 (Yarara) ----- s

.sops.yaml

@@ -1,9 +1,11 @@
 keys:
   - &lavender age1az6l56h4m38jw2hm7t7a99wp9f88s845sg29grtmdpz72lrkc5cq66kmcv
   - &violet age1cd40qmufxzvw8dkml9340czqfq6ta3kxpjfj47jpavwn2t7ghywsxhqz79
+  - &lilac age1dsf6z3hcr8qrtptdk6xyky9c99tdpjyrnuaawv4atme9rffhps9qpwdn6j
 creation_rules:
   - path_regex: secrets/[^/]+\.yaml$
     key_groups:
       - age:
           - *lavender
           - *violet
+          - *lilac

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784433272,
-        "narHash": "sha256-5Gz3pC/rcn8LLwzLZZhrpPMqY+PDdUzoFtXV3uWoitg=",
+        "lastModified": 1786198506,
+        "narHash": "sha256-u4tdLMzKCV2R0wn4eFtk4LKH0RmzzCkxeYqCYs/P3eg=",
         "owner": "AvengeMedia",
         "repo": "danksearch",
-        "rev": "4b4905e2ef3454230fb648d2139f3139b742b0eb",
+        "rev": "632c2909bb1bb534b574c22c1347de0e6521e58a",
         "type": "github"
       },
       "original": {
@@ -49,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784857968,
-        "narHash": "sha256-83haLQzxrk6sCX76iQlloHWQ+TD0RKsK+LdVTMikNwk=",
+        "lastModified": 1786847024,
+        "narHash": "sha256-d1vE3V5zzLQPCAGy6HQd6EFh4eG30KdTMUON4ZizTPY=",
         "owner": "AvengeMedia",
         "repo": "dms-plugin-registry",
-        "rev": "78d478f34ad6790faea447c37d16bab63e1d3570",
+        "rev": "2cde930aa2d735c3d1dac10096bb7d317a15aaa6",
         "type": "github"
       },
       "original": {
@@ -85,11 +85,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784350909,
-        "narHash": "sha256-ZWyzLbS1yKUTeFJLmdVuWNnHttL333/ldJbEE+KzCrM=",
+        "lastModified": 1785119570,
+        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4ce190229c73d44536caa7072f6308fb2d8feeb3",
+        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1784874881,
-        "narHash": "sha256-u4jhSIf/Un0qZB+Cn3hTTaHSI20XeAxYbA5o4faqdJs=",
+        "lastModified": 1785857305,
+        "narHash": "sha256-25q05zpF1sqOCxPPUG9DPPGd+EDW7SiAOWCzBWRS7r0=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "ef7a2a3d719af46b906c22a3ebfb7d65627b2cd2",
+        "rev": "9ee3e13b60643448228353097880521658b2fe0e",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1784570726,
-        "narHash": "sha256-9EMn69JBcFWFgUM7f0VBAX+jBby5b9H3M59U75+5yI4=",
+        "lastModified": 1785701241,
+        "narHash": "sha256-ircVOzPWRircI39ac/tqJajr5OoJxEVrDlBb05TULEk=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "7f26c3ee804fb6ed458ef7fb0e3c794f14e0b3bc",
+        "rev": "feb3e43f1475e0865bb89cbd1e898b34d1d2ccf6",
         "type": "github"
       },
       "original": {
@@ -155,13 +155,34 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1786867632,
+        "narHash": "sha256-ez+ubZlA1RtdjCB18a6zJ9M4u8qoPDy08EcnsW5M3Xw=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "ff17823245ab9ff7bcae6acf950bd89cba82c38c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1784796856,
-        "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=",
+        "lastModified": 1785828668,
+        "narHash": "sha256-8fsyqeO+mJqvIzeO4xIpgJe/f7MTbbVTEC6RT6WSXNs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
+        "rev": "e72e4f299401a3689d4b3d5fc6496b11db7064eb",
         "type": "github"
       },
       "original": {
@@ -189,11 +210,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1784796856,
-        "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=",
+        "lastModified": 1786862985,
+        "narHash": "sha256-FBJRXmbGXiSUDvYEbfLYRkckayyZ6SK1UEqhCrIZ2Cs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
+        "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44",
         "type": "github"
       },
       "original": {
@@ -205,11 +226,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1784856561,
-        "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=",
+        "lastModified": 1786711500,
+        "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "597283ad8aa0b331c788e97c4c262d58877074ef",
+        "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d",
         "type": "github"
       },
       "original": {
@@ -226,6 +247,7 @@
         "dms-plugin-registry": "dms-plugin-registry",
         "home-manager": "home-manager",
         "niri": "niri",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix",
@@ -239,11 +261,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783174389,
-        "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
+        "lastModified": 1786629091,
+        "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
+        "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -36,9 +36,14 @@
       url = "github:AvengeMedia/danksearch";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nixos-hardware = {
+      url = "github:NixOS/nixos-hardware/master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
   
-  outputs = { nixpkgs, home-manager, sops-nix, niri, dms, dms-plugin-registry, danksearch, wvkbd-src, ... }@inputs: {
+  outputs = { nixpkgs, home-manager, sops-nix, niri, dms, dms-plugin-registry, danksearch, wvkbd-src, nixos-hardware, ... }@inputs: {
     nixosConfigurations = {
       violet = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -67,6 +72,33 @@
         ];
       };
 
+      lilac = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+
+        modules = [
+          ./hosts/lilac/default.nix
+
+          niri.nixosModules.niri
+          dms-plugin-registry.nixosModules.default
+          sops-nix.nixosModules.sops
+	  nixos-hardware.nixosModules.framework-intel-core-ultra-series3
+
+          home-manager.nixosModules.home-manager {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.extraSpecialArgs = { inherit inputs; };
+
+            home-manager.users.jashton = {
+              imports = [
+                ./home/jashton.nix
+                danksearch.homeModules.default
+              ];
+            };
+          }
+        ];
+      };
+
       lavender = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };

home/desktop/niri.nix

@@ -36,7 +36,6 @@ let
 in
 
 {
-
   xdg.portal = {
     enable = true;
     # Use gtk or kde based on your preferred file picker dialog
@@ -48,95 +47,93 @@ in
     extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
 
-  programs.niri = {
-    settings = {
-      # Autostart DMS if you prefer launching it directly from Niri instead of systemd
-      spawn-at-startup = [
-        { command = [ "dms" "run" ]; }
-        { command = [ "${launch-wvkbd}/bin/launch-wvkbd" ]; }
-        { command = [ "${launch-lisgd}/bin/launch-lisgd" ]; } # Spawns the daemon
-      ];
-
-      hotkey-overlay = {
-        skip-at-startup = true;
-      };
-
-      input = {
-        keyboard.xkb.layout = "us";
-        touchpad = {
-          tap = true;
-          natural-scroll = true;
-        };
-      };
-
-      layout = {
-        gaps = 8;
-        center-focused-column = "never";
-        default-column-width.proportion = 1.0;
-        border.enable = false;
-        #tab-indicator.corner-radius = 18.0;
-        focus-ring = {
-
-          enable = false;
-          width = 2;
-        };
-      };
-
-      prefer-no-csd = true;
-      window-rules = [
-        { # All windows
-          geometry-corner-radius = {
-            bottom-left = 25.0;
-            bottom-right = 25.0;
-            top-right = 25.0;
-            top-left = 25.0;
-          };
-
-          draw-border-with-background = true;
-          clip-to-geometry = true;
+  #programs.niri.enable = true;
+  xdg.configFile."niri/config.kdl".text = lib.mkForce ''
+    input {
+        keyboard {
+            xkb {
+                layout "us"
+                model ""
+                rules ""
+                variant ""
+            }
+            repeat-delay 600
+            repeat-rate 25
+            track-layout "global"
         }
-      ];
+        touchpad {
+            tap
+            natural-scroll
+        }
+    }
+    screenshot-path "~/media/pics/screenshots/%Y-%m-%d %H-%M-%S.png"
+    prefer-no-csd
+    layout {
+        gaps 8
+        struts {
+            left 0
+            right 0
+            top 0
+            bottom 0
+        }
+        focus-ring { off; }
+        border { off; }
+        default-column-width { proportion 1.000000; }
+        center-focused-column "never"
+    }
+    cursor {
+        xcursor-theme "default"
+        xcursor-size 24
+    }
+    hotkey-overlay { skip-at-startup; }
+    binds {
+        Ctrl+Print { screenshot-screen; }
+        Mod+F { fullscreen-window; }
+        Mod+H { focus-column-left; }
+        Mod+J { focus-window-down; }
+        Mod+K { focus-window-up; }
+        Mod+L { focus-column-right; }
+        Mod+N { focus-workspace-down; }
+        Mod+P { spawn "pkill" "-RTMIN" "wvkbd-mobintl"; }
+        Mod+Return { spawn "alacritty"; }
+        Mod+Shift+E { quit; }
+        Mod+Shift+H { move-column-left; }
+        Mod+Shift+J { move-column-to-workspace-down; }
+        Mod+Shift+K { move-column-to-workspace-up; }
+        Mod+Shift+L { move-column-right; }
+        Mod+Shift+P { toggle-overview; }
+        Mod+Space { spawn "dms" "ipc" "spotlight" "toggle"; }
+        Mod+U { focus-workspace-up; }
+        Mod+X { close-window; }
+        Print { screenshot; }
+        XF86AudioLowerVolume { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05-"; }
+        XF86AudioMute { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
+        XF86AudioRaiseVolume { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05+"; }
+        XF86MonBrightnessDown { spawn "dms" "ipc" "call" "brightness" "decrement" "5" ""; }
+        XF86MonBrightnessUp { spawn "dms" "ipc" "call" "brightness" "increment" "5" ""; }
+    }
+    spawn-at-startup "dms" "run"
+    spawn-at-startup "/nix/store/b1kxyzg5r6644mcmjh8jwsb8rinqzsw8-launch-wvkbd/bin/launch-wvkbd"
+    spawn-at-startup "/nix/store/l9k161qcs6ypzzbicjhkn8b203r610j6-launch-lisgd/bin/launch-lisgd"
+    window-rule {
+        draw-border-with-background true
+        geometry-corner-radius 25.000000 25.000000 25.000000 25.000000
+        clip-to-geometry true
+    }
 
-      # Vim Keybindings & Built-in Features
-      binds = with config.lib.niri.actions; {
-        # Launchers & Session Control
-        "Mod+Return".action.spawn = [ "alacritty" ];
-        "Mod+P".action.spawn = [ "pkill" "-RTMIN" "wvkbd-mobintl" ];
-        "Mod+Space".action.spawn = [ "dms" "ipc" "spotlight" "toggle" ];
-        "Mod+X".action.close-window = [];
-        "Mod+F".action.fullscreen-window = [];
-        "Mod+Shift+E".action.quit = [];
-        "Mod+Shift+P".action.toggle-overview = [];
+    overview {
+      backdrop-color "#987CA7"
+    }
 
-        # Vim Focus Movement
-        "Mod+H".action.focus-column-left = [];
-        "Mod+J".action.focus-window-down = [];
-        "Mod+K".action.focus-window-up = [];
-        "Mod+L".action.focus-column-right = [];
+    gestures {
+      hot-corners {
+        off
+      }
+    }
 
-        # Workspace Navigation
-        "Mod+N".action.focus-workspace-down = [];
-        "Mod+U".action.focus-workspace-up = [];
+    include "/home/jashton/.config/niri/dms/outputs.kdl"
+    include "/home/jashton/.config/niri/dms/binds.kdl"
 
-        # Vim Window Reordering
-        "Mod+Shift+H".action.move-column-left = [];
-        "Mod+Shift+L".action.move-column-right = [];
-        "Mod+Shift+J".action.move-column-to-workspace-down = [];
-        "Mod+Shift+K".action.move-column-to-workspace-up = [];
-
-        # Volume & Brightness Media Controls
-        "XF86AudioRaiseVolume".action.spawn = [ "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05+" ];
-        "XF86AudioLowerVolume".action.spawn = [ "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05-" ];
-        "XF86AudioMute".action.spawn = [ "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle" ];
-        "XF86MonBrightnessUp".action.spawn = [ "dms" "ipc" "call" "brightness" "increment" "5" "" ];
-        "XF86MonBrightnessDown".action.spawn = [ "dms" "ipc" "call" "brightness" "decrement" "5" "" ];
-        
-        # Screenshots
-        "Print".action.screenshot = [];
-        "Ctrl+Print".action.screenshot-screen = [];
-      };
-    };
-  };
+    spawn-at-startup "steam"
+  '';
 }
-
-

home/jashton.nix

@@ -43,14 +43,17 @@ in
     antigravity
     asciinema
     discord
+    eclipses.eclipse-java
     ffmpeg
     gemini-cli
     libreoffice
-    mc
     opencode
     pdftk
+    prismlauncher
     scrot
+    signal-desktop
     spotify
+    thunderbird
     vlc
     wtype
     xwayland-satellite
@@ -108,6 +111,23 @@ in
     '';
   };
 
+  systemd.user.services.lan-mouse = {
+    Unit = {
+      Description = "Lan Mouse Daemon";
+      After = [ "graphical-session.target" ];
+      PartOf = [ "graphical-session.target" ];
+    };
+    Install = {
+      WantedBy = [ "graphical-session.target" ];
+    };
+    Service = {
+      # The --daemon flag ensures it runs silently in the background without opening the GUI
+      ExecStart = "${pkgs.lan-mouse}/bin/lan-mouse --daemon";
+      Restart = "on-failure";
+      RestartSec = "5";
+    };
+  };
+
   programs.ssh = {
     enable = true;
     matchBlocks = {
@@ -120,6 +140,9 @@ in
       "violet" = {
         hostname = "100.101.100.84";
       };
+      "lilac" = {
+        hostname = "100.82.51.88";
+      };
     };
   };
 

home/programs/alacritty.nix

@@ -20,8 +20,10 @@
       };
 
       colors = {
+        draw_bold_text_with_bright_colors = true; 
+
         primary = {
-          background = "#08090b"; # Black
+          background = "#1e1f21"; # Carbon Black
           foreground = "#8d739c"; # Vintage Lavender 1
         };
         

home/programs/nvim.nix

@@ -85,6 +85,96 @@
           delete = { text = "_" },
         },
       })
+
+      -- Java indentation must match Eclipse's formatter, not your 2-space default.
+      vim.api.nvim_create_autocmd("FileType", {
+        pattern = "java",
+        callback = function()
+          vim.bo.expandtab = false
+          vim.bo.tabstop = 4
+          vim.bo.shiftwidth = 4
+          vim.bo.softtabstop = 4
+        end,
+      })
+
+      local cmp = require("cmp")
+      local luasnip = require("luasnip")
+      cmp.setup({
+        snippet = { expand = function(a) luasnip.lsp_expand(a.body) end },
+        mapping = cmp.mapping.preset.insert({
+          ["<C-Space>"] = cmp.mapping.complete(),
+          ["<CR>"] = cmp.mapping.confirm({ select = false }),
+          ["<C-n>"] = cmp.mapping.select_next_item(),
+          ["<C-p>"] = cmp.mapping.select_prev_item(),
+        }),
+        sources = {
+          { name = "nvim_lsp" },
+          { name = "luasnip" },
+          { name = "buffer" },
+          { name = "path" },
+        },
+      })
+
+      local capabilities = require("cmp_nvim_lsp").default_capabilities()
+
+      -- .project and .classpath come first so a repo containing several
+      -- assignments resolves to the assignment, not the repo root.
+      local root_markers = { ".project", ".classpath", "pom.xml", "build.gradle", ".git" }
+
+      local function start_jdtls()
+        local jdtls = require("jdtls")
+        local root_dir = require("jdtls.setup").find_root(root_markers)
+        if not root_dir or root_dir == "" then return end
+
+        local project_name = vim.fn.fnamemodify(root_dir, ":p:h:t")
+        local workspace = vim.fn.stdpath("cache") .. "/jdtls-workspaces/" .. project_name
+
+        local java_settings = {
+          configuration = {
+            updateBuildConfiguration = "interactive",
+            runtimes = {
+              { name = "JavaSE-21", path = os.getenv("JAVA_HOME"), default = true },
+            },
+          },
+          -- Keep a stray pom.xml from overriding the Eclipse project model.
+          -- Flip these on if a course actually requires Maven or Gradle.
+          import = {
+            maven = { enabled = false },
+            gradle = { enabled = false },
+          },
+          signatureHelp = { enabled = true },
+          eclipse = { downloadSources = true },
+        }
+
+        -- If the repo carries an exported Eclipse formatter profile, use it verbatim.
+        local formatter = root_dir .. "/.settings/eclipse-formatter.xml"
+        if vim.uv.fs_stat(formatter) then
+          java_settings.format = { settings = { url = formatter } }
+        end
+
+        jdtls.start_or_attach({
+          cmd = { "jdtls", "-data", workspace },
+          root_dir = root_dir,
+          capabilities = capabilities,
+          settings = { java = java_settings },
+          init_options = { bundles = {} },
+          on_attach = function(_, bufnr)
+            local map = function(k, f) vim.keymap.set("n", k, f, { buffer = bufnr, silent = true }) end
+            map("gd", vim.lsp.buf.definition)
+            map("gr", vim.lsp.buf.references)
+            map("K", vim.lsp.buf.hover)
+            map("<leader>rn", vim.lsp.buf.rename)
+            map("<leader>ca", vim.lsp.buf.code_action)
+            map("<leader>f", function() vim.lsp.buf.format({ async = true }) end)
+            map("<leader>oi", require("jdtls").organize_imports)
+          end,
+        })
+      end
+
+      vim.api.nvim_create_autocmd("FileType", {
+        pattern = "java",
+        callback = start_jdtls,
+      })
     '';
 
     plugins = with pkgs.vimPlugins; [
@@ -95,6 +185,15 @@
       { plugin = lualine-nvim; }
       { plugin = neocord; }
       { plugin = gitsigns-nvim; }
+
+      { plugin = nvim-jdtls; }
+      { plugin = nvim-cmp; }
+      { plugin = cmp-nvim-lsp; }
+      { plugin = cmp-buffer; }
+      { plugin = cmp-path; }
+      { plugin = luasnip; }
+      { plugin = cmp_luasnip; }
+      { plugin = (nvim-treesitter.withPlugins (p: [ p.java p.xml p.nix p.lua ])); }
     ];
   };
 }

hosts/lavender/default.nix

@@ -9,4 +9,9 @@
   networking.hostName = "lavender";
 
   system.stateVersion = "26.05";
+
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
 }

hosts/lilac/default.nix

@@ -0,0 +1,45 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware.nix
+    ../../system
+  ];
+
+  networking.hostName = "lilac";
+
+  services.fwupd.enable = true;
+  services.fprintd.enable = true;
+  services.hardware.bolt.enable = true;
+
+  system.stateVersion = "26.05";
+
+  environment.systemPackages = with pkgs; [
+    framework-tool
+  ];
+
+  boot.kernelModules = [ "thunderbolt-net" ];
+
+  networking.interfaces.thunderbolt0.ipv4.addresses = [{
+    address = "10.0.0.1";
+    prefixLength = 24;
+  }];
+
+  networking.firewall.interfaces."thunderbolt0".allowedUDPPorts = [ 4242 ];
+
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+    extraPackages = with pkgs; [
+      intel-media-driver   # Hardware acceleration
+      intel-vaapi-driver
+      vpl-gpu-rt           # Video processing runtime
+    ];
+    extraPackages32 = with pkgs.pkgsi686Linux; [
+      intel-media-driver
+    ];
+  };
+
+  services.power-profiles-daemon.enable = true; 
+  services.thermald.enable = true;
+}

hosts/lilac/hardware.nix

@@ -0,0 +1,41 @@
+# 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 + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/829d5d81-c2d1-466f-a490-a97ec2a29bc8";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/530C-3D2D";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/3e31b909-ac9d-4329-9ed5-595ea5a9b099"; }
+    ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  hardware = {
+    cpu.intel = {
+      npu.enable = true;
+      updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    };
+
+    bluetooth.enable = true;
+  };
+}

hosts/violet/default.nix

@@ -10,6 +10,37 @@
   networking.hostName = "violet";
 
   services.power-profiles-daemon.enable = false;
+  services.hardware.bolt.enable = true;
 
   system.stateVersion = "26.05";
+
+  boot.kernelModules = [ "thunderbolt-net" ];
+
+  networking.interfaces.thunderbolt0.ipv4.addresses = [{
+    address = "10.0.0.2";
+    prefixLength = 24;
+  }];
+
+  networking.firewall.interfaces."thunderbolt0".allowedUDPPorts = [ 4242 ];
+
+  services.tlp = {
+    enable = false;
+    settings = {
+      USB_AUTOSUSPEND = 0;
+
+      # AC
+      CPU_SCALING_GOVERNOR_ON_AC = "performance";
+      CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+      SOUND_POWER_SAVE_ON_AC = 0;
+      PCIE_ASPM_ON_AC = "default";
+      CPU_BOOST_ON_BAT = 0;
+
+      # Battery
+      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+      SOUND_POWER_SAVE_ON_BAT = 1;
+      PCIE_ASPM_ON_BAT = "powersupersave";
+      CPU_BOOST_ON_AC = 1;
+    };
+  };
 }

hosts/violet/hardware.nix

@@ -39,7 +39,7 @@
   '';
 
   services.howdy = {
-    enable = true;
+    enable = false;
     control = "sufficient";
     settings = {
       video = {

secrets/secrets.yaml

@@ -4,22 +4,31 @@ sops:
     age:
         - enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyNjkvMzI5MUtPZEVua0U1
-            TkxIREI3MnNNbytGTStXWWxwdm9XbEYwTmlZCnhMcGZGNnU2RTVtRzVUWWxzRzFw
-            NTRVT1ZSUFZOY29JNWZacjdoMjE1S3MKLS0tIFVoZk5Ea3pMUUYvYVgvUzdTN2Yx
-            V3VITk1wc05DK0tvRnBNZ1ptSldWUGsKT3fSHkqsjkvtRgbPpvIz0ufGPf4pZh6G
-            iibDAgCCrsHk0GViDIBlnwOHgwCM4io3j565M+jS6cjV2YKsOHz2Ng==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5THRkQUg1S1pRTEpHdjRT
+            MThsR2tuSytIdzdvWndqMnM3MUNxRk5PMHdBCkRRalFpRC8zQ012RkNKYlloUGpH
+            cWJ1bmZEL3VxRndrei9BbGlNYnR3amsKLS0tIFEvR295a2VsRXJsZ1IzSUZCWlhI
+            akcybUs1cmlyL2I0U2tXQmdYb3V5NVUKQ0bkyCvBwpa7BUolE/QXDib5tZ0QvIie
+            cZZ4NDdhq7EtS++sQl6AN9ZUp209F49XMoV/3u17njg1Mdqt2kM5vw==
             -----END AGE ENCRYPTED FILE-----
           recipient: age1az6l56h4m38jw2hm7t7a99wp9f88s845sg29grtmdpz72lrkc5cq66kmcv
         - enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQelp5Y2E2WFM1TFhIb1gz
-            eS9lWTAydUYrQlYxZkY5akt3MkI5TGlXSVhRCktTV0tFcmFwaS9VVTdwZTRlWkFF
-            alNQYW83TTcycytWVHVZUVhmOU5ETU0KLS0tIGJmSWZRaW5tM3R6a3ZlaitSb3d3
-            a0JFN3NORTBFYVpsMjJkUHdtbFh4c1EK7lRQR/qO3rpctSDC6Mvy6eAA6zj70MDD
-            cmUiMcIDn2FyX5d9r2jk5EZtx2rZPB4ti4pp4Lox3zuEMMCksaFXmw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmY2hSRWRjRXBNMXduUTZw
+            NHlyUGxoRnZyVFYzMENDVTljeGpoVlBReFZ3Ci9aREtkYjJuUklaYXljSkNod0RG
+            NHhReE5Sck9DRmR2ZlJYdGZEM3pieDAKLS0tIDlYbWV2UllheFRQRUZwVmRteDJW
+            NU9wZHQyU0t3Tm5odE9UUTVmZkMwZlUKcnXTTlGDMMMwtfIbAOT8UiM/yTyuoDmA
+            +sqOslfVPW/FgCXtCdca2wc3SFs6LjPNmuJFp14tUQByqftNgLv3gA==
             -----END AGE ENCRYPTED FILE-----
           recipient: age1cd40qmufxzvw8dkml9340czqfq6ta3kxpjfj47jpavwn2t7ghywsxhqz79
+        - enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBYkRuVERsU0JXaXkwc1NM
+            MFlZUzlzWEpWbEVPUTZTcTdLS0hFaXJkc0dnCnh2dDdXZXMreDRCMmU2anNhUnl4
+            ek5zc2hQYThXWVBZM0dTN1F2MXlFV0EKLS0tIG05NmdrK3BJUDVsc0t4dWhrRzZF
+            VnZNV0hpRlZnbEVvc0NSa2NDTU9HeEUKD68eN/3/ReQYS1z0kQ6Txa18hVqrEVo+
+            Cuii27UwrwN07cE1XZx7PHG17pfuCzdnxFPr3CNhFPWCz4f/CD13SA==
+            -----END AGE ENCRYPTED FILE-----
+          recipient: age1dsf6z3hcr8qrtptdk6xyky9c99tdpjyrnuaawv4atme9rffhps9qpwdn6j
     lastmodified: "2026-08-05T02:52:44Z"
     mac: ENC[AES256_GCM,data:69aZI03tg5IakwK80lx/eVrFq84WB2dk3DFKc5X5Idc2irrz2AodqsmlBNkrDDC6bnv1kUAW8dQlOscbHxKNtOq+lzEtuVI88A2sO1JT06ILFMMfj3R2BEZPtuidl/iytovUKmZrL9JzlNKTd/74htsBvC3cLoIk7r/WfyfoU4w=,iv:r2Jzq9IqL+ssKo13tpJ4OrgnPxxNaNaYbAa0+DnLt54=,tag:GL5AEZPDudVB+IQZtbmwvg==,type:str]
     unencrypted_suffix: _unencrypted

system/core/power.nix

@@ -2,31 +2,4 @@
 
 {
   boot.kernelParams = [ "mem_sleep_default=deep" ];
-
-  services.power-profiles-daemon.enable = false;
-
-  services.tlp = {
-    enable = true;
-    settings = {
-      USB_AUTOSUSPEND = 0;
-
-      # AC
-      CPU_SCALING_GOVERNOR_ON_AC = "performance";
-      CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
-      SOUND_POWER_SAVE_ON_AC = 0;
-      PCIE_ASPM_ON_AC = "default";
-      CPU_BOOST_ON_BAT = 0;
-
-      # Battery
-      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-      SOUND_POWER_SAVE_ON_BAT = 1;
-      PCIE_ASPM_ON_BAT = "powersupersave";
-      CPU_BOOST_ON_AC = 1;
-
-      # Battery Thresholds
-      START_CHARGE_THRESH_BAT0 = 40;
-      STOP_CHARGE_THRESH_BAT0 = 80;
-    };
-  };
 }

system/network/default.nix

@@ -2,17 +2,22 @@
 
 {
 
-  imports = [
-    ./pi-hole.nix
-  ];
+  imports = [];
 
   networking = {
-    networkmanager.enable = true;
+    networkmanager = {
+      enable = true;
+      wifi.powersave = false;
+    };
     
     firewall = {
       enable = true;
-      allowedTCPPorts = [];
-      allowedUDPPorts = [];
+      allowedTCPPorts = [ 4242 ];
+      allowedUDPPorts = [ 4242 ];
     };
   };
+
+  boot.extraModprobeConfig = ''
+    options iwlwifi power_save=0
+  '';
 }

system/packages.nix

@@ -10,8 +10,10 @@
     bitwarden-cli
     btop
     dconf
+    deskflow
     fastfetch
     firefox
+    gemini-cli
     git
     github-cli
     (google-chrome.override {
@@ -20,18 +22,24 @@
       ];
     })
     google-chrome
+    google-java-format
     gnupg
+    jdk
+    jdt-language-server
     jq
     keepassxc
+    lan-mouse
     libnotify
     mypy
     networkmanagerapplet
     nitrogen
     ollama
     pasystray
+    playerctl
     pulseaudioFull
     rclone
     rnote
+    rustdesk
     sops
     ssh-to-age
     tldr
@@ -90,15 +98,11 @@
   programs.firefox.enable = true;
   programs.thunar.enable = true;
 
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-  };
-
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
     dedicatedServer.openFirewall = true;
     localNetworkGameTransfers.openFirewall = true;
+    gamescopeSession.enable = true; # Useful for rendering Palworld at downscaled 1080p
   };
 }

system/services/default.nix

@@ -20,6 +20,7 @@ in
 
   programs.dsearch.enable = true;
 
+
   programs.dank-material-shell.greeter = {
     enable = true;
     compositor.name = "niri";
@@ -70,6 +71,15 @@ in
       enable = true;
     };
 
+    displayManager = {
+      autoLogin = {
+        enable = true;
+        user = "jashton";
+      };
+
+      defaultSession = "niri";
+    };
+
     upower.enable = true;
     printing.enable = true;
     gvfs.enable = true;

system/virtualisation/default.nix

@@ -2,9 +2,12 @@
 
 {
   virtualisation = {
+    containers.enable = true;
+
     podman = {
       enable = true;
       dockerCompat = true;
+      defaultNetwork.settings.dns_enabled = true;
     };
 
     waydroid.enable = true;
@@ -14,4 +17,12 @@
   };
 
   networking.firewall.trustedInterfaces = [ "waydroid0" ];
+
+  # Install podman-compose and helper tools
+  environment.systemPackages = with pkgs; [
+    podman-compose
+    podman-tui
+    slirp4netns
+    fuse-overlayfs
+  ];
 }