motiejus
/
config
1
Fork 0
Code Packages Releases Activity

hm: clean up

This commit is contained in:
Motiejus Jakštys 2024-02-04 22:23:56 +02:00
parent a186d68041
commit b0b87e67f8
4 changed files with 124 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -309,6 +309,7 @@
]; ];
extraSpecialArgs = { extraSpecialArgs = {
stateVersion = "23.05"; stateVersion = "23.05";
username = "motiejus";
email = "motiejusja@wix.com"; email = "motiejusja@wix.com";
devTools = true; devTools = true;
hmOnly = true; hmOnly = true;

13
hosts/vm/configuration.nix
View File

@ -14,8 +14,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.users.nixos = {pkgs, ...}: home-manager.users.nixos = {pkgs, ...}:
lib.mkMerge [ import ../../shared/home/default.nix {
(import ../../shared/home/default.nix {
inherit lib; inherit lib;
inherit pkgs; inherit pkgs;
inherit (config.mj) stateVersion; inherit (config.mj) stateVersion;
@ -23,17 +22,7 @@
devTools = true; devTools = true;
hmOnly = false; hmOnly = false;
email = "motiejus@jakstys.lt"; email = "motiejus@jakstys.lt";
})
{
programs.bash = {
enable = true;
shellAliases = {
"l" = "echo -n ł | xclip -selection clipboard";
"gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
}; };
};
}
];
mj = { mj = {
stateVersion = "23.11"; stateVersion = "23.11";

15
modules/base/users/default.nix
View File

@ -61,24 +61,13 @@ in {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.users.motiejus = {pkgs, ...}: home-manager.users.motiejus = {pkgs, ...}:
lib.mkMerge [ import ../../../shared/home/default.nix {
(import ../../../shared/home/default.nix {
inherit lib; inherit lib;
inherit pkgs; inherit pkgs;
inherit (config.mj) stateVersion; inherit (config.mj) stateVersion;
inherit (config.mj.base.users) devTools; inherit (cfg) devTools;
hmOnly = false; hmOnly = false;
email = "motiejus@jakstys.lt"; email = "motiejus@jakstys.lt";
})
{
programs.bash = {
enable = true;
shellAliases = {
"l" = "echo -n ł | xclip -selection clipboard";
"gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
}; };
}; };
} }
];
};
}

16
shared/home/default.nix
View File

@ -98,7 +98,8 @@ in {
]) ])
]; ];
programs = { programs = lib.mkMerge [
{
direnv.enable = true; direnv.enable = true;
man = { man = {
enable = true; enable = true;
@ -198,5 +199,18 @@ in {
bind '"' split-window -v -c "#{pane_current_path}" bind '"' split-window -v -c "#{pane_current_path}"
''; '';
}; };
}
(
lib.mkIf (!hmOnly)
{
bash = {
enable = true;
shellAliases = {
"l" = "echo -n ł | xclip -selection clipboard";
"gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
};
}; };
} }
)
];
}