From fc259dff4af83934f902bf91ffd1cb8cbdbcaf36 Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Mon, 31 Mar 2025 04:11:47 +0800 Subject: [PATCH] refactor: move configs around --- configs/default.nix | 11 ++----- configs/graphical.nix | 25 +++++++++++++++ configs/graphical/default.nix | 22 ------------- configs/{graphical => programs}/ags.nix | 0 configs/{graphical => programs}/ags/test | 0 configs/{shell => programs}/aichat.nix | 0 configs/{graphical => programs}/clipse.nix | 0 configs/{shell => programs}/comma.nix | 0 configs/{shell => programs}/direnv.nix | 0 configs/{graphical => programs}/dunst.nix | 0 configs/{shell => programs}/editorconfig.nix | 0 configs/{graphical => programs}/firefox.nix | 0 configs/{graphical => programs}/fuzzel.nix | 0 configs/{shell => programs}/fzf.nix | 0 configs/{graphical => programs}/getty.nix | 0 configs/{shell => programs}/git.nix | 0 configs/{graphical => programs}/hyprland.nix | 0 configs/{graphical => programs}/hyprlock.nix | 0 configs/{graphical => programs}/hyprshade.nix | 0 configs/{graphical => programs}/kitty.nix | 0 configs/{ => programs}/media/wallpaper.jpg | Bin configs/{shell => programs}/nh.nix | 0 configs/{shell => programs}/nvf.nix | 0 configs/{shell => programs}/nvf/input.nix | 0 configs/{shell => programs}/nvf/languages.nix | 0 configs/{shell => programs}/nvf/ui.nix | 0 configs/{shell => programs}/nvf/utilities.nix | 0 configs/{shell => programs}/scripts/byebye.sh | 0 .../{shell => programs}/scripts/default.nix | 0 configs/{shell => programs}/scripts/deploy.sh | 0 .../scripts/git-extract.py | 0 .../{shell => programs}/scripts/rebuild.sh | 0 configs/{graphical => programs}/spicetify.nix | 0 configs/{shell => programs}/starship.nix | 0 configs/{ => programs}/stylix.nix | 0 configs/{shell => programs}/tealdeer.nix | 0 .../themes/colourschemes/3024.nix | 0 .../themes/colourschemes/black-metal.nix | 0 .../themes/colourschemes/bright.nix | 0 .../themes/colourschemes/catppuccin-mocha.nix | 0 .../themes/colourschemes/darkviolet.nix | 0 .../themes/cursors/banana-cursor.nix | 0 .../{ => programs}/themes/fonts/0xProto.nix | 0 configs/{ => programs}/themes/fonts/3270.nix | 0 .../themes/fonts/sauce-code-pro.nix | 0 .../{ => programs}/themes/fonts/terminess.nix | 0 configs/{shell => programs}/yazi.nix | 0 .../{shell => programs}/yazi/starship.toml | 0 configs/{shell => programs}/zellij.nix | 0 configs/{shell => programs}/zoxide.nix | 0 configs/{shell => programs}/zsh.nix | 0 configs/{shell/default.nix => shell.nix} | 30 +++++++++--------- 52 files changed, 43 insertions(+), 45 deletions(-) create mode 100644 configs/graphical.nix delete mode 100644 configs/graphical/default.nix rename configs/{graphical => programs}/ags.nix (100%) rename configs/{graphical => programs}/ags/test (100%) rename configs/{shell => programs}/aichat.nix (100%) rename configs/{graphical => programs}/clipse.nix (100%) rename configs/{shell => programs}/comma.nix (100%) rename configs/{shell => programs}/direnv.nix (100%) rename configs/{graphical => programs}/dunst.nix (100%) rename configs/{shell => programs}/editorconfig.nix (100%) rename configs/{graphical => programs}/firefox.nix (100%) rename configs/{graphical => programs}/fuzzel.nix (100%) rename configs/{shell => programs}/fzf.nix (100%) rename configs/{graphical => programs}/getty.nix (100%) rename configs/{shell => programs}/git.nix (100%) rename configs/{graphical => programs}/hyprland.nix (100%) rename configs/{graphical => programs}/hyprlock.nix (100%) rename configs/{graphical => programs}/hyprshade.nix (100%) rename configs/{graphical => programs}/kitty.nix (100%) rename configs/{ => programs}/media/wallpaper.jpg (100%) rename configs/{shell => programs}/nh.nix (100%) rename configs/{shell => programs}/nvf.nix (100%) rename configs/{shell => programs}/nvf/input.nix (100%) rename configs/{shell => programs}/nvf/languages.nix (100%) rename configs/{shell => programs}/nvf/ui.nix (100%) rename configs/{shell => programs}/nvf/utilities.nix (100%) rename configs/{shell => programs}/scripts/byebye.sh (100%) rename configs/{shell => programs}/scripts/default.nix (100%) rename configs/{shell => programs}/scripts/deploy.sh (100%) rename configs/{shell => programs}/scripts/git-extract.py (100%) rename configs/{shell => programs}/scripts/rebuild.sh (100%) rename configs/{graphical => programs}/spicetify.nix (100%) rename configs/{shell => programs}/starship.nix (100%) rename configs/{ => programs}/stylix.nix (100%) rename configs/{shell => programs}/tealdeer.nix (100%) rename configs/{ => programs}/themes/colourschemes/3024.nix (100%) rename configs/{ => programs}/themes/colourschemes/black-metal.nix (100%) rename configs/{ => programs}/themes/colourschemes/bright.nix (100%) rename configs/{ => programs}/themes/colourschemes/catppuccin-mocha.nix (100%) rename configs/{ => programs}/themes/colourschemes/darkviolet.nix (100%) rename configs/{ => programs}/themes/cursors/banana-cursor.nix (100%) rename configs/{ => programs}/themes/fonts/0xProto.nix (100%) rename configs/{ => programs}/themes/fonts/3270.nix (100%) rename configs/{ => programs}/themes/fonts/sauce-code-pro.nix (100%) rename configs/{ => programs}/themes/fonts/terminess.nix (100%) rename configs/{shell => programs}/yazi.nix (100%) rename configs/{shell => programs}/yazi/starship.toml (100%) rename configs/{shell => programs}/zellij.nix (100%) rename configs/{shell => programs}/zoxide.nix (100%) rename configs/{shell => programs}/zsh.nix (100%) rename configs/{shell/default.nix => shell.nix} (69%) diff --git a/configs/default.nix b/configs/default.nix index 02caac1..549988e 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -12,22 +12,19 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ./boot.nix + ./bootloaders/systemd-boot.nix ./networking.nix ./nix-config.nix ./security.nix - ./shell + ./shell.nix ./users.nix ] # Options for graphical systems. (lib.optionals (type == "desktop") [ - ./graphical - ./hardware/audio.nix - ./hardware/bluetooth.nix - ./stylix.nix + ./graphical.nix ]) # Options for specific hostnames. (lib.optionals (hostname == "nemesis") [ - ./bootloaders/systemd-boot.nix ./filesystems/hw-nemesis.nix # (import ./filesystems/impermanence.nix { # inherit inputs lib; @@ -37,7 +34,6 @@ ./hardware/nvidia.nix ]) (lib.optionals (hostname == "mellinoe") [ - ./bootloaders/systemd-boot.nix (import ./filesystems/impermanence.nix { inherit inputs lib; device = "/dev/disk/by-id/nvme-eui.01000000000000008ce38e04019a68ab"; @@ -45,7 +41,6 @@ ./hardware/cpu_intel.nix ]) (lib.optionals (hostname == "apollo") [ - ./bootloaders/systemd-boot.nix (import ./filesystems/impermanence.nix { inherit inputs lib; device = "/dev/disk/by-id/nvme-eui.002538d221b47b01"; diff --git a/configs/graphical.nix b/configs/graphical.nix new file mode 100644 index 0000000..5f2181f --- /dev/null +++ b/configs/graphical.nix @@ -0,0 +1,25 @@ +{ pkgs, inputs, ... }: +{ + imports = [ + ./programs/ags.nix + ./programs/clipse.nix + ./programs/dunst.nix + ./programs/firefox.nix + ./programs/fuzzel.nix + ./programs/getty.nix + ./programs/hyprland.nix + ./programs/hyprlock.nix + ./programs/hyprshade.nix + ./programs/kitty.nix + ./programs/spicetify.nix + ./programs/stylix.nix + ./hardware/audio.nix + ./hardware/bluetooth.nix + ]; + + home-manager.users.rafiq.home.packages = with pkgs; [ + hyprpicker + inputs.hyprcloser.packages.${pkgs.stdenv.hostPlatform.system}.default + wl-clipboard # provides cli copy and paste commands + ]; +} diff --git a/configs/graphical/default.nix b/configs/graphical/default.nix deleted file mode 100644 index 012fa6b..0000000 --- a/configs/graphical/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs, inputs, ... }: -{ - imports = [ - ./ags.nix - ./clipse.nix - ./dunst.nix - ./firefox.nix - ./fuzzel.nix - ./getty.nix - ./hyprland.nix - ./hyprlock.nix - ./hyprshade.nix - ./kitty.nix - ./spicetify.nix - ]; - - home-manager.users.rafiq.home.packages = with pkgs; [ - hyprpicker - inputs.hyprcloser.packages.${pkgs.stdenv.hostPlatform.system}.default - wl-clipboard # provides cli copy and paste commands - ]; -} diff --git a/configs/graphical/ags.nix b/configs/programs/ags.nix similarity index 100% rename from configs/graphical/ags.nix rename to configs/programs/ags.nix diff --git a/configs/graphical/ags/test b/configs/programs/ags/test similarity index 100% rename from configs/graphical/ags/test rename to configs/programs/ags/test diff --git a/configs/shell/aichat.nix b/configs/programs/aichat.nix similarity index 100% rename from configs/shell/aichat.nix rename to configs/programs/aichat.nix diff --git a/configs/graphical/clipse.nix b/configs/programs/clipse.nix similarity index 100% rename from configs/graphical/clipse.nix rename to configs/programs/clipse.nix diff --git a/configs/shell/comma.nix b/configs/programs/comma.nix similarity index 100% rename from configs/shell/comma.nix rename to configs/programs/comma.nix diff --git a/configs/shell/direnv.nix b/configs/programs/direnv.nix similarity index 100% rename from configs/shell/direnv.nix rename to configs/programs/direnv.nix diff --git a/configs/graphical/dunst.nix b/configs/programs/dunst.nix similarity index 100% rename from configs/graphical/dunst.nix rename to configs/programs/dunst.nix diff --git a/configs/shell/editorconfig.nix b/configs/programs/editorconfig.nix similarity index 100% rename from configs/shell/editorconfig.nix rename to configs/programs/editorconfig.nix diff --git a/configs/graphical/firefox.nix b/configs/programs/firefox.nix similarity index 100% rename from configs/graphical/firefox.nix rename to configs/programs/firefox.nix diff --git a/configs/graphical/fuzzel.nix b/configs/programs/fuzzel.nix similarity index 100% rename from configs/graphical/fuzzel.nix rename to configs/programs/fuzzel.nix diff --git a/configs/shell/fzf.nix b/configs/programs/fzf.nix similarity index 100% rename from configs/shell/fzf.nix rename to configs/programs/fzf.nix diff --git a/configs/graphical/getty.nix b/configs/programs/getty.nix similarity index 100% rename from configs/graphical/getty.nix rename to configs/programs/getty.nix diff --git a/configs/shell/git.nix b/configs/programs/git.nix similarity index 100% rename from configs/shell/git.nix rename to configs/programs/git.nix diff --git a/configs/graphical/hyprland.nix b/configs/programs/hyprland.nix similarity index 100% rename from configs/graphical/hyprland.nix rename to configs/programs/hyprland.nix diff --git a/configs/graphical/hyprlock.nix b/configs/programs/hyprlock.nix similarity index 100% rename from configs/graphical/hyprlock.nix rename to configs/programs/hyprlock.nix diff --git a/configs/graphical/hyprshade.nix b/configs/programs/hyprshade.nix similarity index 100% rename from configs/graphical/hyprshade.nix rename to configs/programs/hyprshade.nix diff --git a/configs/graphical/kitty.nix b/configs/programs/kitty.nix similarity index 100% rename from configs/graphical/kitty.nix rename to configs/programs/kitty.nix diff --git a/configs/media/wallpaper.jpg b/configs/programs/media/wallpaper.jpg similarity index 100% rename from configs/media/wallpaper.jpg rename to configs/programs/media/wallpaper.jpg diff --git a/configs/shell/nh.nix b/configs/programs/nh.nix similarity index 100% rename from configs/shell/nh.nix rename to configs/programs/nh.nix diff --git a/configs/shell/nvf.nix b/configs/programs/nvf.nix similarity index 100% rename from configs/shell/nvf.nix rename to configs/programs/nvf.nix diff --git a/configs/shell/nvf/input.nix b/configs/programs/nvf/input.nix similarity index 100% rename from configs/shell/nvf/input.nix rename to configs/programs/nvf/input.nix diff --git a/configs/shell/nvf/languages.nix b/configs/programs/nvf/languages.nix similarity index 100% rename from configs/shell/nvf/languages.nix rename to configs/programs/nvf/languages.nix diff --git a/configs/shell/nvf/ui.nix b/configs/programs/nvf/ui.nix similarity index 100% rename from configs/shell/nvf/ui.nix rename to configs/programs/nvf/ui.nix diff --git a/configs/shell/nvf/utilities.nix b/configs/programs/nvf/utilities.nix similarity index 100% rename from configs/shell/nvf/utilities.nix rename to configs/programs/nvf/utilities.nix diff --git a/configs/shell/scripts/byebye.sh b/configs/programs/scripts/byebye.sh similarity index 100% rename from configs/shell/scripts/byebye.sh rename to configs/programs/scripts/byebye.sh diff --git a/configs/shell/scripts/default.nix b/configs/programs/scripts/default.nix similarity index 100% rename from configs/shell/scripts/default.nix rename to configs/programs/scripts/default.nix diff --git a/configs/shell/scripts/deploy.sh b/configs/programs/scripts/deploy.sh similarity index 100% rename from configs/shell/scripts/deploy.sh rename to configs/programs/scripts/deploy.sh diff --git a/configs/shell/scripts/git-extract.py b/configs/programs/scripts/git-extract.py similarity index 100% rename from configs/shell/scripts/git-extract.py rename to configs/programs/scripts/git-extract.py diff --git a/configs/shell/scripts/rebuild.sh b/configs/programs/scripts/rebuild.sh similarity index 100% rename from configs/shell/scripts/rebuild.sh rename to configs/programs/scripts/rebuild.sh diff --git a/configs/graphical/spicetify.nix b/configs/programs/spicetify.nix similarity index 100% rename from configs/graphical/spicetify.nix rename to configs/programs/spicetify.nix diff --git a/configs/shell/starship.nix b/configs/programs/starship.nix similarity index 100% rename from configs/shell/starship.nix rename to configs/programs/starship.nix diff --git a/configs/stylix.nix b/configs/programs/stylix.nix similarity index 100% rename from configs/stylix.nix rename to configs/programs/stylix.nix diff --git a/configs/shell/tealdeer.nix b/configs/programs/tealdeer.nix similarity index 100% rename from configs/shell/tealdeer.nix rename to configs/programs/tealdeer.nix diff --git a/configs/themes/colourschemes/3024.nix b/configs/programs/themes/colourschemes/3024.nix similarity index 100% rename from configs/themes/colourschemes/3024.nix rename to configs/programs/themes/colourschemes/3024.nix diff --git a/configs/themes/colourschemes/black-metal.nix b/configs/programs/themes/colourschemes/black-metal.nix similarity index 100% rename from configs/themes/colourschemes/black-metal.nix rename to configs/programs/themes/colourschemes/black-metal.nix diff --git a/configs/themes/colourschemes/bright.nix b/configs/programs/themes/colourschemes/bright.nix similarity index 100% rename from configs/themes/colourschemes/bright.nix rename to configs/programs/themes/colourschemes/bright.nix diff --git a/configs/themes/colourschemes/catppuccin-mocha.nix b/configs/programs/themes/colourschemes/catppuccin-mocha.nix similarity index 100% rename from configs/themes/colourschemes/catppuccin-mocha.nix rename to configs/programs/themes/colourschemes/catppuccin-mocha.nix diff --git a/configs/themes/colourschemes/darkviolet.nix b/configs/programs/themes/colourschemes/darkviolet.nix similarity index 100% rename from configs/themes/colourschemes/darkviolet.nix rename to configs/programs/themes/colourschemes/darkviolet.nix diff --git a/configs/themes/cursors/banana-cursor.nix b/configs/programs/themes/cursors/banana-cursor.nix similarity index 100% rename from configs/themes/cursors/banana-cursor.nix rename to configs/programs/themes/cursors/banana-cursor.nix diff --git a/configs/themes/fonts/0xProto.nix b/configs/programs/themes/fonts/0xProto.nix similarity index 100% rename from configs/themes/fonts/0xProto.nix rename to configs/programs/themes/fonts/0xProto.nix diff --git a/configs/themes/fonts/3270.nix b/configs/programs/themes/fonts/3270.nix similarity index 100% rename from configs/themes/fonts/3270.nix rename to configs/programs/themes/fonts/3270.nix diff --git a/configs/themes/fonts/sauce-code-pro.nix b/configs/programs/themes/fonts/sauce-code-pro.nix similarity index 100% rename from configs/themes/fonts/sauce-code-pro.nix rename to configs/programs/themes/fonts/sauce-code-pro.nix diff --git a/configs/themes/fonts/terminess.nix b/configs/programs/themes/fonts/terminess.nix similarity index 100% rename from configs/themes/fonts/terminess.nix rename to configs/programs/themes/fonts/terminess.nix diff --git a/configs/shell/yazi.nix b/configs/programs/yazi.nix similarity index 100% rename from configs/shell/yazi.nix rename to configs/programs/yazi.nix diff --git a/configs/shell/yazi/starship.toml b/configs/programs/yazi/starship.toml similarity index 100% rename from configs/shell/yazi/starship.toml rename to configs/programs/yazi/starship.toml diff --git a/configs/shell/zellij.nix b/configs/programs/zellij.nix similarity index 100% rename from configs/shell/zellij.nix rename to configs/programs/zellij.nix diff --git a/configs/shell/zoxide.nix b/configs/programs/zoxide.nix similarity index 100% rename from configs/shell/zoxide.nix rename to configs/programs/zoxide.nix diff --git a/configs/shell/zsh.nix b/configs/programs/zsh.nix similarity index 100% rename from configs/shell/zsh.nix rename to configs/programs/zsh.nix diff --git a/configs/shell/default.nix b/configs/shell.nix similarity index 69% rename from configs/shell/default.nix rename to configs/shell.nix index 3462ffe..53af400 100644 --- a/configs/shell/default.nix +++ b/configs/shell.nix @@ -1,21 +1,21 @@ { pkgs, config, ... }: { imports = [ - ./scripts - ./aichat.nix - ./comma.nix - ./direnv.nix - ./editorconfig.nix - ./fzf.nix - ./git.nix - ./nh.nix - ./nvf.nix - ./starship.nix - ./tealdeer.nix - ./yazi.nix - ./zellij.nix - ./zoxide.nix - ./zsh.nix + ./programs/scripts + ./programs/aichat.nix + ./programs/comma.nix + ./programs/direnv.nix + ./programs/editorconfig.nix + ./programs/fzf.nix + ./programs/git.nix + ./programs/nh.nix + ./programs/nvf.nix + ./programs/starship.nix + ./programs/tealdeer.nix + ./programs/yazi.nix + ./programs/zellij.nix + ./programs/zoxide.nix + ./programs/zsh.nix ]; environment.shellInit = # sh