chore(pre-commit): add deadnix

.pre-commit-config.yaml

@@ -11,12 +11,11 @@ repos:
 
   - repo: local
     hooks:
-      - id: nixpkgs-fmt
+      - id: nix-fmt
         name: Check nix formatting
-        entry: nixfmt
+        entry: nix fmt
         language: system
         files: .*\.nix$
-        args: [-c]
         stages: [pre-commit]
 
       - id: prettier
@@ -24,7 +23,7 @@ repos:
         entry: prettier
         language: system
         files: .*\.(css|scss|js|ts|yaml)$
-        args: [-c]
+        args: [--write]
         stages: [pre-commit]
 
       - id: typos
@@ -34,3 +33,11 @@ repos:
         files: .*
         exclude: .*\.(png|jpg|jpeg|age)
         stages: [pre-commit]
+
+      - id: deadnix
+        name: Check for dead nix code
+        entry: deadnix
+        language: system
+        files: .+\.nix$
+        args: ["-e", "-l"]
+        stages: [pre-commit]

flake.lock

@@ -204,11 +204,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742931706,
+        "lastModified": 1743618206,
-        "narHash": "sha256-VDTJkTR3I6RCXodtldF5mfXDjgtKiAGdau0Nf+NnEow=",
+        "narHash": "sha256-2m+NSilel93Kmafb1ghS+7T6kxmesKynWEqsVXIxj/k=",
         "owner": "nydragon",
         "repo": "hjem-rum",
-        "rev": "b1f8e2de6d15baafe4ed81c491b1eaa1eb182128",
+        "rev": "c365017ca78d21ffcf0e785332b04bdbbd96c284",
         "type": "github"
       },
       "original": {

flake.nix

@@ -72,9 +72,9 @@
           devShells.default = pkgs.mkShell {
             buildInputs = with pkgs; [
               pre-commit
-              nixfmt-rfc-style
               nodePackages.prettier
               typos
+              deadnix
               inputs'.agenix.packages.default
             ];
             shellHook = ''

home/default.nix

@@ -6,12 +6,10 @@
     ./terminal
     ./desktop
     ./hyprland
-    ./hyprlock
     ./services
     ./rofi
     ./sway
     ./waybar
-    ./hyprpaper
     ./swaync
   ];
 }

home/graphical/firefox/default.nix

