diff --git a/assets/wallpapers/dithered/barn.png b/assets/wallpapers/dithered/barn.png
deleted file mode 100644
index e7fa546..0000000
Binary files a/assets/wallpapers/dithered/barn.png and /dev/null differ
diff --git a/assets/wallpapers/dithered/lighthouse.png b/assets/wallpapers/dithered/lighthouse.png
deleted file mode 100644
index 65ee4b3..0000000
Binary files a/assets/wallpapers/dithered/lighthouse.png and /dev/null differ
diff --git a/assets/wallpapers/dithered/marketplace.png b/assets/wallpapers/dithered/marketplace.png
deleted file mode 100644
index 5592d05..0000000
Binary files a/assets/wallpapers/dithered/marketplace.png and /dev/null differ
diff --git a/assets/wallpapers/dithered/motorbikes.png b/assets/wallpapers/dithered/motorbikes.png
deleted file mode 100644
index cc63e91..0000000
Binary files a/assets/wallpapers/dithered/motorbikes.png and /dev/null differ
diff --git a/assets/wallpapers/landscapes/tropic_island_day.jpg b/assets/wallpapers/landscapes/tropic_island_day.jpg
deleted file mode 100644
index 170c849..0000000
Binary files a/assets/wallpapers/landscapes/tropic_island_day.jpg and /dev/null differ
diff --git a/assets/wallpapers/landscapes/tropic_island_evening.jpg b/assets/wallpapers/landscapes/tropic_island_evening.jpg
deleted file mode 100644
index a4ef177..0000000
Binary files a/assets/wallpapers/landscapes/tropic_island_evening.jpg and /dev/null differ
diff --git a/assets/wallpapers/landscapes/tropic_island_morning.jpg b/assets/wallpapers/landscapes/tropic_island_morning.jpg
deleted file mode 100644
index 0b26abe..0000000
Binary files a/assets/wallpapers/landscapes/tropic_island_morning.jpg and /dev/null differ
diff --git a/assets/wallpapers/landscapes/tropic_island_night.jpg b/assets/wallpapers/landscapes/tropic_island_night.jpg
deleted file mode 100644
index c236b9a..0000000
Binary files a/assets/wallpapers/landscapes/tropic_island_night.jpg and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml b/assets/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml
deleted file mode 100644
index c1082ba..0000000
--- a/assets/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- atom_triangle_wallpaper
-
-
-
-
diff --git a/assets/wallpapers/minimalistic/.comments/heart.jpg.xml b/assets/wallpapers/minimalistic/.comments/heart.jpg.xml
deleted file mode 100644
index 872b8b7..0000000
--- a/assets/wallpapers/minimalistic/.comments/heart.jpg.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- charset=Ascii Screenshot
-
-
-
diff --git a/assets/wallpapers/minimalistic/black5_unicat.png b/assets/wallpapers/minimalistic/black5_unicat.png
deleted file mode 100644
index cf0179a..0000000
Binary files a/assets/wallpapers/minimalistic/black5_unicat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/blue-cat.png b/assets/wallpapers/minimalistic/blue-cat.png
deleted file mode 100644
index d9c2ef7..0000000
Binary files a/assets/wallpapers/minimalistic/blue-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/blue_unicat.png b/assets/wallpapers/minimalistic/blue_unicat.png
deleted file mode 100644
index d25f1bc..0000000
Binary files a/assets/wallpapers/minimalistic/blue_unicat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/buttons.png b/assets/wallpapers/minimalistic/buttons.png
deleted file mode 100644
index de4cce8..0000000
Binary files a/assets/wallpapers/minimalistic/buttons.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/catppuccin_triangle.png b/assets/wallpapers/minimalistic/catppuccin_triangle.png
deleted file mode 100644
index 5f43327..0000000
Binary files a/assets/wallpapers/minimalistic/catppuccin_triangle.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/cats.png b/assets/wallpapers/minimalistic/cats.png
deleted file mode 100644
index 0437cc9..0000000
Binary files a/assets/wallpapers/minimalistic/cats.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/dark-cat-rosewater.png b/assets/wallpapers/minimalistic/dark-cat-rosewater.png
deleted file mode 100644
index e17332e..0000000
Binary files a/assets/wallpapers/minimalistic/dark-cat-rosewater.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/dark-cat.png b/assets/wallpapers/minimalistic/dark-cat.png
deleted file mode 100644
index 9e6b91b..0000000
Binary files a/assets/wallpapers/minimalistic/dark-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/darker_unicat.png b/assets/wallpapers/minimalistic/darker_unicat.png
deleted file mode 100644
index ec29355..0000000
Binary files a/assets/wallpapers/minimalistic/darker_unicat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/flamingo-cat.png b/assets/wallpapers/minimalistic/flamingo-cat.png
deleted file mode 100644
index 69de3c7..0000000
Binary files a/assets/wallpapers/minimalistic/flamingo-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/flamingo_unicat.png b/assets/wallpapers/minimalistic/flamingo_unicat.png
deleted file mode 100644
index 3b3aba1..0000000
Binary files a/assets/wallpapers/minimalistic/flamingo_unicat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/gradient-synth-cat.png b/assets/wallpapers/minimalistic/gradient-synth-cat.png
deleted file mode 100644
index d332e1c..0000000
Binary files a/assets/wallpapers/minimalistic/gradient-synth-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/green-cat.png b/assets/wallpapers/minimalistic/green-cat.png
deleted file mode 100644
index d476d7d..0000000
Binary files a/assets/wallpapers/minimalistic/green-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/hashtags-black.png b/assets/wallpapers/minimalistic/hashtags-black.png
deleted file mode 100644
index afe455f..0000000
Binary files a/assets/wallpapers/minimalistic/hashtags-black.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/hashtags-new.png b/assets/wallpapers/minimalistic/hashtags-new.png
deleted file mode 100644
index 9ab14da..0000000
Binary files a/assets/wallpapers/minimalistic/hashtags-new.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/heart.jpg b/assets/wallpapers/minimalistic/heart.jpg
deleted file mode 100644
index e1531df..0000000
Binary files a/assets/wallpapers/minimalistic/heart.jpg and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/hearts.png b/assets/wallpapers/minimalistic/hearts.png
deleted file mode 100644
index 6c07ab4..0000000
Binary files a/assets/wallpapers/minimalistic/hearts.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/lavender-cat.png b/assets/wallpapers/minimalistic/lavender-cat.png
deleted file mode 100644
index db00183..0000000
Binary files a/assets/wallpapers/minimalistic/lavender-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/list-aligned-left.png b/assets/wallpapers/minimalistic/list-aligned-left.png
deleted file mode 100644
index b002a47..0000000
Binary files a/assets/wallpapers/minimalistic/list-aligned-left.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/list-aligned-right.png b/assets/wallpapers/minimalistic/list-aligned-right.png
deleted file mode 100644
index b544d47..0000000
Binary files a/assets/wallpapers/minimalistic/list-aligned-right.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/list-horizontal.png b/assets/wallpapers/minimalistic/list-horizontal.png
deleted file mode 100644
index 478f5fd..0000000
Binary files a/assets/wallpapers/minimalistic/list-horizontal.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/magenta-cat.png b/assets/wallpapers/minimalistic/magenta-cat.png
deleted file mode 100644
index f062c83..0000000
Binary files a/assets/wallpapers/minimalistic/magenta-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/maroon-cat.png b/assets/wallpapers/minimalistic/maroon-cat.png
deleted file mode 100644
index e59e9c0..0000000
Binary files a/assets/wallpapers/minimalistic/maroon-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/peach-cat.png b/assets/wallpapers/minimalistic/peach-cat.png
deleted file mode 100644
index b92ad66..0000000
Binary files a/assets/wallpapers/minimalistic/peach-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/peach_unicat.png b/assets/wallpapers/minimalistic/peach_unicat.png
deleted file mode 100644
index 50b5dba..0000000
Binary files a/assets/wallpapers/minimalistic/peach_unicat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/pink-cat.png b/assets/wallpapers/minimalistic/pink-cat.png
deleted file mode 100644
index 66cf7c8..0000000
Binary files a/assets/wallpapers/minimalistic/pink-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/pink_unicat.png b/assets/wallpapers/minimalistic/pink_unicat.png
deleted file mode 100644
index cc2c317..0000000
Binary files a/assets/wallpapers/minimalistic/pink_unicat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/red-cat.png b/assets/wallpapers/minimalistic/red-cat.png
deleted file mode 100644
index 5e91f2d..0000000
Binary files a/assets/wallpapers/minimalistic/red-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/red_unicat.png b/assets/wallpapers/minimalistic/red_unicat.png
deleted file mode 100644
index 25888a5..0000000
Binary files a/assets/wallpapers/minimalistic/red_unicat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/romb.png b/assets/wallpapers/minimalistic/romb.png
deleted file mode 100644
index f69c1ed..0000000
Binary files a/assets/wallpapers/minimalistic/romb.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/rosewater-cat.png b/assets/wallpapers/minimalistic/rosewater-cat.png
deleted file mode 100644
index a8d30cd..0000000
Binary files a/assets/wallpapers/minimalistic/rosewater-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/sky-cat.png b/assets/wallpapers/minimalistic/sky-cat.png
deleted file mode 100644
index f1db318..0000000
Binary files a/assets/wallpapers/minimalistic/sky-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/sports.png b/assets/wallpapers/minimalistic/sports.png
deleted file mode 100644
index 188cd63..0000000
Binary files a/assets/wallpapers/minimalistic/sports.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/teal-cat.png b/assets/wallpapers/minimalistic/teal-cat.png
deleted file mode 100644
index 4a327ec..0000000
Binary files a/assets/wallpapers/minimalistic/teal-cat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/teal_unicat.png b/assets/wallpapers/minimalistic/teal_unicat.png
deleted file mode 100644
index 169bcbb..0000000
Binary files a/assets/wallpapers/minimalistic/teal_unicat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/tetris.png b/assets/wallpapers/minimalistic/tetris.png
deleted file mode 100644
index 0d09679..0000000
Binary files a/assets/wallpapers/minimalistic/tetris.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/unicat.png b/assets/wallpapers/minimalistic/unicat.png
deleted file mode 100644
index ef1852d..0000000
Binary files a/assets/wallpapers/minimalistic/unicat.png and /dev/null differ
diff --git a/assets/wallpapers/minimalistic/yellow-cat.png b/assets/wallpapers/minimalistic/yellow-cat.png
deleted file mode 100644
index 9cf2382..0000000
Binary files a/assets/wallpapers/minimalistic/yellow-cat.png and /dev/null differ
diff --git a/assets/wallpapers/a_river_running_through_a_valley.png b/assets/wallpapers/river.png
similarity index 100%
rename from assets/wallpapers/a_river_running_through_a_valley.png
rename to assets/wallpapers/river.png
diff --git a/assets/wallpapers/mafu_trad_wall.png b/assets/wallpapers/skullgirl.png
similarity index 100%
rename from assets/wallpapers/mafu_trad_wall.png
rename to assets/wallpapers/skullgirl.png
diff --git a/hosts/default.nix b/hosts/default.nix
index af0610a..21141f7 100644
--- a/hosts/default.nix
+++ b/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
];
};
-
}
diff --git a/hosts/vali/temperance/programs.nix b/hosts/vali/temperance/programs.nix
index 50e29e3..3e73711 100644
--- a/hosts/vali/temperance/programs.nix
+++ b/hosts/vali/temperance/programs.nix
@@ -64,7 +64,6 @@ in {
nicotine-plus
nil
nitch
- nixfmt
nixpkgs-wayland.swww
nmap
notesnook
diff --git a/modules/cli/fish.nix b/modules/cli/fish.nix
index 831bcde..9210074 100644
--- a/modules/cli/fish.nix
+++ b/modules/cli/fish.nix
@@ -6,10 +6,8 @@
}:
with lib; let
cfg = config.modules.programs.fish;
- username = config.modules.other.system.username;
- # not needed because I'm using nh os switch
- # hostname = config.modules.other.system.hostname;
- gitPath = config.modules.other.system.gitPath;
+ inherit (config.modules.other.system) username;
+ inherit (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.zoxide.enableFishIntegration = true;
- programs.fish = {
- enable = true;
- interactiveShellInit = "set fish_greeting";
- plugins = [
- {
- name = "grc";
- src = pkgs.fishPlugins.grc.src;
- }
- {
- name = "sponge";
- src = pkgs.fishPlugins.sponge.src;
- }
- {
- name = "done";
- src = pkgs.fishPlugins.done.src;
- }
- {
- name = "colored_man_pages";
- src = pkgs.fishPlugins.colored-man-pages.src;
- }
- {
- name = "tide";
- src = pkgs.fishPlugins.tide.src;
- }
- ];
- shellAbbrs =
- {
- c = "clear";
- cc = "cd ~ && clear";
- mv = "mv -iv";
- rm = "trash -v";
- ls = "eza --icons";
- l = "eza -a --icons";
- la = "eza -lha --icons --git";
- kys = "shutdown now";
- lg = "lazygit";
- cd = "z";
- v = "nvim";
- h = "hx";
- k = "kak";
- e = "emacs";
- update = ''nh os switch "${gitPath}"'';
- flake = "cd '${gitPath}'";
- }
- // cfg.extraAliases;
+ programs = {
+ zoxide.enable = true;
+ zoxide.enableFishIntegration = true;
+ fish = {
+ enable = true;
+ interactiveShellInit = "set fish_greeting";
+ plugins = [
+ {
+ name = "grc";
+ inherit (pkgs.fishPlugins.grc) src;
+ }
+ {
+ name = "sponge";
+ inherit (pkgs.fishPlugins.sponge) src;
+ }
+ {
+ name = "done";
+ inherit (pkgs.fishPlugins.done) src;
+ }
+ {
+ name = "colored_man_pages";
+ inherit (pkgs.fishPlugins.colored-man-pages) src;
+ }
+ {
+ name = "tide";
+ inherit (pkgs.fishPlugins.tide) src;
+ }
+ ];
+ shellAbbrs =
+ {
+ c = "clear";
+ cc = "cd ~ && clear";
+ mv = "mv -iv";
+ rm = "trash -v";
+ ls = "eza --icons";
+ l = "eza -a --icons";
+ la = "eza -lha --icons --git";
+ kys = "shutdown now";
+ lg = "lazygit";
+ cd = "z";
+ v = "nvim";
+ h = "hx";
+ k = "kak";
+ e = "emacs";
+ update = ''nh os switch "${gitPath}"'';
+ flake = "cd '${gitPath}'";
+ }
+ // cfg.extraAliases;
+ };
};
};
};
diff --git a/modules/editors/nixvim/nixvim.nix b/modules/editors/nixvim/nixvim.nix
index acba402..1faa1e7 100644
--- a/modules/editors/nixvim/nixvim.nix
+++ b/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
diff --git a/modules/services/ssh.nix b/modules/services/ssh.nix
index 8bfdf82..28b6022 100644
--- a/modules/services/ssh.nix
+++ b/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";
diff --git a/options/common/bluetooth.nix b/options/common/bluetooth.nix
index 71ff814..f08d5aa 100644
--- a/options/common/bluetooth.nix
+++ b/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;
diff --git a/options/common/gpu/nvidia.nix b/options/common/gpu/nvidia.nix
index 21dcdf7..eef863d 100644
--- a/options/common/gpu/nvidia.nix
+++ b/options/common/gpu/nvidia.nix
@@ -1,7 +1,6 @@
{
pkgs,
config,
- inputs,
...
}: {
services.xserver.videoDrivers = ["nvidia"];
diff --git a/options/common/networking.nix b/options/common/networking.nix
index 481a8b5..6af7452 100644
--- a/options/common/networking.nix
+++ b/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 = {