diff --git a/config/base.nix b/config/base.nix index e2cd9de..6e54a50 100644 --- a/config/base.nix +++ b/config/base.nix @@ -15,7 +15,7 @@ systemd.services."systemd-machine-id-commit".enable = !config.my.persist.enable; my = { - home = { + hm = { # nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; home.stateVersion = "24.11"; diff --git a/config/hosts/imxyy-nix-wsl/home.nix b/config/hosts/imxyy-nix-wsl/home.nix index 656689c..2bafada 100644 --- a/config/hosts/imxyy-nix-wsl/home.nix +++ b/config/hosts/imxyy-nix-wsl/home.nix @@ -1,6 +1,6 @@ { lib, username, ... }: { - my.home.programs.zsh.shellAliases = { + my.hm.programs.zsh.shellAliases = { localproxy_on = "export http_proxy=http://192.168.128.1:7890 https_proxy=http://192.168.128.1:7890 all_proxy=socks://192.168.128.1:7890"; }; my = { diff --git a/config/hosts/imxyy-nix-x16/home.nix b/config/hosts/imxyy-nix-x16/home.nix index 9c27729..0aa94d8 100644 --- a/config/hosts/imxyy-nix-x16/home.nix +++ b/config/hosts/imxyy-nix-x16/home.nix @@ -4,7 +4,7 @@ ... }: { - my.home = { + my.hm = { home.packages = with pkgs; [ localsend diff --git a/config/hosts/imxyy-nix/home.nix b/config/hosts/imxyy-nix/home.nix index 6516ed8..d0ae55a 100644 --- a/config/hosts/imxyy-nix/home.nix +++ b/config/hosts/imxyy-nix/home.nix @@ -4,7 +4,7 @@ ... }: { - my.home = { + my.hm = { home.packages = with pkgs; [ localsend diff --git a/flake.nix b/flake.nix index c600ebb..657a5a3 100644 --- a/flake.nix +++ b/flake.nix @@ -193,7 +193,7 @@ recursive = true; }) ++ [ - (lib.mkAliasOptionModule [ "my" "home" ] [ "home-manager" "users" vars.username ]) + (lib.mkAliasOptionModule [ "my" "hm" ] [ "home-manager" "users" vars.username ]) ./config/base.nix ./config/hosts/${hostname} inputs.chaotic.nixosModules.default diff --git a/lib/default.nix b/lib/default.nix index e6f5203..321d098 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -36,7 +36,7 @@ optionName = packageName; config' = lib.mkMerge [ { - my.home.home.packages = [ (lib.getAttrFromPath packagePath pkgs) ]; + my.hm.home.packages = [ (lib.getAttrFromPath packagePath pkgs) ]; } extraConfig ]; @@ -55,7 +55,7 @@ config' = lib.mkMerge [ { - my.home.programs = lib.setAttrByPath [ programName "enable" ] true; + my.hm.programs = lib.setAttrByPath [ programName "enable" ] true; } extraConfig ]; diff --git a/modules/audio.nix b/modules/audio.nix index 643703d..f4ca8db 100644 --- a/modules/audio.nix +++ b/modules/audio.nix @@ -21,6 +21,6 @@ lib.my.makeSwitch { }; users.extraUsers.${username}.extraGroups = [ "audio" ]; my.persist.homeDirs = [ ".local/state/wireplumber" ]; - my.home.home.packages = [ pkgs.pwvucontrol ]; + my.hm.home.packages = [ pkgs.pwvucontrol ]; }; } diff --git a/modules/cli/media/go-musicfox.nix b/modules/cli/media/go-musicfox.nix index 5cd7b3c..f6a3ee1 100644 --- a/modules/cli/media/go-musicfox.nix +++ b/modules/cli/media/go-musicfox.nix @@ -15,7 +15,7 @@ lib.my.makeSwitch { ]; config' = { my = { - home = { + hm = { home.packages = with pkgs; [ playerctl go-musicfox @@ -23,7 +23,7 @@ lib.my.makeSwitch { sops.secrets.go-musicfox = { sopsFile = secrets."go-musicfox.ini"; format = "binary"; - path = "${config.my.home.xdg.configHome}/go-musicfox/go-musicfox.ini"; + path = "${config.my.hm.xdg.configHome}/go-musicfox/go-musicfox.ini"; }; }; diff --git a/modules/cli/media/mpd/default.nix b/modules/cli/media/mpd/default.nix index aa9ab6e..3f3de20 100644 --- a/modules/cli/media/mpd/default.nix +++ b/modules/cli/media/mpd/default.nix @@ -13,7 +13,7 @@ lib.my.makeSwitch { "mpd" ]; config' = { - my.home = { + my.hm = { home.packages = with pkgs.stable; [ mpd mpc-cli diff --git a/modules/cli/misc.nix b/modules/cli/misc.nix index 3da69a7..89049c2 100644 --- a/modules/cli/misc.nix +++ b/modules/cli/misc.nix @@ -48,7 +48,7 @@ lib.my.makeSwitch { programs.dconf.enable = true; - my.home = { + my.hm = { home.packages = with pkgs; [ lsd fd diff --git a/modules/cli/monitor/btop/default.nix b/modules/cli/monitor/btop/default.nix index a1bec20..2c817e8 100644 --- a/modules/cli/monitor/btop/default.nix +++ b/modules/cli/monitor/btop/default.nix @@ -14,7 +14,7 @@ lib.my.makeHomePackageConfig { "btop" ]; extraConfig = { - my.home.xdg.configFile."btop" = { + my.hm.xdg.configFile."btop" = { source = ./config; recursive = true; }; diff --git a/modules/cli/shell/zsh.nix b/modules/cli/shell/zsh.nix index 7e6bf02..b43ab8c 100644 --- a/modules/cli/shell/zsh.nix +++ b/modules/cli/shell/zsh.nix @@ -15,9 +15,9 @@ lib.my.makeSwitch { ]; config' = { my.persist.homeDirs = [ ".local/share/zoxide" ]; - my.home = + my.hm = let - stateHome = config.my.home.xdg.stateHome; + stateHome = config.my.hm.xdg.stateHome; zsh-syntax-highlighting = pkgs.fetchFromGitHub { owner = "zsh-users"; repo = "zsh-syntax-highlighting"; @@ -78,7 +78,7 @@ lib.my.makeSwitch { }; programs.zsh = { enable = true; - dotDir = "${config.my.home.xdg.configHome}/zsh"; + dotDir = "${config.my.hm.xdg.configHome}/zsh"; history = { path = "${stateHome}/zsh_history"; ignorePatterns = [ diff --git a/modules/cli/vcs/git.nix b/modules/cli/vcs/git.nix index bfbd928..97f8a01 100644 --- a/modules/cli/vcs/git.nix +++ b/modules/cli/vcs/git.nix @@ -16,7 +16,7 @@ lib.my.makeHomeProgramConfig { "git" ]; extraConfig = { - my.home = { + my.hm = { programs.git = { userName = "${userfullname}"; userEmail = "${useremail}"; diff --git a/modules/cli/vcs/jj.nix b/modules/cli/vcs/jj.nix index ffd5695..41c50f6 100644 --- a/modules/cli/vcs/jj.nix +++ b/modules/cli/vcs/jj.nix @@ -16,7 +16,7 @@ lib.my.makeHomeProgramConfig { "jj" ]; extraConfig = { - my.home = { + my.hm = { programs.jujutsu = { settings = { user = { diff --git a/modules/coding/editor/neovim/default.nix b/modules/coding/editor/neovim/default.nix index d2ca62b..a5112eb 100644 --- a/modules/coding/editor/neovim/default.nix +++ b/modules/coding/editor/neovim/default.nix @@ -13,7 +13,7 @@ lib.my.makeHomeProgramConfig { "neovim" ]; extraConfig = { - my.home = { + my.hm = { xdg.configFile."nvim/init.lua".source = ./nvim/init.lua; xdg.configFile."nvim/lua" = { source = ./nvim/lua; diff --git a/modules/coding/editor/vscode.nix b/modules/coding/editor/vscode.nix index fe5e156..b500bd2 100644 --- a/modules/coding/editor/vscode.nix +++ b/modules/coding/editor/vscode.nix @@ -13,7 +13,7 @@ lib.my.makeHomeProgramConfig { "vscode" ]; extraConfig = { - my.home = { + my.hm = { programs.vscode = { package = pkgs.vscodium; }; diff --git a/modules/coding/langs/c.nix b/modules/coding/langs/c.nix index 26c7dc9..09e2ed3 100644 --- a/modules/coding/langs/c.nix +++ b/modules/coding/langs/c.nix @@ -13,7 +13,7 @@ lib.my.makeSwitch { "c" ]; config' = { - my.home.home.packages = with pkgs; [ + my.hm.home.packages = with pkgs; [ gcc clang-tools cmake diff --git a/modules/coding/langs/go.nix b/modules/coding/langs/go.nix index 23fbb54..fc47951 100644 --- a/modules/coding/langs/go.nix +++ b/modules/coding/langs/go.nix @@ -14,7 +14,7 @@ lib.my.makeHomePackageConfig { "go" ]; extraConfig = { - my.home.home.packages = with pkgs; [ + my.hm.home.packages = with pkgs; [ gotools gopls ]; diff --git a/modules/coding/langs/java.nix b/modules/coding/langs/java.nix index b8ac3f1..7b460b1 100644 --- a/modules/coding/langs/java.nix +++ b/modules/coding/langs/java.nix @@ -13,7 +13,7 @@ lib.my.makeSwitch { "java" ]; config' = { - my.home.home.packages = with pkgs; [ + my.hm.home.packages = with pkgs; [ openjdk24 java-language-server ]; diff --git a/modules/coding/langs/js.nix b/modules/coding/langs/js.nix index 249faa8..3144dd5 100644 --- a/modules/coding/langs/js.nix +++ b/modules/coding/langs/js.nix @@ -13,7 +13,7 @@ lib.my.makeSwitch { "js" ]; config' = { - my.home = { + my.hm = { home.packages = with pkgs; [ nodejs typescript diff --git a/modules/coding/langs/lua.nix b/modules/coding/langs/lua.nix index 528a4aa..c8a6db5 100644 --- a/modules/coding/langs/lua.nix +++ b/modules/coding/langs/lua.nix @@ -13,7 +13,7 @@ lib.my.makeSwitch { "lua" ]; config' = { - my.home.home.packages = with pkgs; [ + my.hm.home.packages = with pkgs; [ luajit stylua lua-language-server diff --git a/modules/coding/langs/python.nix b/modules/coding/langs/python.nix index 7aab5c9..32beb3b 100644 --- a/modules/coding/langs/python.nix +++ b/modules/coding/langs/python.nix @@ -14,7 +14,7 @@ lib.my.makeHomePackageConfig { "python" ]; extraConfig = { - my.home.home.packages = with pkgs; [ + my.hm.home.packages = with pkgs; [ uv pyright ]; diff --git a/modules/coding/langs/qml.nix b/modules/coding/langs/qml.nix index 0c482b6..b44e3e0 100644 --- a/modules/coding/langs/qml.nix +++ b/modules/coding/langs/qml.nix @@ -13,7 +13,7 @@ lib.my.makeSwitch { "qml" ]; config' = { - my.home.home.packages = with pkgs; [ + my.hm.home.packages = with pkgs; [ kdePackages.qtdeclarative ]; }; diff --git a/modules/coding/langs/rust.nix b/modules/coding/langs/rust.nix index c2ec062..4d14abc 100644 --- a/modules/coding/langs/rust.nix +++ b/modules/coding/langs/rust.nix @@ -13,7 +13,7 @@ lib.my.makeSwitch { "rust" ]; config' = { - my.home = { + my.hm = { home.packages = with pkgs; [ (fenix.stable.withComponents [ "cargo" diff --git a/modules/coding/misc.nix b/modules/coding/misc.nix index db70d90..5e5eb98 100644 --- a/modules/coding/misc.nix +++ b/modules/coding/misc.nix @@ -12,7 +12,7 @@ lib.my.makeSwitch { "misc" ]; config' = { - my.home = { + my.hm = { home.packages = with pkgs; [ gnumake github-cli # gh diff --git a/modules/desktop/browser/chromium.nix b/modules/desktop/browser/chromium.nix index 6a148a0..b314720 100644 --- a/modules/desktop/browser/chromium.nix +++ b/modules/desktop/browser/chromium.nix @@ -13,7 +13,7 @@ lib.my.makeHomeProgramConfig { "chromium" ]; extraConfig = { - my.home.programs.chromium = { + my.hm.programs.chromium = { package = pkgs.ungoogled-chromium; extensions = [ { diff --git a/modules/desktop/browser/zen.nix b/modules/desktop/browser/zen.nix index 3ebc729..043b902 100644 --- a/modules/desktop/browser/zen.nix +++ b/modules/desktop/browser/zen.nix @@ -13,7 +13,7 @@ lib.my.makeHomeProgramConfig { "zen" ]; extraConfig = { - my.home.programs.zen-browser = { + my.hm.programs.zen-browser = { enable = true; nativeMessagingHosts = [ pkgs.firefoxpwa ]; policies = { diff --git a/modules/desktop/gaming/minecraft.nix b/modules/desktop/gaming/minecraft.nix index df30b0b..bcef97d 100644 --- a/modules/desktop/gaming/minecraft.nix +++ b/modules/desktop/gaming/minecraft.nix @@ -13,7 +13,7 @@ lib.my.makeSwitch { "minecraft" ]; config' = { - my.home.home.packages = [ + my.hm.home.packages = [ (pkgs.hmcl.overrideAttrs { postFixup = '' substituteInPlace $out/share/applications/HMCL.desktop --replace-fail 'Exec=hmcl' 'Exec=sh -c "cd ~/.local/share/hmcl; hmcl"' diff --git a/modules/desktop/notify/dunst/default.nix b/modules/desktop/notify/dunst/default.nix index 8a40fd6..9cdacb3 100644 --- a/modules/desktop/notify/dunst/default.nix +++ b/modules/desktop/notify/dunst/default.nix @@ -14,6 +14,6 @@ lib.my.makeHomePackageConfig { "dunst" ]; extraConfig = { - my.home.xdg.configFile."dunst/dunstrc".source = ./dunstrc; + my.hm.xdg.configFile."dunst/dunstrc".source = ./dunstrc; }; } diff --git a/modules/desktop/notify/swaync/default.nix b/modules/desktop/notify/swaync/default.nix index 36f8ca1..f678c83 100644 --- a/modules/desktop/notify/swaync/default.nix +++ b/modules/desktop/notify/swaync/default.nix @@ -14,7 +14,7 @@ lib.my.makeHomePackageConfig { "swaync" ]; extraConfig = { - my.home = { + my.hm = { programs.niri.settings.binds."Mod+End".action.spawn = [ "swaync-client" "-t" diff --git a/modules/desktop/screencast/obs-studio.nix b/modules/desktop/screencast/obs-studio.nix index aca3673..b16d2e7 100644 --- a/modules/desktop/screencast/obs-studio.nix +++ b/modules/desktop/screencast/obs-studio.nix @@ -13,7 +13,7 @@ lib.my.makeSwitch { "obs-studio" ]; config' = { - my.home.home.packages = with pkgs; [ + my.hm.home.packages = with pkgs; [ (pkgs.wrapOBS { plugins = with pkgs.obs-studio-plugins; [ wlrobs diff --git a/modules/desktop/style/default.nix b/modules/desktop/style/default.nix index 8b6f0cd..95900e5 100644 --- a/modules/desktop/style/default.nix +++ b/modules/desktop/style/default.nix @@ -25,7 +25,7 @@ lib.my.makeSwitch { }; }; - my.home = { + my.hm = { stylix = { enable = true; autoEnable = false; @@ -52,7 +52,7 @@ lib.my.makeSwitch { name = "Adwaita"; }; gtk2 = { - configLocation = "${config.my.home.xdg.configHome}/gtk-2.0/gtkrc"; + configLocation = "${config.my.hm.xdg.configHome}/gtk-2.0/gtkrc"; }; gtk3 = { theme = { diff --git a/modules/desktop/terminal/alacritty/default.nix b/modules/desktop/terminal/alacritty/default.nix index 8994a7f..050d8b5 100644 --- a/modules/desktop/terminal/alacritty/default.nix +++ b/modules/desktop/terminal/alacritty/default.nix @@ -8,7 +8,7 @@ lib.my.makeHomeProgramConfig { "alacritty" ]; extraConfig = { - my.home.programs.alacritty.settings = { + my.hm.programs.alacritty.settings = { general.import = [ ./tokyonight-storm.toml ]; cursor.style = { shape = "Block"; diff --git a/modules/desktop/terminal/foot/default.nix b/modules/desktop/terminal/foot/default.nix index 1b41686..0dc7a1d 100644 --- a/modules/desktop/terminal/foot/default.nix +++ b/modules/desktop/terminal/foot/default.nix @@ -8,7 +8,7 @@ lib.my.makeHomeProgramConfig { "foot" ]; extraConfig = { - my.home.programs.foot = { + my.hm.programs.foot = { server.enable = true; settings = { main = { diff --git a/modules/desktop/terminal/ghostty/default.nix b/modules/desktop/terminal/ghostty/default.nix index c88ed0a..3a07712 100644 --- a/modules/desktop/terminal/ghostty/default.nix +++ b/modules/desktop/terminal/ghostty/default.nix @@ -8,7 +8,7 @@ lib.my.makeHomeProgramConfig { "ghostty" ]; extraConfig = { - my.home.programs.ghostty = { + my.hm.programs.ghostty = { enableBashIntegration = true; enableZshIntegration = true; installBatSyntax = true; diff --git a/modules/desktop/terminal/kitty/default.nix b/modules/desktop/terminal/kitty/default.nix index d363c9e..be2cd13 100644 --- a/modules/desktop/terminal/kitty/default.nix +++ b/modules/desktop/terminal/kitty/default.nix @@ -8,7 +8,7 @@ lib.my.makeHomeProgramConfig { "kitty" ]; extraConfig = { - my.home.programs.kitty = { + my.hm.programs.kitty = { settings = { cursor_blink_interval = 0; remember_window_size = "no"; diff --git a/modules/desktop/wine.nix b/modules/desktop/wine.nix index 95f4ab4..e25423f 100644 --- a/modules/desktop/wine.nix +++ b/modules/desktop/wine.nix @@ -12,7 +12,7 @@ lib.my.makeSwitch { "wine" ]; config' = { - my.home.home.packages = with pkgs; [ + my.hm.home.packages = with pkgs; [ wineWayland proton-ge-custom bottles diff --git a/modules/desktop/wm/niri/config.nix b/modules/desktop/wm/niri/config.nix index 3135c28..2df3b25 100644 --- a/modules/desktop/wm/niri/config.nix +++ b/modules/desktop/wm/niri/config.nix @@ -6,7 +6,7 @@ }: { config = lib.mkIf config.my.desktop.wm.niri.enable { - my.home.programs.niri.settings = { + my.hm.programs.niri.settings = { input = { focus-follows-mouse = { enable = true; @@ -132,7 +132,7 @@ ]; binds = - with config.my.home.lib.niri.actions; + with config.my.hm.lib.niri.actions; { "Ctrl+Alt+T".action.spawn = [ "kitty" diff --git a/modules/desktop/wm/niri/default.nix b/modules/desktop/wm/niri/default.nix index cd7f6f9..8d094dc 100644 --- a/modules/desktop/wm/niri/default.nix +++ b/modules/desktop/wm/niri/default.nix @@ -51,7 +51,7 @@ in wayland.enable = true; }; }; - my.home = { + my.hm = { home.packages = with pkgs; [ xwayland-satellite-unstable diff --git a/modules/i18n/fcitx5.nix b/modules/i18n/fcitx5.nix index 3faeb6b..5c500e5 100644 --- a/modules/i18n/fcitx5.nix +++ b/modules/i18n/fcitx5.nix @@ -194,7 +194,7 @@ lib.my.makeSwitch { ) ) ]; - my.home.programs.niri.settings = { + my.hm.programs.niri.settings = { binds."Mod+Space".action.spawn = [ "fcitx5-remote" "-t" diff --git a/modules/nix.nix b/modules/nix.nix index a79f2fd..e6faa54 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -55,11 +55,11 @@ lib.my.makeSwitch { group = "users"; mode = "0400"; }; - my.home.nix.extraOptions = '' + my.hm.nix.extraOptions = '' !include ${config.sops.secrets.nix-github-token.path} ''; - my.home.home.packages = [ pkgs.nixd ]; + my.hm.home.packages = [ pkgs.nixd ]; # uncomment to enable auto gc /* diff --git a/modules/sops.nix b/modules/sops.nix index 33dca1b..d3b11a3 100644 --- a/modules/sops.nix +++ b/modules/sops.nix @@ -23,7 +23,7 @@ in config = lib.mkIf cfg.enable { sops.age.sshKeyFile = cfg.sshKeyFile; users.users.${username}.extraGroups = [ "keys" ]; - my.home = { + my.hm = { sops.age.sshKeyFile = cfg.sshKeyFile; home.packages = [ pkgs.sops diff --git a/modules/user.nix b/modules/user.nix index 40417b4..fc57f5d 100644 --- a/modules/user.nix +++ b/modules/user.nix @@ -103,11 +103,9 @@ lib.my.makeSwitch { username ]; - my.home = { - home = { - inherit username; - homeDirectory = "/home/${username}"; - }; + my.hm.home = { + inherit username; + homeDirectory = "/home/${username}"; }; }; } diff --git a/modules/xdg.nix b/modules/xdg.nix index ab53d86..493c5ec 100644 --- a/modules/xdg.nix +++ b/modules/xdg.nix @@ -21,9 +21,9 @@ in }; config = lib.mkIf cfg.enable { - my.home = + my.hm = let - homedir = config.my.home.home.homeDirectory; + homedir = config.my.hm.home.homeDirectory; in { home.packages = with pkgs; [