ci: fix

config/nvim/lua/plugins/guard.lua

@@ -51,10 +51,68 @@ return {
         ft('make'):lint('checkmake')
         ft('cpp'):lint('cpplint')
         ft('markdown'):fmt('cbfmt'):append('prettierd')
-        ft('nix'):fmt({
+        local lint = require('guard.lint')
-            cmd = 'nix',
+
-            args = { 'fmt', '--' },
+        ft('nix')
-            fname = true,
+            :fmt({
-        })
+                cmd = 'nix',
+                args = { 'fmt', '--' },
+                fname = true,
+            })
+            :lint({
+                cmd = 'deadnix',
+                args = { '-o', 'json' },
+                fname = true,
+                parse = lint.from_json({
+                    get_diagnostics = function(raw)
+                        return vim.json.decode(raw).results
+                    end,
+                    attributes = {
+                        lnum = 'line',
+                        col = 'column',
+                        lnum_end = 'line',
+                        col_end = 'endColumn',
+                        message = 'message',
+                    },
+                    source = 'deadnix',
+                }),
+            })
+            :lint({
+                cmd = 'statix',
+                args = { 'check', '-o', 'json' },
+                fname = true,
+                parse = lint.from_json({
+                    get_diagnostics = function(raw)
+                        local data = vim.json.decode(raw)
+                        local results = {}
+                        for _, entry in ipairs(data.report or {}) do
+                            for _, diag in ipairs(entry.diagnostics or {}) do
+                                table.insert(results, {
+                                    from_line = diag.at.from.line,
+                                    from_col = diag.at.from.column,
+                                    to_line = diag.at.to.line,
+                                    to_col = diag.at.to.column,
+                                    message = entry.note,
+                                    severity = entry.severity,
+                                })
+                            end
+                        end
+                        return results
+                    end,
+                    attributes = {
+                        lnum = 'from_line',
+                        col = 'from_col',
+                        lnum_end = 'to_line',
+                        col_end = 'to_col',
+                        message = 'message',
+                    },
+                    severities = {
+                        Error = lint.severities.error,
+                        Warn = lint.severities.warning,
+                        Hint = lint.severities.info,
+                    },
+                    source = 'statix',
+                }),
+            })
     end,
 }

home/modules/editor.nix

@@ -44,6 +44,8 @@ in
     mypy
     selene
     shellcheck
+    deadnix
+    statix
 
     # runtime/tools
     nodejs

home/modules/hyprland.nix

@@ -69,47 +69,43 @@ in
     };
   };
 
-  xdg.configFile."hypr/hyprlock.conf".text =
+  xdg.configFile."hypr/hyprlock.conf".text = ''
-    let
+    general {
-      c = config.colors;
+      hide_cursor = true
-    in
+      grace = 0
-    ''
+    }
-      general {
-        hide_cursor = true
-        grace = 0
-      }
 
-      background {
+    background {
-        monitor =
+      monitor =
-        path = ${config.xdg.userDirs.pictures}/Screensavers/lock.jpg
+      path = ${config.xdg.userDirs.pictures}/Screensavers/lock.jpg
-      }
+    }
 
-      animations {
+    animations {
-        enabled = false
+      enabled = false
-      }
+    }
 
-      input-field {
+    input-field {
-        monitor =
+      monitor =
-        size = 600, 50
+      size = 600, 50
-        outline_thickness = 0
+      outline_thickness = 0
-        dots_text_format = *
+      dots_text_format = *
-        dots_size = 0.9
+      dots_size = 0.9
-        dots_spacing = 0.3
+      dots_spacing = 0.3
-        dots_center = true
+      dots_center = true
-        outer_color = rgba(00000000)
+      outer_color = rgba(00000000)
-        inner_color = rgba(00000000)
+      inner_color = rgba(00000000)
-        font_color = rgb(ffffff)
+      font_color = rgb(ffffff)
-        font_family = Berkeley Mono
+      font_family = Berkeley Mono
-        check_color = rgb(98c379)
+      check_color = rgb(98c379)
-        fail_color = rgb(ff6b6b)
+      fail_color = rgb(ff6b6b)
-        fail_text = $FAIL
+      fail_text = $FAIL
-        rounding = 0
+      rounding = 0
-        placeholder_text =
+      placeholder_text =
-        position = 0, 0
+      position = 0, 0
-        halign = center
+      halign = center
-        valign = center
+      valign = center
-      }
+    }
-    '';
+  '';
 
   services.hypridle = {
     enable = true;

home/modules/terminal.nix

@@ -1,8 +1,4 @@
-{ pkgs, config, ... }:
+{ config, ... }:
-
-let
-  c = config.colors;
-in
 {
   home.sessionVariables = {
     TERMINAL = "ghostty";

home/modules/ui.nix

@@ -2,13 +2,10 @@
   pkgs,
   lib,
   config,
-  hostConfig,
   ...
 }:
 
 let
-  c = config.colors;
-
   mkWaybarTheme = palette: ''
     * { color: ${palette.fg}; }
     window#waybar { background: ${palette.bg}; border-bottom: 2px solid ${palette.bgAlt}; }

hosts/xps15/hardware-configuration.nix

@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: