treewide: use inputs instead of self

users/jordan/default.nix

@@ -1,14 +1,14 @@
 {
+  inputs,
   config,
   pkgs,
-  self,
   ...
 }:
 let
   name = "jordan";
 in
 {
-  age.secrets."passwords/users/jordan".file = "${self.inputs.secrets}/passwords/users/jordan.age";
+  age.secrets."passwords/users/jordan".file = "${inputs.secrets}/passwords/users/jordan.age";
 
   users.users.${name} = {
     description = "Jordan Holt";

users/jordan/git.nix

@@ -3,7 +3,7 @@
 }:
 
 {
-  home.programs.git = {
+  programs.git = {
     enable = true;
     aliases = {
       amend = "commit --amend";

users/jordan/gpg.nix

@@ -3,11 +3,11 @@
 }:
 
 {
-  home.programs.gpg = {
+  programs.gpg = {
     enable = true;
   };
 
-  home.services.gpg-agent = {
+  services.gpg-agent = {
     enable = true;
     enableSshSupport = true;
   };

users/jordan/graphical/default.nix

@@ -1,7 +1,7 @@
 {
-  config,
   lib,
   pkgs,
+  osConfig,
   ...
 }:
 
@@ -11,7 +11,7 @@
       ./firefox.nix
       ./thunderbird.nix
     ]
-    ++ lib.optionals config.modules.system.desktop.gnome.enable [
+    ++ lib.optionals osConfig.modules.system.desktop.gnome.enable [
       ./gnome.nix
     ];
 

users/jordan/graphical/firefox.nix

@@ -1,13 +1,12 @@
 {
-  self,
+  inputs,
   ...
 }:
 
 {
-  home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source =
-    self.inputs.firefox-gnome-theme;
+  home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;
 
-  home.programs.firefox = {
+  programs.firefox = {
     enable = true;
     profiles.Default = {
       search = {

users/jordan/graphical/gnome.nix

@@ -1,7 +1,7 @@
 {
+  inputs,
   lib,
   pkgs,
-  self,
   ...
 }:
 
@@ -199,7 +199,7 @@ in
     "Kvantum/kvantum.kvconfig".text = toINI { } {
       General.theme = "KvLibadwaitaDark";
     };
-    "Kvantum/KvLibadwaita".source = "${self.inputs.kvlibadwaita}/src/KvLibadwaita";
+    "Kvantum/KvLibadwaita".source = "${inputs.kvlibadwaita}/src/KvLibadwaita";
   };
 
   home.packages =
@@ -238,5 +238,5 @@ in
         [ ]
     );
 
-  home.services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
+  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
 }

users/jordan/graphical/hyprland.nix

@@ -28,5 +28,5 @@
     adw-gtk3
   ];
 
-  home.services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
+  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
 }

users/jordan/graphical/thunderbird.nix

@@ -1,13 +1,13 @@
 {
-  self,
+  inputs,
   ...
 }:
 
 {
   home.file.".thunderbird/Default/chrome/thunderbird-gnome-theme".source =
-    self.inputs.thunderbird-gnome-theme;
+    inputs.thunderbird-gnome-theme;
 
-  home.programs.thunderbird = {
+  programs.thunderbird = {
     enable = true;
     profiles.Default = {
       isDefault = true;

users/jordan/neovim.nix

@@ -3,7 +3,7 @@
 }:
 
 {
-  home.programs.nixvim.config = {
+  programs.nixvim.config = {
     enable = true;
     defaultEditor = true;
 

users/jordan/pass.nix

@@ -4,7 +4,7 @@
 }:
 
 {
-  home.programs.password-store = {
+  programs.password-store = {
     enable = true;
     package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
   };

users/jordan/shell.nix

@@ -4,7 +4,7 @@
 }:
 
 {
-  home.programs = {
+  programs = {
     zsh = {
       enable = true;
       autocd = true;