import changes, changed wallpaper names

assets/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<comment version="3.0">
-  <caption>atom_triangle_wallpaper</caption>
-  <note/>
-  <place/>
-  <categories/>
-</comment>

assets/wallpapers/minimalistic/.comments/heart.jpg.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<comment version="3.0">
-  <caption/>
-  <note>charset=Ascii Screenshot</note>
-  <place/>
-  <categories/>
-</comment>

hosts/default.nix

@@ -11,7 +11,7 @@ in {
       inputs.home-manager.nixosModules.home-manager
       inputs.agenix.nixosModules.default
       inputs.stylix.nixosModules.stylix
-      inputs.nixvim.nixosModules.nixvim
+      #inputs.nixvim.nixosModules.nixvim
     ];
   };
   hermit = lib.nixosSystem {
@@ -26,5 +26,4 @@ in {
       inputs.nixvim.nixosModules.nixvim
     ];
   };
-
 }

hosts/vali/temperance/programs.nix

@@ -64,7 +64,6 @@ in {
     nicotine-plus
     nil
     nitch
-    nixfmt
     nixpkgs-wayland.swww
     nmap
     notesnook

modules/cli/fish.nix

@@ -6,10 +6,8 @@
 }:
 with lib; let
   cfg = config.modules.programs.fish;
-  username = config.modules.other.system.username;
+  inherit (config.modules.other.system) username;
-  # not needed because I'm using nh os switch
+  inherit (config.modules.other.system) gitPath;
-  # hostname = config.modules.other.system.hostname;
-  gitPath = config.modules.other.system.gitPath;
 in {
   options.modules.programs.fish = {
     enable = mkEnableOption "fish";
@@ -32,53 +30,55 @@ in {
 
     home-manager.users.${username} = {
       home.packages = with pkgs; [nix-output-monitor];
-      programs.zoxide.enable = true;
+      programs = {
-      programs.zoxide.enableFishIntegration = true;
+        zoxide.enable = true;
-      programs.fish = {
+        zoxide.enableFishIntegration = true;
-        enable = true;
+        fish = {
-        interactiveShellInit = "set fish_greeting";
+          enable = true;
-        plugins = [
+          interactiveShellInit = "set fish_greeting";
-          {
+          plugins = [
-            name = "grc";
+            {
-            src = pkgs.fishPlugins.grc.src;
+              name = "grc";
-          }
+              inherit (pkgs.fishPlugins.grc) src;
-          {
+            }
-            name = "sponge";
+            {
-            src = pkgs.fishPlugins.sponge.src;
+              name = "sponge";
-          }
+              inherit (pkgs.fishPlugins.sponge) src;
-          {
+            }
-            name = "done";
+            {
-            src = pkgs.fishPlugins.done.src;
+              name = "done";
-          }
+              inherit (pkgs.fishPlugins.done) src;
-          {
+            }
-            name = "colored_man_pages";
+            {
-            src = pkgs.fishPlugins.colored-man-pages.src;
+              name = "colored_man_pages";
-          }
+              inherit (pkgs.fishPlugins.colored-man-pages) src;
-          {
+            }
-            name = "tide";
+            {
-            src = pkgs.fishPlugins.tide.src;
+              name = "tide";
-          }
+              inherit (pkgs.fishPlugins.tide) src;
-        ];
+            }
-        shellAbbrs =
+          ];
-          {
+          shellAbbrs =
-            c = "clear";
+            {
-            cc = "cd ~ && clear";
+              c = "clear";
-            mv = "mv -iv";
+              cc = "cd ~ && clear";
-            rm = "trash -v";
+              mv = "mv -iv";
-            ls = "eza --icons";
+              rm = "trash -v";
-            l = "eza -a --icons";
+              ls = "eza --icons";
-            la = "eza -lha --icons --git";
+              l = "eza -a --icons";
-            kys = "shutdown now";
+              la = "eza -lha --icons --git";
-            lg = "lazygit";
+              kys = "shutdown now";
-            cd = "z";
+              lg = "lazygit";
-            v = "nvim";
+              cd = "z";
-            h = "hx";
+              v = "nvim";
-            k = "kak";
+              h = "hx";
-            e = "emacs";
+              k = "kak";
-            update = ''nh os switch "${gitPath}"'';
+              e = "emacs";
-            flake = "cd '${gitPath}'";
+              update = ''nh os switch "${gitPath}"'';
-          }
+              flake = "cd '${gitPath}'";
-          // cfg.extraAliases;
+            }
+            // cfg.extraAliases;
+        };
       };
     };
   };

modules/editors/nixvim/nixvim.nix

@@ -1,12 +1,14 @@
 {
   config,
   lib,
+  inputs,
   ...
 }: let
   cfg = config.modules.editors.nixvim;
 in {
   options.modules.editors.nixvim.enable = lib.mkEnableOption "nixvim";
   imports = [
+    inputs.nixvim.nixosModules.nixvim
     ./keys.nix
     ./settings.nix
     ./plug/completion/cmp.nix

modules/services/ssh.nix

@@ -6,7 +6,7 @@
 }:
 with lib; let
   cfg = config.modules.programs.ssh;
-  username = config.modules.other.system.username;
+  inherit (config.modules.other.system) username;
 in {
   options.modules.programs.ssh.enable = mkEnableOption "ssh";
 

options/common/bluetooth.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  username = config.modules.other.system.username;
+  inherit (config.modules.other.system) username;
 in {
   hardware.bluetooth = {
     enable = true;

options/common/gpu/nvidia.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   config,
-  inputs,
   ...
 }: {
   services.xserver.videoDrivers = ["nvidia"];

options/common/networking.nix

@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  username = config.modules.other.system.username;
+  inherit (config.modules.other.system) username;
 in {
   networking = {
     networkmanager = {