@@ -44,13 +44,13 @@ lib.mkIf osConfig.programs.firefox.enable {
               urls = [
                 { template = "https://wiki.archlinux.org/index.php?title=Special:Search&search={searchTerms}"; }
               ];
-              iconUpdateURL = "https://wiki.archlinux.org/favicon.ico";
+              icon = "https://wiki.archlinux.org/favicon.ico";
               updateInterval = iconUpdateInterval;
               definedAliases = [ "@archwiki" ];
             };
             "DuckDuckGo" = {
               urls = [ { template = "https://duckduckgo.com/?q={searchTerms}"; } ];
-              iconUpdateURL = "https://duckduckgo.com/favicon.ico";
+              icon = "https://duckduckgo.com/favicon.ico";
               updateInterval = iconUpdateInterval;
               definedAliases = [
                 "@duckduckgo"
@@ -59,7 +59,7 @@ lib.mkIf osConfig.programs.firefox.enable {
             };
             "MyNixOS" = {
               urls = [ { template = "https://mynixos.com/search?q={searchTerms}"; } ];
-              iconUpdateURL = "https://mynixos.com/favicon.ico";
+              icon = "https://mynixos.com/favicon.ico";
               updateInterval = iconUpdateInterval;
               definedAliases = [
                 "@hm"
@@ -68,7 +68,7 @@ lib.mkIf osConfig.programs.firefox.enable {
             };
             "stackoverflow" = {
               urls = [ { template = "https://stackoverflow.com/search?q={searchTerms}"; } ];
-              iconUpdateURL = "https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico";
+              icon = "https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico";
               updateInterval = iconUpdateInterval;
               definedAliases = [ "@stackoverflow" ];
             };

home/hyprland/default.nix

@@ -15,7 +15,6 @@ in
 mkIf osConfig.programs.hyprland.enable {
   home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto";
 
-  programs.hyprlock.enable = true;
   services.swayidle.enable = true;
 
   wayland.windowManager.hyprland = {

home/hyprpaper/default.nix

@@ -1,15 +0,0 @@
-{ inputs, ... }:
-{
-  services.hyprpaper = {
-    enable = false;
-    settings =
-      let
-        wp = inputs.wallpapers.wallpapers.pastel.nix-flake.path;
-      in
-      {
-        ipc = "on";
-        preload = [ "${wp}" ];
-        wallpaper = [ ",${wp}" ];
-      };
-  };
-}

home/services/default.nix

@@ -1,6 +1,5 @@
 {
   imports = [
     ./kdeconnect.nix
-    ./syncthing.nix
   ];
 }

home/services/syncthing.nix

@@ -1,19 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-let
-  inherit (lib) mkIf;
-in
-{
-  config = mkIf config.services.syncthing.enable {
-    xdg.desktopEntries."Syncthing" = {
-      name = "Syncthing";
-      icon = "";
-      terminal = false;
-      exec = "${pkgs.syncthing}/bin/syncthing --browser-only";
-    };
-  };
-}

hosts/brontes/default.nix

@@ -19,6 +19,8 @@ in
     efi.canTouchEfiVariables = true;
   };
 
+  zramSwap.enable = true;
+
   age.secrets.rustypaste = {
     file = ../../secrets/rustypaste.age;
     mode = "440";
@@ -111,6 +113,10 @@ in
   };
 
   programs = {
+    direnv = {
+      nix-direnv.enable = true;
+      enable = true;
+    };
     dconf.enable = true;
     fish.enable = true;
     firefox.enable = true;

hosts/brontes/home.nix

@@ -18,15 +18,8 @@ in
     ];
 
     programs = {
-      direnv = {
-        enable = true;
-        nix-direnv.enable = true;
-      };
-
       beets.enable = true;
-      waybar.enable = true;
       ssh.enable = true;
-      rofi.enable = true;
     };
 
     services = {

hosts/default.nix

@@ -62,5 +62,15 @@ in
         inputs.nixos-hardware.nixosModules.raspberry-pi-4
       ];
     })
+
+    (mkSystem' {
+      inherit username;
+      hostname = "ashla";
+      system = "x86_64-linux";
+      extraModules = [
+        inputs.disko.nixosModules.disko
+        inputs.agenix.nixosModules.default
+      ];
+    })
   ];
 }

hosts/marr/default.nix

@@ -85,6 +85,10 @@ in
   };
 
   programs = {
+    direnv = {
+      nix-direnv.enable = true;
+      enable = true;
+    };
     dconf.enable = true;
     fish.enable = true;
     firefox.enable = true;

hosts/marr/home.nix

@@ -26,10 +26,6 @@ in
     };
 
     programs = {
-      direnv = {
-        enable = true;
-        nix-direnv.enable = true;
-      };
       beets.enable = true;
       vscode.enable = true;
       ssh.enable = true;

hosts/raptus/headscale/acls.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  options,
   lib,
   self,
   ...

options/system/outputs.nix

@@ -13,7 +13,7 @@ in
   options.modules.system.outputs = mkOption {
     type = attrsOf (
       submodule (
-        { name, config, ... }:
+        { name, ... }:
         {
           options = {
             name = mkOption {

options/system/users/default.nix

@@ -16,7 +16,7 @@ let
 
   cfg = config.modules.system.users;
   file = submodule (
-    { name, config, ... }:
+    { ... }:
     {
       options = {
         path = mkOption {
@@ -37,7 +37,7 @@ in
     default = { };
     type = attrsOf (
       submodule (
-        { name, config, ... }:
+        { name, ... }:
         {
           options = {
             name = mkOption {

users/ny/programs/default.nix

@@ -4,5 +4,6 @@
     ./fuzzel.nix
     ./keepassxc.nix
     ./git.nix
+    ./hyprlock.nix
   ];
 }

users/ny/programs/hyprlock.nix

@@ -1,6 +1,6 @@
-{ lib, config, ... }:
+{
-lib.mkIf config.programs.hyprlock.enable {
+  rum.programs.hyprlock = {
-  programs.hyprlock = {
+    enable = true;
     settings = {
       general = {
         hide_cursor = true;