From e181c1c4f3857294971db00a8de0686d8833dd54 Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Thu, 27 Mar 2025 02:00:31 +0800 Subject: [PATCH] refactor: move home manager modules around --- users/modules/de.nix | 13 -- users/modules/sh.nix | 152 ------------------ users/modules/utils.nix | 14 -- users/{modules => }/programs/ags.nix | 0 users/{modules => }/programs/ags/test | 0 users/{modules => }/programs/btop.nix | 0 users/{modules => }/programs/clipse.nix | 0 users/{modules => }/programs/comma.nix | 0 users/{modules => }/programs/direnv.nix | 0 users/{modules => }/programs/dunst.nix | 0 users/{modules => }/programs/firefox.nix | 0 users/{modules => }/programs/fuzzel.nix | 0 users/{modules => }/programs/fzf.nix | 0 users/{modules => }/programs/git.nix | 0 users/{modules => }/programs/hyprland.nix | 0 users/{modules => }/programs/hyprshade.nix | 0 users/{modules => }/programs/kitty.nix | 0 users/{modules => }/programs/nh.nix | 0 users/{modules => }/programs/nvf.nix | 0 users/{modules => }/programs/nvf/input.nix | 0 .../{modules => }/programs/nvf/languages.nix | 0 users/{modules => }/programs/nvf/ui.nix | 0 .../{modules => }/programs/nvf/utilities.nix | 0 users/{modules => }/programs/spicetify.nix | 0 users/{modules => }/programs/starship.nix | 0 users/{modules => }/programs/tealdeer.nix | 0 users/{modules => }/programs/thefuck.nix | 0 users/{modules => }/programs/tmux.nix | 0 users/{modules => }/programs/yazi.nix | 0 .../{modules => }/programs/yazi/starship.toml | 0 users/{modules => }/programs/zellij.nix | 0 users/{modules => }/programs/zoxide.nix | 0 users/{modules => }/programs/zsh.nix | 0 users/rafiq.nix | 68 +++++++- users/{modules => }/scripts/byebye.sh | 0 users/{modules => }/scripts/default.nix | 0 users/{modules => }/scripts/git-extract.py | 0 users/{modules => }/scripts/rebuild.sh | 0 38 files changed, 64 insertions(+), 183 deletions(-) delete mode 100644 users/modules/de.nix delete mode 100644 users/modules/sh.nix delete mode 100644 users/modules/utils.nix rename users/{modules => }/programs/ags.nix (100%) rename users/{modules => }/programs/ags/test (100%) rename users/{modules => }/programs/btop.nix (100%) rename users/{modules => }/programs/clipse.nix (100%) rename users/{modules => }/programs/comma.nix (100%) rename users/{modules => }/programs/direnv.nix (100%) rename users/{modules => }/programs/dunst.nix (100%) rename users/{modules => }/programs/firefox.nix (100%) rename users/{modules => }/programs/fuzzel.nix (100%) rename users/{modules => }/programs/fzf.nix (100%) rename users/{modules => }/programs/git.nix (100%) rename users/{modules => }/programs/hyprland.nix (100%) rename users/{modules => }/programs/hyprshade.nix (100%) rename users/{modules => }/programs/kitty.nix (100%) rename users/{modules => }/programs/nh.nix (100%) rename users/{modules => }/programs/nvf.nix (100%) rename users/{modules => }/programs/nvf/input.nix (100%) rename users/{modules => }/programs/nvf/languages.nix (100%) rename users/{modules => }/programs/nvf/ui.nix (100%) rename users/{modules => }/programs/nvf/utilities.nix (100%) rename users/{modules => }/programs/spicetify.nix (100%) rename users/{modules => }/programs/starship.nix (100%) rename users/{modules => }/programs/tealdeer.nix (100%) rename users/{modules => }/programs/thefuck.nix (100%) rename users/{modules => }/programs/tmux.nix (100%) rename users/{modules => }/programs/yazi.nix (100%) rename users/{modules => }/programs/yazi/starship.toml (100%) rename users/{modules => }/programs/zellij.nix (100%) rename users/{modules => }/programs/zoxide.nix (100%) rename users/{modules => }/programs/zsh.nix (100%) rename users/{modules => }/scripts/byebye.sh (100%) rename users/{modules => }/scripts/default.nix (100%) rename users/{modules => }/scripts/git-extract.py (100%) rename users/{modules => }/scripts/rebuild.sh (100%) diff --git a/users/modules/de.nix b/users/modules/de.nix deleted file mode 100644 index dbd30a3..0000000 --- a/users/modules/de.nix +++ /dev/null @@ -1,13 +0,0 @@ -# Default graphical programs and personalisation -{ - imports = [ - ./programs/dunst.nix - ./programs/firefox.nix - ./programs/hyprland.nix - ./programs/kitty.nix - ./programs/spicetify.nix - ./programs/fuzzel.nix - ./programs/hyprshade.nix - ./programs/ags.nix - ]; -} diff --git a/users/modules/sh.nix b/users/modules/sh.nix deleted file mode 100644 index 415402f..0000000 --- a/users/modules/sh.nix +++ /dev/null @@ -1,152 +0,0 @@ -# Default shell utilities and programs -{ - imports = [ - ./programs/btop.nix - ./programs/nh.nix - ./programs/direnv.nix - ./programs/fzf.nix - ./programs/git.nix - ./programs/nvf.nix - ./programs/starship.nix - ./programs/tealdeer.nix - ./programs/yazi.nix - ./programs/zellij.nix - ./programs/zsh.nix - ./programs/zoxide.nix - ./programs/thefuck.nix - ./programs/clipse.nix - ./programs/comma.nix - ./scripts - ]; - home.shell.enableShellIntegration = true; - home.shellAliases = { - gs = "git status"; - ai = "aichat -r %shell% -e"; - cd = "z"; - list-all-packages = "nix-store --query --requisites /run/current-system | cut -d- -f2- | sort | uniq"; - }; - editorconfig = { - enable = true; - settings = { - "*".end_of_line = "lf"; - "*".insert_final_newline = true; - "*".trim_trailing_whitespace = true; - "*".charset = "utf-8"; - - "*.{diff,patch}" = { - end_of_line = "unset"; - insert_final_newline = "unset"; - trim_trailing_whitespace = "unset"; - }; - - ".version" = { - insert_final_newline = false; - }; - - "*.{bash,json,lock,md,nix,pl,pm,py,rb,sh,xml}" = { - indent_style = "space"; - }; - - "*.xml" = { - indent_size = 1; - }; - - "*.{json,lock,md,nix,rb}" = { - indent_size = 2; - }; - - "*.{bash,pl,pm,py,sh}" = { - indent_size = 4; - }; - - "Gemfile" = { - indent_size = 2; - indent_style = "space"; - }; - - "package.json" = { - indent_style = "unset"; - }; - - "*.{c,h}" = { - insert_final_newline = "unset"; - trim_trailing_whitespace = "unset"; - }; - - "*.{asc,key,ovpn}" = { - insert_final_newline = "unset"; - end_of_line = "unset"; - trim_trailing_whitespace = "unset"; - }; - - "*.lock" = { - indent_size = "unset"; - }; - - "*.md" = { - trim_trailing_whitespace = true; - }; - - "*.nib" = { - end_of_line = "unset"; - insert_final_newline = "unset"; - trim_trailing_whitespace = "unset"; - charset = "unset"; - }; - - "eggs.nix" = { - trim_trailing_whitespace = "unset"; - }; - - "nixos/modules/services/networking/ircd-hybrid/*.{conf,in}" = { - trim_trailing_whitespace = "unset"; - }; - - "pkgs/build-support/dotnetenv/Wrapper/**" = { - end_of_line = "unset"; - indent_style = "unset"; - insert_final_newline = "unset"; - trim_trailing_whitespace = "unset"; - }; - - "registry.dat" = { - end_of_line = "unset"; - insert_final_newline = "unset"; - }; - - "pkgs/development/haskell-modules/hackage-packages.nix" = { - indent_style = "unset"; - trim_trailing_whitespace = "unset"; - }; - - "pkgs/misc/documentation-highlighter/**" = { - insert_final_newline = "unset"; - }; - - "pkgs/servers/dict/wordnet_structures.py" = { - trim_trailing_whitespace = "unset"; - }; - - "pkgs/tools/misc/timidity/timidity.cfg" = { - trim_trailing_whitespace = "unset"; - }; - - "pkgs/tools/virtualization/ovftool/*.ova" = { - end_of_line = "unset"; - insert_final_newline = "unset"; - trim_trailing_whitespace = "unset"; - charset = "unset"; - }; - - "lib/tests/*.plist" = { - indent_style = "tab"; - insert_final_newline = "unset"; - }; - - "pkgs/kde/generated/**" = { - insert_final_newline = "unset"; - end_of_line = "unset"; - }; - }; - }; -} diff --git a/users/modules/utils.nix b/users/modules/utils.nix deleted file mode 100644 index 244fcb9..0000000 --- a/users/modules/utils.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, inputs, ... }: -{ - home.packages = with pkgs; [ - fastfetch # system info - wl-clipboard # provides cli copy and paste commands - aichat # duh - ripgrep - devenv - bat - ttyper - hyprpicker - inputs.hyprcloser.packages.${pkgs.stdenv.hostPlatform.system}.default - ]; -} diff --git a/users/modules/programs/ags.nix b/users/programs/ags.nix similarity index 100% rename from users/modules/programs/ags.nix rename to users/programs/ags.nix diff --git a/users/modules/programs/ags/test b/users/programs/ags/test similarity index 100% rename from users/modules/programs/ags/test rename to users/programs/ags/test diff --git a/users/modules/programs/btop.nix b/users/programs/btop.nix similarity index 100% rename from users/modules/programs/btop.nix rename to users/programs/btop.nix diff --git a/users/modules/programs/clipse.nix b/users/programs/clipse.nix similarity index 100% rename from users/modules/programs/clipse.nix rename to users/programs/clipse.nix diff --git a/users/modules/programs/comma.nix b/users/programs/comma.nix similarity index 100% rename from users/modules/programs/comma.nix rename to users/programs/comma.nix diff --git a/users/modules/programs/direnv.nix b/users/programs/direnv.nix similarity index 100% rename from users/modules/programs/direnv.nix rename to users/programs/direnv.nix diff --git a/users/modules/programs/dunst.nix b/users/programs/dunst.nix similarity index 100% rename from users/modules/programs/dunst.nix rename to users/programs/dunst.nix diff --git a/users/modules/programs/firefox.nix b/users/programs/firefox.nix similarity index 100% rename from users/modules/programs/firefox.nix rename to users/programs/firefox.nix diff --git a/users/modules/programs/fuzzel.nix b/users/programs/fuzzel.nix similarity index 100% rename from users/modules/programs/fuzzel.nix rename to users/programs/fuzzel.nix diff --git a/users/modules/programs/fzf.nix b/users/programs/fzf.nix similarity index 100% rename from users/modules/programs/fzf.nix rename to users/programs/fzf.nix diff --git a/users/modules/programs/git.nix b/users/programs/git.nix similarity index 100% rename from users/modules/programs/git.nix rename to users/programs/git.nix diff --git a/users/modules/programs/hyprland.nix b/users/programs/hyprland.nix similarity index 100% rename from users/modules/programs/hyprland.nix rename to users/programs/hyprland.nix diff --git a/users/modules/programs/hyprshade.nix b/users/programs/hyprshade.nix similarity index 100% rename from users/modules/programs/hyprshade.nix rename to users/programs/hyprshade.nix diff --git a/users/modules/programs/kitty.nix b/users/programs/kitty.nix similarity index 100% rename from users/modules/programs/kitty.nix rename to users/programs/kitty.nix diff --git a/users/modules/programs/nh.nix b/users/programs/nh.nix similarity index 100% rename from users/modules/programs/nh.nix rename to users/programs/nh.nix diff --git a/users/modules/programs/nvf.nix b/users/programs/nvf.nix similarity index 100% rename from users/modules/programs/nvf.nix rename to users/programs/nvf.nix diff --git a/users/modules/programs/nvf/input.nix b/users/programs/nvf/input.nix similarity index 100% rename from users/modules/programs/nvf/input.nix rename to users/programs/nvf/input.nix diff --git a/users/modules/programs/nvf/languages.nix b/users/programs/nvf/languages.nix similarity index 100% rename from users/modules/programs/nvf/languages.nix rename to users/programs/nvf/languages.nix diff --git a/users/modules/programs/nvf/ui.nix b/users/programs/nvf/ui.nix similarity index 100% rename from users/modules/programs/nvf/ui.nix rename to users/programs/nvf/ui.nix diff --git a/users/modules/programs/nvf/utilities.nix b/users/programs/nvf/utilities.nix similarity index 100% rename from users/modules/programs/nvf/utilities.nix rename to users/programs/nvf/utilities.nix diff --git a/users/modules/programs/spicetify.nix b/users/programs/spicetify.nix similarity index 100% rename from users/modules/programs/spicetify.nix rename to users/programs/spicetify.nix diff --git a/users/modules/programs/starship.nix b/users/programs/starship.nix similarity index 100% rename from users/modules/programs/starship.nix rename to users/programs/starship.nix diff --git a/users/modules/programs/tealdeer.nix b/users/programs/tealdeer.nix similarity index 100% rename from users/modules/programs/tealdeer.nix rename to users/programs/tealdeer.nix diff --git a/users/modules/programs/thefuck.nix b/users/programs/thefuck.nix similarity index 100% rename from users/modules/programs/thefuck.nix rename to users/programs/thefuck.nix diff --git a/users/modules/programs/tmux.nix b/users/programs/tmux.nix similarity index 100% rename from users/modules/programs/tmux.nix rename to users/programs/tmux.nix diff --git a/users/modules/programs/yazi.nix b/users/programs/yazi.nix similarity index 100% rename from users/modules/programs/yazi.nix rename to users/programs/yazi.nix diff --git a/users/modules/programs/yazi/starship.toml b/users/programs/yazi/starship.toml similarity index 100% rename from users/modules/programs/yazi/starship.toml rename to users/programs/yazi/starship.toml diff --git a/users/modules/programs/zellij.nix b/users/programs/zellij.nix similarity index 100% rename from users/modules/programs/zellij.nix rename to users/programs/zellij.nix diff --git a/users/modules/programs/zoxide.nix b/users/programs/zoxide.nix similarity index 100% rename from users/modules/programs/zoxide.nix rename to users/programs/zoxide.nix diff --git a/users/modules/programs/zsh.nix b/users/programs/zsh.nix similarity index 100% rename from users/modules/programs/zsh.nix rename to users/programs/zsh.nix diff --git a/users/rafiq.nix b/users/rafiq.nix index 4566ac6..8c9841a 100644 --- a/users/rafiq.nix +++ b/users/rafiq.nix @@ -7,14 +7,55 @@ }: { imports = [ - ./modules/sh.nix - ./modules/de.nix - ./modules/utils.nix + ./programs/ags.nix + ./programs/btop.nix + ./programs/clipse.nix + ./programs/comma.nix + ./programs/direnv.nix + ./programs/dunst.nix + ./programs/firefox.nix + ./programs/fuzzel.nix + ./programs/fzf.nix + ./programs/git.nix + ./programs/hyprland.nix + ./programs/hyprshade.nix + ./programs/kitty.nix + ./programs/nh.nix + ./programs/nvf.nix + ./programs/spicetify.nix + ./programs/starship.nix + ./programs/tealdeer.nix + ./programs/thefuck.nix + ./programs/yazi.nix + ./programs/zellij.nix + ./programs/zoxide.nix + ./programs/zsh.nix + ./scripts ]; # This enables using home-manager from the command line. programs.home-manager.enable = true; + editorconfig = { + enable = true; + settings = { + "*" = { + end_of_line = "lf"; + insert_final_newline = true; + trim_trailing_whitespace = true; + charset = "utf-8"; + indent_style = "space"; + indent_size = 2; + }; + "package.json" = { + indent_style = "unset"; + }; + "*.lock" = { + indent_size = "unset"; + }; + }; + }; + home = { username = "${username}"; homeDirectory = "/home/${username}"; @@ -23,6 +64,25 @@ # was originally bulit against on this system. # Do not change it. stateVersion = "25.05"; - }; + shell.enableShellIntegration = true; + shellAliases = { + gs = "git status"; + ai = "aichat -r %shell% -e"; + cd = "z"; + list-all-packages = "nix-store --query --requisites /run/current-system | cut -d- -f2- | sort | uniq"; + }; + + packages = with pkgs; [ + fastfetch # system info + wl-clipboard # provides cli copy and paste commands + aichat # duh + ripgrep + devenv + bat + ttyper + hyprpicker + inputs.hyprcloser.packages.${pkgs.stdenv.hostPlatform.system}.default + ]; + }; } diff --git a/users/modules/scripts/byebye.sh b/users/scripts/byebye.sh similarity index 100% rename from users/modules/scripts/byebye.sh rename to users/scripts/byebye.sh diff --git a/users/modules/scripts/default.nix b/users/scripts/default.nix similarity index 100% rename from users/modules/scripts/default.nix rename to users/scripts/default.nix diff --git a/users/modules/scripts/git-extract.py b/users/scripts/git-extract.py similarity index 100% rename from users/modules/scripts/git-extract.py rename to users/scripts/git-extract.py diff --git a/users/modules/scripts/rebuild.sh b/users/scripts/rebuild.sh similarity index 100% rename from users/modules/scripts/rebuild.sh rename to users/scripts/rebuild.sh