From e228035134c226b4265d7458c8c45b724d9139bf Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Mon, 19 Jan 2026 12:40:30 -0500 Subject: [PATCH] refactor home/tiling refactor home/terminal refactor home/apps refactor home/services refactor home/games --- flake.nix | 21 ++++++------------- home/apps/default.nix | 8 +++++++ .../discord/default.nix => apps/discord.nix} | 0 .../default.nix => apps/librewolf.nix} | 2 +- .../librewolf_css}/theme/hide.css | 0 .../librewolf_css}/theme/theme.css | 0 .../librewolf_css}/userChrome.css | 0 .../mpv/default.nix => apps/mpv.nix} | 0 home/{graphical/discord => apps}/vencord.nix | 0 home/{vscode/default.nix => apps/vscode.nix} | 0 home/games/default.nix | 6 ++++++ .../{minecraft/default.nix => minecraft.nix} | 0 .../{morrowind/default.nix => morrowind.nix} | 0 home/{theming => services}/default.nix | 6 +++++- home/{theming => services}/gtk.nix | 0 home/{theming => services}/qt.nix | 0 .../default.nix => services/systemd.nix} | 0 home/terminal/{btop => }/btop.conf | 0 home/terminal/{btop/default.nix => btop.nix} | 0 home/terminal/default.nix | 8 +++++++ home/terminal/{fish/default.nix => fish.nix} | 8 +++---- .../fish-prompt.fish | 0 .../kitty-ssh.fish | 0 .../functions => fish_functions}/logout.fish | 0 .../nix-shell.fish | 0 .../terminal/{kitty/default.nix => kitty.nix} | 0 .../terminal/{nvim/default.nix => neovim.nix} | 0 home/tiling/{niri => }/default.nix | 1 + home/tiling/{niri => }/niri.nix | 0 home/tiling/{niri => }/noctalia.nix | 0 .../{wallpaper/default.nix => wallpaper.nix} | 0 31 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 home/apps/default.nix rename home/{graphical/discord/default.nix => apps/discord.nix} (100%) rename home/{graphical/firefox/default.nix => apps/librewolf.nix} (99%) rename home/{graphical/firefox/chrome => apps/librewolf_css}/theme/hide.css (100%) rename home/{graphical/firefox/chrome => apps/librewolf_css}/theme/theme.css (100%) rename home/{graphical/firefox/chrome => apps/librewolf_css}/userChrome.css (100%) rename home/{graphical/mpv/default.nix => apps/mpv.nix} (100%) rename home/{graphical/discord => apps}/vencord.nix (100%) rename home/{vscode/default.nix => apps/vscode.nix} (100%) create mode 100644 home/games/default.nix rename home/games/{minecraft/default.nix => minecraft.nix} (100%) rename home/games/{morrowind/default.nix => morrowind.nix} (100%) rename home/{theming => services}/default.nix (95%) rename home/{theming => services}/gtk.nix (100%) rename home/{theming => services}/qt.nix (100%) rename home/{systemd/default.nix => services/systemd.nix} (100%) rename home/terminal/{btop => }/btop.conf (100%) rename home/terminal/{btop/default.nix => btop.nix} (100%) create mode 100644 home/terminal/default.nix rename home/terminal/{fish/default.nix => fish.nix} (82%) rename home/terminal/{fish/functions => fish_functions}/fish-prompt.fish (100%) rename home/terminal/{fish/functions => fish_functions}/kitty-ssh.fish (100%) rename home/terminal/{fish/functions => fish_functions}/logout.fish (100%) rename home/terminal/{fish/functions => fish_functions}/nix-shell.fish (100%) rename home/terminal/{kitty/default.nix => kitty.nix} (100%) rename home/terminal/{nvim/default.nix => neovim.nix} (100%) rename home/tiling/{niri => }/default.nix (94%) rename home/tiling/{niri => }/niri.nix (100%) rename home/tiling/{niri => }/noctalia.nix (100%) rename home/tiling/{wallpaper/default.nix => wallpaper.nix} (100%) diff --git a/flake.nix b/flake.nix index 5fd83f6..97e14ae 100644 --- a/flake.nix +++ b/flake.nix @@ -214,22 +214,13 @@ users.sckova = { imports = [ ./home - ./home/games/minecraft - ./home/games/morrowind - ./home/graphical/discord - ./home/graphical/firefox - ./home/graphical/mpv - ./home/tiling/niri - ./home/tiling/wallpaper - ./home/systemd - ./home/terminal/btop - ./home/terminal/fish - ./home/terminal/kitty - ./home/terminal/nvim - ./home/kde - ./home/theming - ./home/vscode + ./home/apps + ./home/games ./home/hosts/${hostname} + ./home/kde + ./home/services + ./home/terminal + ./home/tiling ]; }; sharedModules = [ diff --git a/home/apps/default.nix b/home/apps/default.nix new file mode 100644 index 0000000..863e312 --- /dev/null +++ b/home/apps/default.nix @@ -0,0 +1,8 @@ +{ + imports = [ + ./discord.nix + ./librewolf.nix + ./mpv.nix + ./vscode.nix + ]; +} diff --git a/home/graphical/discord/default.nix b/home/apps/discord.nix similarity index 100% rename from home/graphical/discord/default.nix rename to home/apps/discord.nix diff --git a/home/graphical/firefox/default.nix b/home/apps/librewolf.nix similarity index 99% rename from home/graphical/firefox/default.nix rename to home/apps/librewolf.nix index cf91304..c159216 100644 --- a/home/graphical/firefox/default.nix +++ b/home/apps/librewolf.nix @@ -6,7 +6,7 @@ ... }: { home.file.".librewolf/default/chrome/" = { - source = ./chrome; + source = ./librewolf_css; force = true; recursive = true; }; diff --git a/home/graphical/firefox/chrome/theme/hide.css b/home/apps/librewolf_css/theme/hide.css similarity index 100% rename from home/graphical/firefox/chrome/theme/hide.css rename to home/apps/librewolf_css/theme/hide.css diff --git a/home/graphical/firefox/chrome/theme/theme.css b/home/apps/librewolf_css/theme/theme.css similarity index 100% rename from home/graphical/firefox/chrome/theme/theme.css rename to home/apps/librewolf_css/theme/theme.css diff --git a/home/graphical/firefox/chrome/userChrome.css b/home/apps/librewolf_css/userChrome.css similarity index 100% rename from home/graphical/firefox/chrome/userChrome.css rename to home/apps/librewolf_css/userChrome.css diff --git a/home/graphical/mpv/default.nix b/home/apps/mpv.nix similarity index 100% rename from home/graphical/mpv/default.nix rename to home/apps/mpv.nix diff --git a/home/graphical/discord/vencord.nix b/home/apps/vencord.nix similarity index 100% rename from home/graphical/discord/vencord.nix rename to home/apps/vencord.nix diff --git a/home/vscode/default.nix b/home/apps/vscode.nix similarity index 100% rename from home/vscode/default.nix rename to home/apps/vscode.nix diff --git a/home/games/default.nix b/home/games/default.nix new file mode 100644 index 0000000..c7da03f --- /dev/null +++ b/home/games/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./minecraft.nix + ./morrowind.nix + ]; +} diff --git a/home/games/minecraft/default.nix b/home/games/minecraft.nix similarity index 100% rename from home/games/minecraft/default.nix rename to home/games/minecraft.nix diff --git a/home/games/morrowind/default.nix b/home/games/morrowind.nix similarity index 100% rename from home/games/morrowind/default.nix rename to home/games/morrowind.nix diff --git a/home/theming/default.nix b/home/services/default.nix similarity index 95% rename from home/theming/default.nix rename to home/services/default.nix index 84949bd..4562f44 100644 --- a/home/theming/default.nix +++ b/home/services/default.nix @@ -3,7 +3,11 @@ pkgs, ... }: { - imports = [./gtk.nix ./qt.nix]; + imports = [ + ./gtk.nix + ./qt.nix + ./systemd.nix + ]; home.file = { ".icons/default/index.theme" = { diff --git a/home/theming/gtk.nix b/home/services/gtk.nix similarity index 100% rename from home/theming/gtk.nix rename to home/services/gtk.nix diff --git a/home/theming/qt.nix b/home/services/qt.nix similarity index 100% rename from home/theming/qt.nix rename to home/services/qt.nix diff --git a/home/systemd/default.nix b/home/services/systemd.nix similarity index 100% rename from home/systemd/default.nix rename to home/services/systemd.nix diff --git a/home/terminal/btop/btop.conf b/home/terminal/btop.conf similarity index 100% rename from home/terminal/btop/btop.conf rename to home/terminal/btop.conf diff --git a/home/terminal/btop/default.nix b/home/terminal/btop.nix similarity index 100% rename from home/terminal/btop/default.nix rename to home/terminal/btop.nix diff --git a/home/terminal/default.nix b/home/terminal/default.nix new file mode 100644 index 0000000..379f1df --- /dev/null +++ b/home/terminal/default.nix @@ -0,0 +1,8 @@ +{ + imports = [ + ./btop.nix + ./fish.nix + ./kitty.nix + ./neovim.nix + ]; +} diff --git a/home/terminal/fish/default.nix b/home/terminal/fish.nix similarity index 82% rename from home/terminal/fish/default.nix rename to home/terminal/fish.nix index 2792c57..a8d1944 100644 --- a/home/terminal/fish/default.nix +++ b/home/terminal/fish.nix @@ -25,19 +25,19 @@ functions = { fish_prompt = { description = "Write out the prompt"; - body = builtins.readFile ./functions/fish-prompt.fish; + body = builtins.readFile ./fish_functions/fish-prompt.fish; }; kitty-ssh = { description = "Integrate Kitten SSH with Fish"; - body = builtins.readFile ./functions/kitty-ssh.fish; + body = builtins.readFile ./fish_functions/kitty-ssh.fish; }; nix-shell = { description = "Wrapper for nix-shell that runs fish by default"; - body = builtins.readFile ./functions/nix-shell.fish; + body = builtins.readFile ./fish_functions/nix-shell.fish; }; logout = { description = "Log out of KDE Plasma"; - body = builtins.readFile ./functions/logout.fish; + body = builtins.readFile ./fish_functions/logout.fish; }; }; }; diff --git a/home/terminal/fish/functions/fish-prompt.fish b/home/terminal/fish_functions/fish-prompt.fish similarity index 100% rename from home/terminal/fish/functions/fish-prompt.fish rename to home/terminal/fish_functions/fish-prompt.fish diff --git a/home/terminal/fish/functions/kitty-ssh.fish b/home/terminal/fish_functions/kitty-ssh.fish similarity index 100% rename from home/terminal/fish/functions/kitty-ssh.fish rename to home/terminal/fish_functions/kitty-ssh.fish diff --git a/home/terminal/fish/functions/logout.fish b/home/terminal/fish_functions/logout.fish similarity index 100% rename from home/terminal/fish/functions/logout.fish rename to home/terminal/fish_functions/logout.fish diff --git a/home/terminal/fish/functions/nix-shell.fish b/home/terminal/fish_functions/nix-shell.fish similarity index 100% rename from home/terminal/fish/functions/nix-shell.fish rename to home/terminal/fish_functions/nix-shell.fish diff --git a/home/terminal/kitty/default.nix b/home/terminal/kitty.nix similarity index 100% rename from home/terminal/kitty/default.nix rename to home/terminal/kitty.nix diff --git a/home/terminal/nvim/default.nix b/home/terminal/neovim.nix similarity index 100% rename from home/terminal/nvim/default.nix rename to home/terminal/neovim.nix diff --git a/home/tiling/niri/default.nix b/home/tiling/default.nix similarity index 94% rename from home/tiling/niri/default.nix rename to home/tiling/default.nix index 638c80e..5a0601c 100644 --- a/home/tiling/niri/default.nix +++ b/home/tiling/default.nix @@ -2,6 +2,7 @@ imports = [ ./niri.nix ./noctalia.nix + ./wallpaper.nix ]; home.packages = with pkgs; [ diff --git a/home/tiling/niri/niri.nix b/home/tiling/niri.nix similarity index 100% rename from home/tiling/niri/niri.nix rename to home/tiling/niri.nix diff --git a/home/tiling/niri/noctalia.nix b/home/tiling/noctalia.nix similarity index 100% rename from home/tiling/niri/noctalia.nix rename to home/tiling/noctalia.nix diff --git a/home/tiling/wallpaper/default.nix b/home/tiling/wallpaper.nix similarity index 100% rename from home/tiling/wallpaper/default.nix rename to home/tiling/wallpaper.nix