imxyy1soope1/nixos-dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Activity

refactor: my.home -> my.hm for disambiguilty (e.g. my.home.home)

Browse Source
This commit is contained in:
imxyy_soope_
2025-10-03 22:17:04 +08:00
parent 1eaee50e82
commit faba8a05e6
44 changed files with 54 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/base.nix
View File

@@ -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";

2
config/hosts/imxyy-nix-wsl/home.nix
View File

@@ -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 = {

2
config/hosts/imxyy-nix-x16/home.nix
View File

@@ -4,7 +4,7 @@
...
}:
{
my.home = {
my.hm = {
home.packages = with pkgs; [
localsend

2
config/hosts/imxyy-nix/home.nix
View File

@@ -4,7 +4,7 @@
...
}:
{
my.home = {
my.hm = {
home.packages = with pkgs; [
localsend

2
flake.nix
View File

@@ -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

4
lib/default.nix
View File

@@ -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
];

2
modules/audio.nix
View File

@@ -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 ];
};
}

4
modules/cli/media/go-musicfox.nix
View File

@@ -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";
};
};

2
modules/cli/media/mpd/default.nix
View File

@@ -13,7 +13,7 @@ lib.my.makeSwitch {
"mpd"
];
config' = {
my.home = {
my.hm = {
home.packages = with pkgs.stable; [
mpd
mpc-cli

2
modules/cli/misc.nix
View File

@@ -48,7 +48,7 @@ lib.my.makeSwitch {
programs.dconf.enable = true;
my.home = {
my.hm = {
home.packages = with pkgs; [
lsd
fd

2
modules/cli/monitor/btop/default.nix
View File

@@ -14,7 +14,7 @@ lib.my.makeHomePackageConfig {
"btop"
];
extraConfig = {
my.home.xdg.configFile."btop" = {
my.hm.xdg.configFile."btop" = {
source = ./config;
recursive = true;
};

6
modules/cli/shell/zsh.nix
View File

@@ -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 = [

2
modules/cli/vcs/git.nix
View File

@@ -16,7 +16,7 @@ lib.my.makeHomeProgramConfig {
"git"
];
extraConfig = {
my.home = {
my.hm = {
programs.git = {
userName = "${userfullname}";
userEmail = "${useremail}";

2
modules/cli/vcs/jj.nix
View File

@@ -16,7 +16,7 @@ lib.my.makeHomeProgramConfig {
"jj"
];
extraConfig = {
my.home = {
my.hm = {
programs.jujutsu = {
settings = {
user = {

2
modules/coding/editor/neovim/default.nix
View File

@@ -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;

2
modules/coding/editor/vscode.nix
View File

@@ -13,7 +13,7 @@ lib.my.makeHomeProgramConfig {
"vscode"
];
extraConfig = {
my.home = {
my.hm = {
programs.vscode = {
package = pkgs.vscodium;
};

2
modules/coding/langs/c.nix
View File

@@ -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

2
modules/coding/langs/go.nix
View File

@@ -14,7 +14,7 @@ lib.my.makeHomePackageConfig {
"go"
];
extraConfig = {
my.home.home.packages = with pkgs; [
my.hm.home.packages = with pkgs; [
gotools
gopls
];

2
modules/coding/langs/java.nix
View File

@@ -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
];

2
modules/coding/langs/js.nix
View File

@@ -13,7 +13,7 @@ lib.my.makeSwitch {
"js"
];
config' = {
my.home = {
my.hm = {
home.packages = with pkgs; [
nodejs
typescript

2
modules/coding/langs/lua.nix
View File

@@ -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

2
modules/coding/langs/python.nix
View File

@@ -14,7 +14,7 @@ lib.my.makeHomePackageConfig {
"python"
];
extraConfig = {
my.home.home.packages = with pkgs; [
my.hm.home.packages = with pkgs; [
uv
pyright
];

2
modules/coding/langs/qml.nix
View File

@@ -13,7 +13,7 @@ lib.my.makeSwitch {
"qml"
];
config' = {
my.home.home.packages = with pkgs; [
my.hm.home.packages = with pkgs; [
kdePackages.qtdeclarative
];
};

2
modules/coding/langs/rust.nix
View File

@@ -13,7 +13,7 @@ lib.my.makeSwitch {
"rust"
];
config' = {
my.home = {
my.hm = {
home.packages = with pkgs; [
(fenix.stable.withComponents [
"cargo"

2
modules/coding/misc.nix
View File

@@ -12,7 +12,7 @@ lib.my.makeSwitch {
"misc"
];
config' = {
my.home = {
my.hm = {
home.packages = with pkgs; [
gnumake
github-cli # gh

2
modules/desktop/browser/chromium.nix
View File

@@ -13,7 +13,7 @@ lib.my.makeHomeProgramConfig {
"chromium"
];
extraConfig = {
my.home.programs.chromium = {
my.hm.programs.chromium = {
package = pkgs.ungoogled-chromium;
extensions = [
{

2
modules/desktop/browser/zen.nix
View File

@@ -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 = {

2
modules/desktop/gaming/minecraft.nix
View File

@@ -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"'

2
modules/desktop/notify/dunst/default.nix
View File

@@ -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;
};
}

2
modules/desktop/notify/swaync/default.nix
View File

@@ -14,7 +14,7 @@ lib.my.makeHomePackageConfig {
"swaync"
];
extraConfig = {
my.home = {
my.hm = {
programs.niri.settings.binds."Mod+End".action.spawn = [
"swaync-client"
"-t"

2
modules/desktop/screencast/obs-studio.nix
View File

@@ -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

4
modules/desktop/style/default.nix
View File

@@ -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 = {

2
modules/desktop/terminal/alacritty/default.nix
View File

@@ -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";

2
modules/desktop/terminal/foot/default.nix
View File

@@ -8,7 +8,7 @@ lib.my.makeHomeProgramConfig {
"foot"
];
extraConfig = {
my.home.programs.foot = {
my.hm.programs.foot = {
server.enable = true;
settings = {
main = {

2
modules/desktop/terminal/ghostty/default.nix
View File

@@ -8,7 +8,7 @@ lib.my.makeHomeProgramConfig {
"ghostty"
];
extraConfig = {
my.home.programs.ghostty = {
my.hm.programs.ghostty = {
enableBashIntegration = true;
enableZshIntegration = true;
installBatSyntax = true;

2
modules/desktop/terminal/kitty/default.nix
View File

@@ -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";

2
modules/desktop/wine.nix
View File

@@ -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

4
modules/desktop/wm/niri/config.nix
View File

@@ -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"

2
modules/desktop/wm/niri/default.nix
View File

@@ -51,7 +51,7 @@ in
wayland.enable = true;
};
};
my.home = {
my.hm = {
home.packages = with pkgs; [
xwayland-satellite-unstable

2
modules/i18n/fcitx5.nix
View File

@@ -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"

4
modules/nix.nix
View File

@@ -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
/*

2
modules/sops.nix
View File

@@ -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

8
modules/user.nix
View File

@@ -103,11 +103,9 @@ lib.my.makeSwitch {
username
];
my.home = {
home = {
inherit username;
homeDirectory = "/home/${username}";
};
my.hm.home = {
inherit username;
homeDirectory = "/home/${username}";
};
};
}

4
modules/xdg.nix
View File

@@ -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; [