diff --git a/home/bin/default.nix b/home/bin/default.nix index e608cf97..d6729a11 100644 --- a/home/bin/default.nix +++ b/home/bin/default.nix @@ -1,13 +1,7 @@ { imports = [ # shared apps - ./browsers - ./discord - ./utility - ./alacritty - ./foot ./neovim - ./kitty - ./yazi + ./waybar ]; } diff --git a/home/etc/hyprland/cnst/cfg/appearance.nix b/home/bin/hyprland/cnst/cfg/appearance.nix similarity index 100% rename from home/etc/hyprland/cnst/cfg/appearance.nix rename to home/bin/hyprland/cnst/cfg/appearance.nix diff --git a/home/etc/hyprland/cnst/cfg/default.nix b/home/bin/hyprland/cnst/cfg/default.nix similarity index 100% rename from home/etc/hyprland/cnst/cfg/default.nix rename to home/bin/hyprland/cnst/cfg/default.nix diff --git a/home/etc/hyprland/cnst/cfg/inputs.nix b/home/bin/hyprland/cnst/cfg/inputs.nix similarity index 100% rename from home/etc/hyprland/cnst/cfg/inputs.nix rename to home/bin/hyprland/cnst/cfg/inputs.nix diff --git a/home/etc/hyprland/cnst/cfg/keybinds.nix b/home/bin/hyprland/cnst/cfg/keybinds.nix similarity index 100% rename from home/etc/hyprland/cnst/cfg/keybinds.nix rename to home/bin/hyprland/cnst/cfg/keybinds.nix diff --git a/home/etc/hyprland/cnst/cfg/rules.nix b/home/bin/hyprland/cnst/cfg/rules.nix similarity index 100% rename from home/etc/hyprland/cnst/cfg/rules.nix rename to home/bin/hyprland/cnst/cfg/rules.nix diff --git a/home/etc/hyprland/cnst/cfg/startup.nix b/home/bin/hyprland/cnst/cfg/startup.nix similarity index 100% rename from home/etc/hyprland/cnst/cfg/startup.nix rename to home/bin/hyprland/cnst/cfg/startup.nix diff --git a/home/etc/hyprland/cnst/default.nix b/home/bin/hyprland/cnst/default.nix similarity index 100% rename from home/etc/hyprland/cnst/default.nix rename to home/bin/hyprland/cnst/default.nix diff --git a/home/etc/hyprland/toothpick/cfg/appearance.nix b/home/bin/hyprland/toothpick/cfg/appearance.nix similarity index 100% rename from home/etc/hyprland/toothpick/cfg/appearance.nix rename to home/bin/hyprland/toothpick/cfg/appearance.nix diff --git a/home/etc/hyprland/toothpick/cfg/default.nix b/home/bin/hyprland/toothpick/cfg/default.nix similarity index 100% rename from home/etc/hyprland/toothpick/cfg/default.nix rename to home/bin/hyprland/toothpick/cfg/default.nix diff --git a/home/etc/hyprland/toothpick/cfg/inputs.nix b/home/bin/hyprland/toothpick/cfg/inputs.nix similarity index 100% rename from home/etc/hyprland/toothpick/cfg/inputs.nix rename to home/bin/hyprland/toothpick/cfg/inputs.nix diff --git a/home/etc/hyprland/toothpick/cfg/keybinds.nix b/home/bin/hyprland/toothpick/cfg/keybinds.nix similarity index 100% rename from home/etc/hyprland/toothpick/cfg/keybinds.nix rename to home/bin/hyprland/toothpick/cfg/keybinds.nix diff --git a/home/etc/hyprland/toothpick/cfg/rules.nix b/home/bin/hyprland/toothpick/cfg/rules.nix similarity index 100% rename from home/etc/hyprland/toothpick/cfg/rules.nix rename to home/bin/hyprland/toothpick/cfg/rules.nix diff --git a/home/etc/hyprland/toothpick/cfg/startup.nix b/home/bin/hyprland/toothpick/cfg/startup.nix similarity index 100% rename from home/etc/hyprland/toothpick/cfg/startup.nix rename to home/bin/hyprland/toothpick/cfg/startup.nix diff --git a/home/etc/hyprland/toothpick/default.nix b/home/bin/hyprland/toothpick/default.nix similarity index 100% rename from home/etc/hyprland/toothpick/default.nix rename to home/bin/hyprland/toothpick/default.nix diff --git a/home/etc/neovim/autocommands.nix b/home/bin/neovim/autocommands.nix similarity index 100% rename from home/etc/neovim/autocommands.nix rename to home/bin/neovim/autocommands.nix diff --git a/home/etc/neovim/completion.nix b/home/bin/neovim/completion.nix similarity index 100% rename from home/etc/neovim/completion.nix rename to home/bin/neovim/completion.nix diff --git a/home/etc/neovim/default.nix b/home/bin/neovim/default.nix similarity index 100% rename from home/etc/neovim/default.nix rename to home/bin/neovim/default.nix diff --git a/home/etc/neovim/keymappings.nix b/home/bin/neovim/keymappings.nix similarity index 100% rename from home/etc/neovim/keymappings.nix rename to home/bin/neovim/keymappings.nix diff --git a/home/etc/neovim/options.nix b/home/bin/neovim/options.nix similarity index 100% rename from home/etc/neovim/options.nix rename to home/bin/neovim/options.nix diff --git a/home/etc/neovim/plugins/barbar.nix b/home/bin/neovim/plugins/barbar.nix similarity index 100% rename from home/etc/neovim/plugins/barbar.nix rename to home/bin/neovim/plugins/barbar.nix diff --git a/home/etc/neovim/plugins/comment.nix b/home/bin/neovim/plugins/comment.nix similarity index 100% rename from home/etc/neovim/plugins/comment.nix rename to home/bin/neovim/plugins/comment.nix diff --git a/home/etc/neovim/plugins/conform.nix b/home/bin/neovim/plugins/conform.nix similarity index 100% rename from home/etc/neovim/plugins/conform.nix rename to home/bin/neovim/plugins/conform.nix diff --git a/home/etc/neovim/plugins/default.nix b/home/bin/neovim/plugins/default.nix similarity index 100% rename from home/etc/neovim/plugins/default.nix rename to home/bin/neovim/plugins/default.nix diff --git a/home/etc/neovim/plugins/efm.nix b/home/bin/neovim/plugins/efm.nix similarity index 100% rename from home/etc/neovim/plugins/efm.nix rename to home/bin/neovim/plugins/efm.nix diff --git a/home/etc/neovim/plugins/floaterm.nix b/home/bin/neovim/plugins/floaterm.nix similarity index 100% rename from home/etc/neovim/plugins/floaterm.nix rename to home/bin/neovim/plugins/floaterm.nix diff --git a/home/etc/neovim/plugins/harpoon.nix b/home/bin/neovim/plugins/harpoon.nix similarity index 100% rename from home/etc/neovim/plugins/harpoon.nix rename to home/bin/neovim/plugins/harpoon.nix diff --git a/home/etc/neovim/plugins/lsp.nix b/home/bin/neovim/plugins/lsp.nix similarity index 100% rename from home/etc/neovim/plugins/lsp.nix rename to home/bin/neovim/plugins/lsp.nix diff --git a/home/etc/neovim/plugins/lualine.nix b/home/bin/neovim/plugins/lualine.nix similarity index 100% rename from home/etc/neovim/plugins/lualine.nix rename to home/bin/neovim/plugins/lualine.nix diff --git a/home/etc/neovim/plugins/markdown-preview.nix b/home/bin/neovim/plugins/markdown-preview.nix similarity index 100% rename from home/etc/neovim/plugins/markdown-preview.nix rename to home/bin/neovim/plugins/markdown-preview.nix diff --git a/home/etc/neovim/plugins/neo-tree.nix b/home/bin/neovim/plugins/neo-tree.nix similarity index 100% rename from home/etc/neovim/plugins/neo-tree.nix rename to home/bin/neovim/plugins/neo-tree.nix diff --git a/home/etc/neovim/plugins/nonels.nix b/home/bin/neovim/plugins/nonels.nix similarity index 100% rename from home/etc/neovim/plugins/nonels.nix rename to home/bin/neovim/plugins/nonels.nix diff --git a/home/etc/neovim/plugins/startify.nix b/home/bin/neovim/plugins/startify.nix similarity index 100% rename from home/etc/neovim/plugins/startify.nix rename to home/bin/neovim/plugins/startify.nix diff --git a/home/etc/neovim/plugins/tagbar.nix b/home/bin/neovim/plugins/tagbar.nix similarity index 100% rename from home/etc/neovim/plugins/tagbar.nix rename to home/bin/neovim/plugins/tagbar.nix diff --git a/home/etc/neovim/plugins/telescope.nix b/home/bin/neovim/plugins/telescope.nix similarity index 100% rename from home/etc/neovim/plugins/telescope.nix rename to home/bin/neovim/plugins/telescope.nix diff --git a/home/etc/neovim/plugins/treesitter.nix b/home/bin/neovim/plugins/treesitter.nix similarity index 100% rename from home/etc/neovim/plugins/treesitter.nix rename to home/bin/neovim/plugins/treesitter.nix diff --git a/home/etc/neovim/plugins/vimtex.nix b/home/bin/neovim/plugins/vimtex.nix similarity index 100% rename from home/etc/neovim/plugins/vimtex.nix rename to home/bin/neovim/plugins/vimtex.nix diff --git a/home/etc/neovim/plugins/yanky.nix b/home/bin/neovim/plugins/yanky.nix similarity index 100% rename from home/etc/neovim/plugins/yanky.nix rename to home/bin/neovim/plugins/yanky.nix diff --git a/home/etc/neovim/todo.nix b/home/bin/neovim/todo.nix similarity index 100% rename from home/etc/neovim/todo.nix rename to home/bin/neovim/todo.nix diff --git a/home/etc/waybar/default.nix b/home/bin/waybar/default.nix similarity index 100% rename from home/etc/waybar/default.nix rename to home/bin/waybar/default.nix diff --git a/home/default.nix b/home/default.nix index 28d259fc..ff6dc5b4 100644 --- a/home/default.nix +++ b/home/default.nix @@ -10,9 +10,10 @@ "cnst@cnix" = [ ./usr/share/git/cnst ./usr/share/shell/cnst - ./etc/hyprland/cnst + ./bin/hyprland/cnst ./etc ./bin + ./opt ./srv ./profiles/cnst ]; @@ -22,15 +23,17 @@ ./etc/hyprland/cnst ./etc ./bin + ./opt ./srv ./profiles/adam ]; "toothpick@toothpc" = [ ./usr/share/git/toothpick ./usr/share/shell/toothpick - ./etc/hyprland/toothpick + ./bin/hyprland/toothpick ./etc ./bin + ./opt ./srv ./profiles/toothpick ]; diff --git a/home/etc/default.nix b/home/etc/default.nix index b256e4c0..50a01610 100644 --- a/home/etc/default.nix +++ b/home/etc/default.nix @@ -3,8 +3,6 @@ # shared imports ./dconf ./gtk - ./neovim - ./waybar ./xdg ]; } diff --git a/home/bin/ags/.gitignore b/home/opt/ags/.gitignore similarity index 100% rename from home/bin/ags/.gitignore rename to home/opt/ags/.gitignore diff --git a/home/bin/ags/default.nix b/home/opt/ags/default.nix similarity index 100% rename from home/bin/ags/default.nix rename to home/opt/ags/default.nix diff --git a/home/bin/alacritty/default.nix b/home/opt/alacritty/default.nix similarity index 100% rename from home/bin/alacritty/default.nix rename to home/opt/alacritty/default.nix diff --git a/home/bin/anyrun/default.nix b/home/opt/anyrun/default.nix similarity index 100% rename from home/bin/anyrun/default.nix rename to home/opt/anyrun/default.nix diff --git a/home/bin/browsers/default.nix b/home/opt/browsers/default.nix similarity index 100% rename from home/bin/browsers/default.nix rename to home/opt/browsers/default.nix diff --git a/home/opt/default.nix b/home/opt/default.nix new file mode 100644 index 00000000..298edbe2 --- /dev/null +++ b/home/opt/default.nix @@ -0,0 +1,12 @@ +{ + imports = [ + # shared apps + ./browsers + ./discord + ./utility + ./alacritty + ./foot + ./kitty + ./yazi + ]; +} diff --git a/home/bin/discord/default.nix b/home/opt/discord/default.nix similarity index 100% rename from home/bin/discord/default.nix rename to home/opt/discord/default.nix diff --git a/home/bin/foot/default.nix b/home/opt/foot/default.nix similarity index 100% rename from home/bin/foot/default.nix rename to home/opt/foot/default.nix diff --git a/home/bin/kitty/default.nix b/home/opt/kitty/default.nix similarity index 100% rename from home/bin/kitty/default.nix rename to home/opt/kitty/default.nix diff --git a/home/bin/lutris/default.nix b/home/opt/lutris/default.nix similarity index 100% rename from home/bin/lutris/default.nix rename to home/opt/lutris/default.nix diff --git a/home/bin/mangohud/default.nix b/home/opt/mangohud/default.nix similarity index 100% rename from home/bin/mangohud/default.nix rename to home/opt/mangohud/default.nix diff --git a/home/bin/rofi/default.nix b/home/opt/rofi/default.nix similarity index 100% rename from home/bin/rofi/default.nix rename to home/opt/rofi/default.nix diff --git a/home/bin/utility/default.nix b/home/opt/utility/default.nix similarity index 100% rename from home/bin/utility/default.nix rename to home/opt/utility/default.nix diff --git a/home/bin/vscode/default.nix b/home/opt/vscode/default.nix similarity index 100% rename from home/bin/vscode/default.nix rename to home/opt/vscode/default.nix diff --git a/home/bin/wezterm/default.nix b/home/opt/wezterm/default.nix similarity index 100% rename from home/bin/wezterm/default.nix rename to home/opt/wezterm/default.nix diff --git a/home/bin/wezterm/default.nixbak b/home/opt/wezterm/default.nixbak similarity index 100% rename from home/bin/wezterm/default.nixbak rename to home/opt/wezterm/default.nixbak diff --git a/home/bin/yazi/default.nix b/home/opt/yazi/default.nix similarity index 100% rename from home/bin/yazi/default.nix rename to home/opt/yazi/default.nix diff --git a/home/bin/yazi/theme/filetype.nix b/home/opt/yazi/theme/filetype.nix similarity index 100% rename from home/bin/yazi/theme/filetype.nix rename to home/opt/yazi/theme/filetype.nix diff --git a/home/bin/yazi/theme/icons.nix b/home/opt/yazi/theme/icons.nix similarity index 100% rename from home/bin/yazi/theme/icons.nix rename to home/opt/yazi/theme/icons.nix diff --git a/home/bin/yazi/theme/manager.nix b/home/opt/yazi/theme/manager.nix similarity index 100% rename from home/bin/yazi/theme/manager.nix rename to home/opt/yazi/theme/manager.nix diff --git a/home/bin/yazi/theme/status.nix b/home/opt/yazi/theme/status.nix similarity index 100% rename from home/bin/yazi/theme/status.nix rename to home/opt/yazi/theme/status.nix diff --git a/home/bin/zellij/default.nix b/home/opt/zellij/default.nix similarity index 100% rename from home/bin/zellij/default.nix rename to home/opt/zellij/default.nix