From 3c21245066a1685d4a3ec52a5b5bd6fdc82e7cbf Mon Sep 17 00:00:00 2001 From: serenity-F Date: Sat, 10 Jan 2026 13:23:54 +1000 Subject: [PATCH] restructured `home/programs` --- home/default.nix | 3 ++- home/desktop/default.nix | 3 +++ home/{programs => }/multimedia/default.nix | 1 + .../multimedia/music-production.nix | 0 home/{programs => }/multimedia/music.nix | 0 home/{programs => }/multimedia/obs.nix | 0 .../web/default.nix => multimedia/web.nix} | 0 home/programs/default.nix | 27 ------------------- home/{programs => scripts}/sync/default.nix | 0 .../sync/postActivation.nix | 0 .../btop/default.nix => terminal/btop.nix} | 0 home/terminal/default.nix | 14 ++++++++++ .../default.nix => terminal/fastfetch.nix} | 0 .../fish/default.nix => terminal/fish.nix} | 0 home/{programs => terminal}/git/default.nix | 0 home/{programs => terminal}/git/git.nix | 0 .../kitty/default.nix => terminal/kitty.nix} | 0 .../default.nix => terminal/neofetch.nix} | 0 home/{programs => terminal}/nvim/default.nix | 0 home/{programs => terminal}/nvim/keymaps.nix | 0 .../nvim/plugins/lsp.nix | 0 .../nvim/plugins/markdown.nix | 0 .../nvim/plugins/telescope.nix | 0 .../nvim/plugins/ui.nix | 0 .../nvim/plugins/utils.nix | 0 .../yazi/default.nix => terminal/yazi.nix} | 0 26 files changed, 20 insertions(+), 28 deletions(-) rename home/{programs => }/multimedia/default.nix (97%) rename home/{programs => }/multimedia/music-production.nix (100%) rename home/{programs => }/multimedia/music.nix (100%) rename home/{programs => }/multimedia/obs.nix (100%) rename home/{programs/web/default.nix => multimedia/web.nix} (100%) delete mode 100755 home/programs/default.nix rename home/{programs => scripts}/sync/default.nix (100%) rename home/{programs => scripts}/sync/postActivation.nix (100%) rename home/{programs/btop/default.nix => terminal/btop.nix} (100%) create mode 100644 home/terminal/default.nix rename home/{programs/fastfetch/default.nix => terminal/fastfetch.nix} (100%) rename home/{programs/fish/default.nix => terminal/fish.nix} (100%) rename home/{programs => terminal}/git/default.nix (100%) rename home/{programs => terminal}/git/git.nix (100%) rename home/{programs/kitty/default.nix => terminal/kitty.nix} (100%) rename home/{programs/fetch/default.nix => terminal/neofetch.nix} (100%) rename home/{programs => terminal}/nvim/default.nix (100%) rename home/{programs => terminal}/nvim/keymaps.nix (100%) rename home/{programs => terminal}/nvim/plugins/lsp.nix (100%) rename home/{programs => terminal}/nvim/plugins/markdown.nix (100%) rename home/{programs => terminal}/nvim/plugins/telescope.nix (100%) rename home/{programs => terminal}/nvim/plugins/ui.nix (100%) rename home/{programs => terminal}/nvim/plugins/utils.nix (100%) rename home/{programs/yazi/default.nix => terminal/yazi.nix} (100%) diff --git a/home/default.nix b/home/default.nix index af480af..36b688a 100755 --- a/home/default.nix +++ b/home/default.nix @@ -60,7 +60,8 @@ in { ## and then imported in this section. #./resources/theme ./desktop - ./programs + ./terminal + ./multimedia ./scripts ]; home = { diff --git a/home/desktop/default.nix b/home/desktop/default.nix index e63ddd9..3881a6e 100755 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -22,6 +22,9 @@ in { #./sway # WM #./noctalia.nix # Desktop shell + ## Import user theme(s) + ../resources/theme + ../resources/theme/SerenityOS.nix ]; systemd.user.startServices = "sd-switch"; # cant remember diff --git a/home/programs/multimedia/default.nix b/home/multimedia/default.nix similarity index 97% rename from home/programs/multimedia/default.nix rename to home/multimedia/default.nix index 3f82755..3482230 100644 --- a/home/programs/multimedia/default.nix +++ b/home/multimedia/default.nix @@ -3,6 +3,7 @@ { imports = [ + ./web.nix ./obs.nix ./music.nix ./music-production.nix diff --git a/home/programs/multimedia/music-production.nix b/home/multimedia/music-production.nix similarity index 100% rename from home/programs/multimedia/music-production.nix rename to home/multimedia/music-production.nix diff --git a/home/programs/multimedia/music.nix b/home/multimedia/music.nix similarity index 100% rename from home/programs/multimedia/music.nix rename to home/multimedia/music.nix diff --git a/home/programs/multimedia/obs.nix b/home/multimedia/obs.nix similarity index 100% rename from home/programs/multimedia/obs.nix rename to home/multimedia/obs.nix diff --git a/home/programs/web/default.nix b/home/multimedia/web.nix similarity index 100% rename from home/programs/web/default.nix rename to home/multimedia/web.nix diff --git a/home/programs/default.nix b/home/programs/default.nix deleted file mode 100755 index 9dba68a..0000000 --- a/home/programs/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, pkgs, ... }: - -{ - - imports = [ - - ## Import user themes - ../resources/theme - ../resources/theme/SerenityOS.nix - - ## Import shared program configs - ./web - ./git - ./sync - ./yazi - ./btop - ./fish - ./nvim - ./fetch - ./kitty - ./fastfetch - #./terminal - ./multimedia - - ]; - -} diff --git a/home/programs/sync/default.nix b/home/scripts/sync/default.nix similarity index 100% rename from home/programs/sync/default.nix rename to home/scripts/sync/default.nix diff --git a/home/programs/sync/postActivation.nix b/home/scripts/sync/postActivation.nix similarity index 100% rename from home/programs/sync/postActivation.nix rename to home/scripts/sync/postActivation.nix diff --git a/home/programs/btop/default.nix b/home/terminal/btop.nix similarity index 100% rename from home/programs/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..411017b --- /dev/null +++ b/home/terminal/default.nix @@ -0,0 +1,14 @@ +{ ... }: + +{ + imports = [ + ./git + ./nvim + ./yazi.nix + ./fish.nix + ./btop.nix + ./kitty.nix + ./neofetch.nix + ./fastfetch.nix + ]; +} diff --git a/home/programs/fastfetch/default.nix b/home/terminal/fastfetch.nix similarity index 100% rename from home/programs/fastfetch/default.nix rename to home/terminal/fastfetch.nix diff --git a/home/programs/fish/default.nix b/home/terminal/fish.nix similarity index 100% rename from home/programs/fish/default.nix rename to home/terminal/fish.nix diff --git a/home/programs/git/default.nix b/home/terminal/git/default.nix similarity index 100% rename from home/programs/git/default.nix rename to home/terminal/git/default.nix diff --git a/home/programs/git/git.nix b/home/terminal/git/git.nix similarity index 100% rename from home/programs/git/git.nix rename to home/terminal/git/git.nix diff --git a/home/programs/kitty/default.nix b/home/terminal/kitty.nix similarity index 100% rename from home/programs/kitty/default.nix rename to home/terminal/kitty.nix diff --git a/home/programs/fetch/default.nix b/home/terminal/neofetch.nix similarity index 100% rename from home/programs/fetch/default.nix rename to home/terminal/neofetch.nix diff --git a/home/programs/nvim/default.nix b/home/terminal/nvim/default.nix similarity index 100% rename from home/programs/nvim/default.nix rename to home/terminal/nvim/default.nix diff --git a/home/programs/nvim/keymaps.nix b/home/terminal/nvim/keymaps.nix similarity index 100% rename from home/programs/nvim/keymaps.nix rename to home/terminal/nvim/keymaps.nix diff --git a/home/programs/nvim/plugins/lsp.nix b/home/terminal/nvim/plugins/lsp.nix similarity index 100% rename from home/programs/nvim/plugins/lsp.nix rename to home/terminal/nvim/plugins/lsp.nix diff --git a/home/programs/nvim/plugins/markdown.nix b/home/terminal/nvim/plugins/markdown.nix similarity index 100% rename from home/programs/nvim/plugins/markdown.nix rename to home/terminal/nvim/plugins/markdown.nix diff --git a/home/programs/nvim/plugins/telescope.nix b/home/terminal/nvim/plugins/telescope.nix similarity index 100% rename from home/programs/nvim/plugins/telescope.nix rename to home/terminal/nvim/plugins/telescope.nix diff --git a/home/programs/nvim/plugins/ui.nix b/home/terminal/nvim/plugins/ui.nix similarity index 100% rename from home/programs/nvim/plugins/ui.nix rename to home/terminal/nvim/plugins/ui.nix diff --git a/home/programs/nvim/plugins/utils.nix b/home/terminal/nvim/plugins/utils.nix similarity index 100% rename from home/programs/nvim/plugins/utils.nix rename to home/terminal/nvim/plugins/utils.nix diff --git a/home/programs/yazi/default.nix b/home/terminal/yazi.nix similarity index 100% rename from home/programs/yazi/default.nix rename to home/terminal/yazi.nix