From c8783b2c52b29b1e7458c3d2d6b78f6c6ebee7fc Mon Sep 17 00:00:00 2001 From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com> Date: Mon, 23 Jun 2025 09:21:16 +0200 Subject: [PATCH] chore: organize dotfiles stowed by home-manager --- hosts/thegeneralist-central/configuration.nix | 7 ++- hosts/thegeneralist/configuration.nix | 7 ++- modules/common/neovim.nix | 4 +- modules/common/packages.nix | 19 +++++++ modules/{home => }/dotfiles/i3/config | 0 modules/{home => }/dotfiles/i3/detect-tray.sh | 0 modules/{home => }/dotfiles/i3status/config | 0 .../dotfiles/nvim/after/ftplugin/rust.lua | 0 modules/{home => }/dotfiles/nvim/init.lua | 0 .../{home => }/dotfiles/nvim/lazy-lock.json | 0 .../{home => }/dotfiles/nvim/lua/.luarc.json | 0 .../dotfiles/nvim/lua/thegeneralist/init.lua | 0 .../nvim/lua/thegeneralist/lazy/avante.lua | 0 .../nvim/lua/thegeneralist/lazy/blink.lua | 0 .../nvim/lua/thegeneralist/lazy/colors.lua | 0 .../lua/thegeneralist/lazy/command_bar.lua | 0 .../nvim/lua/thegeneralist/lazy/commenter.lua | 0 .../nvim/lua/thegeneralist/lazy/dap.lua | 0 .../nvim/lua/thegeneralist/lazy/fugitive.lua | 0 .../nvim/lua/thegeneralist/lazy/gh.lua | 0 .../nvim/lua/thegeneralist/lazy/harpoon.lua | 0 .../nvim/lua/thegeneralist/lazy/init.lua | 0 .../nvim/lua/thegeneralist/lazy/jupyter.lua | 0 .../nvim/lua/thegeneralist/lazy/lazydev.lua | 0 .../nvim/lua/thegeneralist/lazy/lsp.lua | 0 .../nvim/lua/thegeneralist/lazy/luasnip.lua | 0 .../nvim/lua/thegeneralist/lazy/markdown.lua | 0 .../nvim/lua/thegeneralist/lazy/neogen.lua | 0 .../nvim/lua/thegeneralist/lazy/nullls.lua | 0 .../lua/thegeneralist/lazy/statusline.lua | 0 .../nvim/lua/thegeneralist/lazy/telescope.lua | 0 .../lua/thegeneralist/lazy/treesitter.lua | 0 .../nvim/lua/thegeneralist/lazy/trouble.lua | 0 .../nvim/lua/thegeneralist/lazy/undotree.lua | 0 .../nvim/lua/thegeneralist/lazy/whichkey.lua | 0 .../nvim/lua/thegeneralist/lazy_init.lua | 0 .../dotfiles/nvim/lua/thegeneralist/remap.lua | 0 .../dotfiles/nvim/lua/thegeneralist/set.lua | 0 modules/home/default.nix | 52 ------------------- modules/linux/xserver.nix | 2 +- 40 files changed, 32 insertions(+), 59 deletions(-) rename modules/{home => }/dotfiles/i3/config (100%) rename modules/{home => }/dotfiles/i3/detect-tray.sh (100%) rename modules/{home => }/dotfiles/i3status/config (100%) rename modules/{home => }/dotfiles/nvim/after/ftplugin/rust.lua (100%) rename modules/{home => }/dotfiles/nvim/init.lua (100%) rename modules/{home => }/dotfiles/nvim/lazy-lock.json (100%) rename modules/{home => }/dotfiles/nvim/lua/.luarc.json (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/init.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/avante.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/blink.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/colors.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/command_bar.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/commenter.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/dap.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/fugitive.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/gh.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/harpoon.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/init.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/jupyter.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/lazydev.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/lsp.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/luasnip.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/markdown.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/neogen.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/nullls.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/statusline.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/telescope.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/treesitter.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/trouble.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/undotree.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy/whichkey.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/lazy_init.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/remap.lua (100%) rename modules/{home => }/dotfiles/nvim/lua/thegeneralist/set.lua (100%) delete mode 100644 modules/home/default.nix diff --git a/hosts/thegeneralist-central/configuration.nix b/hosts/thegeneralist-central/configuration.nix index 703a248..17f1256 100644 --- a/hosts/thegeneralist-central/configuration.nix +++ b/hosts/thegeneralist-central/configuration.nix @@ -18,11 +18,14 @@ in [ thegeneralist ]; }; + programs.home-manager.enable = true; home-manager = { backupFileExtension = "home.bak"; extraSpecialArgs = { inherit inputs; }; - users = { - thegeneralist = import (self + /modules/home); + users.thegeneralist.home = { + username = "thegeneralist"; + homeDirectory = "/home/thegeneralist"; + stateVersion = "25.11"; }; }; diff --git a/hosts/thegeneralist/configuration.nix b/hosts/thegeneralist/configuration.nix index f55110a..7f41f71 100644 --- a/hosts/thegeneralist/configuration.nix +++ b/hosts/thegeneralist/configuration.nix @@ -18,11 +18,14 @@ in [ thegeneralist ]; }; + programs.home-manager.enable = true; home-manager = { backupFileExtension = "home.bak"; extraSpecialArgs = { inherit inputs; }; - users = { - thegeneralist = import (self + /modules/home); + users.thegeneralist.home = { + username = "thegeneralist"; + homeDirectory = "/home/thegeneralist"; + stateVersion = "25.11"; }; }; diff --git a/modules/common/neovim.nix b/modules/common/neovim.nix index 1a8a4da..4ddbc5a 100644 --- a/modules/common/neovim.nix +++ b/modules/common/neovim.nix @@ -27,13 +27,13 @@ in { home.file = { ".config/nvim" = { - source = ../home/dotfiles/nvim; + source = ../dotfiles/nvim; force = true; recursive = true; }; } // optionalAttrs config.onLinux { ".config/i3status" = { - source = ../home/dotfiles/i3status; + source = ../dotfiles/i3status; force = true; recursive = true; }; diff --git a/modules/common/packages.nix b/modules/common/packages.nix index a16e18c..7fa3b8f 100644 --- a/modules/common/packages.nix +++ b/modules/common/packages.nix @@ -12,6 +12,25 @@ in { gcc gnumake automake + + zip + xz + unzip + + mtr + iperf3 + dnsutils + ldns + nmap + + file + which + tree + gnupg + btop + + pciutils + usbutils ; }; } diff --git a/modules/home/dotfiles/i3/config b/modules/dotfiles/i3/config similarity index 100% rename from modules/home/dotfiles/i3/config rename to modules/dotfiles/i3/config diff --git a/modules/home/dotfiles/i3/detect-tray.sh b/modules/dotfiles/i3/detect-tray.sh similarity index 100% rename from modules/home/dotfiles/i3/detect-tray.sh rename to modules/dotfiles/i3/detect-tray.sh diff --git a/modules/home/dotfiles/i3status/config b/modules/dotfiles/i3status/config similarity index 100% rename from modules/home/dotfiles/i3status/config rename to modules/dotfiles/i3status/config diff --git a/modules/home/dotfiles/nvim/after/ftplugin/rust.lua b/modules/dotfiles/nvim/after/ftplugin/rust.lua similarity index 100% rename from modules/home/dotfiles/nvim/after/ftplugin/rust.lua rename to modules/dotfiles/nvim/after/ftplugin/rust.lua diff --git a/modules/home/dotfiles/nvim/init.lua b/modules/dotfiles/nvim/init.lua similarity index 100% rename from modules/home/dotfiles/nvim/init.lua rename to modules/dotfiles/nvim/init.lua diff --git a/modules/home/dotfiles/nvim/lazy-lock.json b/modules/dotfiles/nvim/lazy-lock.json similarity index 100% rename from modules/home/dotfiles/nvim/lazy-lock.json rename to modules/dotfiles/nvim/lazy-lock.json diff --git a/modules/home/dotfiles/nvim/lua/.luarc.json b/modules/dotfiles/nvim/lua/.luarc.json similarity index 100% rename from modules/home/dotfiles/nvim/lua/.luarc.json rename to modules/dotfiles/nvim/lua/.luarc.json diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/init.lua b/modules/dotfiles/nvim/lua/thegeneralist/init.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/init.lua rename to modules/dotfiles/nvim/lua/thegeneralist/init.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/avante.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/avante.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/avante.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/avante.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/blink.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/blink.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/blink.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/blink.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/colors.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/colors.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/colors.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/colors.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/command_bar.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/command_bar.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/command_bar.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/command_bar.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/commenter.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/commenter.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/commenter.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/commenter.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/dap.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/dap.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/dap.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/dap.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/fugitive.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/fugitive.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/fugitive.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/fugitive.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/gh.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/gh.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/gh.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/gh.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/harpoon.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/harpoon.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/harpoon.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/harpoon.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/init.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/init.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/init.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/init.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/jupyter.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/jupyter.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/jupyter.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/jupyter.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/lazydev.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/lazydev.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/lazydev.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/lazydev.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/lsp.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/lsp.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/lsp.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/lsp.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/luasnip.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/luasnip.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/luasnip.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/luasnip.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/markdown.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/markdown.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/markdown.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/markdown.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/neogen.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/neogen.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/neogen.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/neogen.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/nullls.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/nullls.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/nullls.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/nullls.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/statusline.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/statusline.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/statusline.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/statusline.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/telescope.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/telescope.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/telescope.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/telescope.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/treesitter.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/treesitter.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/treesitter.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/treesitter.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/trouble.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/trouble.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/trouble.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/trouble.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/undotree.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/undotree.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/undotree.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/undotree.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy/whichkey.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/whichkey.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy/whichkey.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy/whichkey.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/lazy_init.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy_init.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/lazy_init.lua rename to modules/dotfiles/nvim/lua/thegeneralist/lazy_init.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/remap.lua b/modules/dotfiles/nvim/lua/thegeneralist/remap.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/remap.lua rename to modules/dotfiles/nvim/lua/thegeneralist/remap.lua diff --git a/modules/home/dotfiles/nvim/lua/thegeneralist/set.lua b/modules/dotfiles/nvim/lua/thegeneralist/set.lua similarity index 100% rename from modules/home/dotfiles/nvim/lua/thegeneralist/set.lua rename to modules/dotfiles/nvim/lua/thegeneralist/set.lua diff --git a/modules/home/default.nix b/modules/home/default.nix deleted file mode 100644 index 4c97a18..0000000 --- a/modules/home/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ config, options, pkgs, inputs, lib, ... }: { - home.username = "thegeneralist"; - home.homeDirectory = if options.onLinux then "/home/thegeneralist" else "/Users/thegeneralist"; - - home.packages = with pkgs; [ - zip - xz - unzip - - mtr - iperf3 - dnsutils - ldns - nmap - - file - which - tree - gnupg - btop - - pciutils - usbutils - - # # It is sometimes useful to fine-tune packages, for example, by applying - # # overrides. You can do that directly here, just don't forget the - # # parentheses. Maybe you want to install Nerd Fonts with a limited number of - # # fonts? - # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) - - # # You can also create simple shell scripts directly inside your - # # configuration. For example, this adds a command 'my-hello' to your - # # environment: - # (pkgs.writeShellScriptBin "my-hello" '' - # echo "Hello, ${config.home.username}!" - # '') - ]; - - # Home Manager can also manage your environment variables through - # 'home.sessionVariables'. These will be explicitly sourced when using a - # shell provided by Home Manager. If you don't want to manage your shell - # through Home Manager then you have to manually source 'hm-session-vars.sh' - # located at either - # ~/.nix-profile/etc/profile.d/hm-session-vars.sh - # or - # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh - # or - # /etc/profiles/per-user/thegeneralist/etc/profile.d/hm-session-vars.sh - - home.stateVersion = "24.11"; - programs.home-manager.enable = true; -} diff --git a/modules/linux/xserver.nix b/modules/linux/xserver.nix index c04ffb7..e41a297 100644 --- a/modules/linux/xserver.nix +++ b/modules/linux/xserver.nix @@ -28,7 +28,7 @@ in { windowManager.i3 = optionalAttrs (!config.isServer) { enable = true; package = pkgs.i3; - configFile = ../home/dotfiles/i3/config; + configFile = ../dotfiles/i3/config; extraPackages = with pkgs; [ i3