From 5ba1d810d4e5ae42d033f1e266c028db31a5b70e Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Sun, 17 Mar 2024 11:26:16 +0100
Subject: [PATCH] cleanup w/ deadnix

---
 flake.nix                                     |  6 +-
 home/default.nix                              |  5 --
 home/profiles/default.nix                     |  3 -
 home/profiles/hopper/default.nix              |  2 +-
 home/profiles/nixdesk/default.nix             |  2 +-
 home/programs/games/default.nix               |  6 +-
 home/programs/media/mpv.nix                   |  2 +-
 home/programs/misc/keepassxc.nix              |  6 +-
 home/programs/music/yams.nix                  |  6 +-
 home/terminal/default.nix                     |  7 +--
 home/terminal/programs/comma.nix              |  2 +-
 home/terminal/programs/git.nix                |  6 +-
 home/terminal/shell/starship.nix              | 26 --------
 hosts/default.nix                             |  2 +-
 hosts/liveiso/default.nix                     |  7 +--
 hosts/nixdesk/default.nix                     |  1 -
 hosts/nixdesk/hardware.nix                    |  2 +-
 secrets/default.nix                           |  6 +-
 system/core/boot.nix                          |  6 +-
 system/core/compat.nix                        |  6 +-
 system/desktop/x11/default.nix                |  2 +-
 system/hardware/opengl.nix                    |  2 +-
 system/nix/nixpkgs.nix                        |  2 +-
 system/services/containers/server/default.nix | 63 +------------------
 system/services/default.nix                   |  2 +-
 system/services/transmission.nix              |  7 +--
 system/services/wireguard.nix                 |  6 +-
 27 files changed, 23 insertions(+), 170 deletions(-)
 delete mode 100644 home/terminal/shell/starship.nix

diff --git a/flake.nix b/flake.nix
index 7fca7af..5f47bd1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,11 +9,7 @@
       ];
       flake = {
       };
-      perSystem = {
-        config,
-        pkgs,
-        ...
-      }: rec {
+      perSystem = {pkgs, ...}: rec {
         devShells.default = pkgs.mkShell {
           packages = with pkgs; [
             alejandra
diff --git a/home/default.nix b/home/default.nix
index 8337a0e..59fb6eb 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,9 +1,4 @@
 {
-  lib,
-  self,
-  inputs,
-  ...
-}: {
   imports = [
   ];
 
diff --git a/home/profiles/default.nix b/home/profiles/default.nix
index c1adb6d..ad6ffc4 100644
--- a/home/profiles/default.nix
+++ b/home/profiles/default.nix
@@ -1,7 +1,6 @@
 {
   self,
   inputs,
-  system,
   pkgs,
   ...
 }: let
@@ -25,8 +24,6 @@
   };
 
   inherit (inputs.home-manager.lib) homeManagerConfiguration;
-
-  pkgs = inputs.nixpkgs.legacyPackages.${system};
 in {
   # we need to pass this to NixOS' HM module
   _module.args = {inherit homeImports;};
diff --git a/home/profiles/hopper/default.nix b/home/profiles/hopper/default.nix
index bf08fc3..542854b 100644
--- a/home/profiles/hopper/default.nix
+++ b/home/profiles/hopper/default.nix
@@ -1,4 +1,4 @@
-{lib, ...}: {
+{...}: {
   imports = [
     ../../editors/nvim.nix
     ../../terminal/shell/zsh.nix
diff --git a/home/profiles/nixdesk/default.nix b/home/profiles/nixdesk/default.nix
index 3d8ed06..7298e11 100644
--- a/home/profiles/nixdesk/default.nix
+++ b/home/profiles/nixdesk/default.nix
@@ -1,4 +1,4 @@
-{lib, ...}: {
+{...}: {
   imports = [
     ../../terminal
     ../../editors/nvim.nix
diff --git a/home/programs/games/default.nix b/home/programs/games/default.nix
index 8accb9e..958691c 100644
--- a/home/programs/games/default.nix
+++ b/home/programs/games/default.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  self,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = with pkgs; [
     heroic
     lutris
diff --git a/home/programs/media/mpv.nix b/home/programs/media/mpv.nix
index 87afc20..158d93c 100644
--- a/home/programs/media/mpv.nix
+++ b/home/programs/media/mpv.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
   programs.mpv = {
     enable = true;
     config = {
diff --git a/home/programs/misc/keepassxc.nix b/home/programs/misc/keepassxc.nix
index 0f18e96..b268313 100644
--- a/home/programs/misc/keepassxc.nix
+++ b/home/programs/misc/keepassxc.nix
@@ -1,7 +1,3 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = [pkgs.keepassxc];
 }
diff --git a/home/programs/music/yams.nix b/home/programs/music/yams.nix
index 93633f5..87b0fcd 100644
--- a/home/programs/music/yams.nix
+++ b/home/programs/music/yams.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
+{pkgs, ...}: {
   # authentication needs to be done manually once
   # TODO automatic authentication thing
   home.packages = with pkgs; [yams];
diff --git a/home/terminal/default.nix b/home/terminal/default.nix
index 3dfe844..61c6751 100644
--- a/home/terminal/default.nix
+++ b/home/terminal/default.nix
@@ -1,11 +1,6 @@
-{config, ...}: let
-  data = config.xdg.dataHome;
-  conf = config.xdg.configHome;
-  cache = config.xdg.cacheHome;
-in {
+{...}: {
   imports = [
     ./programs
     ./shell/zsh.nix
-    #./shell/starship.nix
   ];
 }
diff --git a/home/terminal/programs/comma.nix b/home/terminal/programs/comma.nix
index 8bdf396..05bde3a 100644
--- a/home/terminal/programs/comma.nix
+++ b/home/terminal/programs/comma.nix
@@ -1,3 +1,3 @@
-{pkgs, ...}: {
+{
   programs.nix-index-database.comma.enable = true;
 }
diff --git a/home/terminal/programs/git.nix b/home/terminal/programs/git.nix
index 687509a..8bfbcf5 100644
--- a/home/terminal/programs/git.nix
+++ b/home/terminal/programs/git.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  config,
-  ...
-}: {
+{config, ...}: {
   programs.git = {
     enable = true;
     delta.enable = true;
diff --git a/home/terminal/shell/starship.nix b/home/terminal/shell/starship.nix
deleted file mode 100644
index 94ae165..0000000
--- a/home/terminal/shell/starship.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{config, ...}: {
-  home.sessionVariables.STARSHIP_CACHE = "${config.xdg.cacheHome}/starship";
-
-  programs.starship = {
-    enable = true;
-    enableZshIntegration = true;
-    settings = {
-      character = {
-        success_symbol = "[›](bold green)";
-        error_symbol = "[›](bold red)";
-      };
-
-      git_status = {
-        deleted = "✗";
-        modified = "✶";
-        staged = "✓";
-        stashed = "≡";
-      };
-
-      nix_shell = {
-        symbol = " ";
-        heuristic = true;
-      };
-    };
-  };
-}
diff --git a/hosts/default.nix b/hosts/default.nix
index d2cfe92..7f7d71f 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -103,7 +103,7 @@ in {
   };
   flake.nixosConfigurations = let
     l = inputs.nixpkgs.lib;
-  in (builtins.mapAttrs (n: v:
+  in (builtins.mapAttrs (_n: v:
     l.nixosSystem {
       inherit specialArgs;
       modules = v.imports;
diff --git a/hosts/liveiso/default.nix b/hosts/liveiso/default.nix
index 5969e48..4df65cd 100644
--- a/hosts/liveiso/default.nix
+++ b/hosts/liveiso/default.nix
@@ -1,9 +1,4 @@
-{
-  inputs,
-  modulesPath,
-  lib,
-  ...
-}: {
+{...}: {
   imports = [
     ./tools.nix
     ./sway.nix
diff --git a/hosts/nixdesk/default.nix b/hosts/nixdesk/default.nix
index 3a61c0b..51d4c09 100644
--- a/hosts/nixdesk/default.nix
+++ b/hosts/nixdesk/default.nix
@@ -1,7 +1,6 @@
 {
   pkgs,
   inputs,
-  lib,
   ...
 }: {
   imports = [
diff --git a/hosts/nixdesk/hardware.nix b/hosts/nixdesk/hardware.nix
index 64bb6c6..9b31f8b 100644
--- a/hosts/nixdesk/hardware.nix
+++ b/hosts/nixdesk/hardware.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {
   boot = {
     initrd = {
       availableKernelModules = [
diff --git a/secrets/default.nix b/secrets/default.nix
index 9ee30dc..ab8fde3 100644
--- a/secrets/default.nix
+++ b/secrets/default.nix
@@ -1,8 +1,4 @@
-{
-  inputs,
-  lib,
-  ...
-}: {
+{inputs, ...}: {
   imports = [
     inputs.sops-nix.nixosModules.sops
     ./global
diff --git a/system/core/boot.nix b/system/core/boot.nix
index 98828e9..74799b5 100644
--- a/system/core/boot.nix
+++ b/system/core/boot.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
+{config, ...}: {
   boot = {
     initrd = {
       systemd.enable = true;
diff --git a/system/core/compat.nix b/system/core/compat.nix
index 9e04343..6f72213 100644
--- a/system/core/compat.nix
+++ b/system/core/compat.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
+{pkgs, ...}: {
   environment.systemPackages = [pkgs.steam-run];
 
   programs.nix-ld.enable = true;
diff --git a/system/desktop/x11/default.nix b/system/desktop/x11/default.nix
index 1376ab8..357a6f9 100644
--- a/system/desktop/x11/default.nix
+++ b/system/desktop/x11/default.nix
@@ -1,4 +1,4 @@
-{lib, ...}: {
+{...}: {
   imports = [
     ./xclip.nix
   ];
diff --git a/system/hardware/opengl.nix b/system/hardware/opengl.nix
index a144a20..f899b37 100644
--- a/system/hardware/opengl.nix
+++ b/system/hardware/opengl.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {
   hardware.opengl = {
     enable = true;
     driSupport = true;
diff --git a/system/nix/nixpkgs.nix b/system/nix/nixpkgs.nix
index 646317a..c05f9eb 100644
--- a/system/nix/nixpkgs.nix
+++ b/system/nix/nixpkgs.nix
@@ -1,4 +1,4 @@
-{self, ...}: {
+{...}: {
   nixpkgs = {
     config.allowUnfree = true;
     config.permittedInsecurePackages = [];
diff --git a/system/services/containers/server/default.nix b/system/services/containers/server/default.nix
index 06ccf24..5171e92 100644
--- a/system/services/containers/server/default.nix
+++ b/system/services/containers/server/default.nix
@@ -1,69 +1,8 @@
 {
-  lib,
   config,
   pkgs,
   ...
-}: let
-  hostname = config.networking.hostName;
-  dashyConfig = {
-    pageInfo = {
-      #title = "Home Lab";
-    };
-    sections = [
-      {
-        name = "*arr";
-        icon = "hl-servarr";
-        items = [
-          {
-            title = "Sonarr";
-            icon = "hl-sonarr";
-            url = "http://${hostname}:8989";
-          }
-          {
-            title = "Radarr";
-            icon = "hl-radarr";
-            url = "http://${hostname}:7878";
-          }
-          {
-            title = "Prowlarr";
-            icon = "hl-prowlarr";
-            url = "http://${hostname}:9696";
-          }
-        ];
-      }
-      {
-        name = "Management";
-        items = [
-          {
-            title = "Jellyseerr";
-            icon = "hl-jellyseerr";
-            url = "http://${hostname}:5055";
-          }
-          {
-            title = "Transmission";
-            icon = "hl-transmission";
-            url = "http://${hostname}:9091";
-          }
-        ];
-      }
-      {
-        name = "Music";
-        items = [
-          {
-            title = "Betanin";
-            icon = "hl-betanin";
-            url = "http://${hostname}:9393";
-          }
-          {
-            title = "Slskd";
-            icon = "hl-soulseek";
-            url = "http://${hostname}:5030";
-          }
-        ];
-      }
-    ];
-  };
-in {
+}: {
   imports = [
     #./statistics
   ];
diff --git a/system/services/default.nix b/system/services/default.nix
index 14371b9..a92070f 100644
--- a/system/services/default.nix
+++ b/system/services/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {
   services = {
     dbus.implementation = "broker";
 
diff --git a/system/services/transmission.nix b/system/services/transmission.nix
index c357052..d61935d 100644
--- a/system/services/transmission.nix
+++ b/system/services/transmission.nix
@@ -1,9 +1,4 @@
-{
-  lib,
-  config,
-  self,
-  ...
-}: {
+{...}: {
   services.transmission = {
     enable = true;
   };
diff --git a/system/services/wireguard.nix b/system/services/wireguard.nix
index 89036e0..d7e0ecf 100644
--- a/system/services/wireguard.nix
+++ b/system/services/wireguard.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   #networking.wg-quick.interfaces."wg0".configFile = config.sops.secrets.wireguard.path;
 
   # Sets tailscale to a high priority, to make sure tailscale