merging some changes
This commit is contained in:
parent
3e16e02840
commit
a0ca5540e7
14 changed files with 359 additions and 27 deletions
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
environment = {
|
||||
variables = {
|
||||
TERMINAL = "kitty";
|
||||
TERMINAL = "alacritty";
|
||||
EDITOR = "nvim";
|
||||
VISUAL = "nvim";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,9 +20,10 @@
|
|||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit user devenv; };
|
||||
home-manager.extraSpecialArgs = { inherit user devenv inputs; };
|
||||
home-manager.users.${user} = {
|
||||
imports = [ (import ./home.nix) ] ++ [ (import ./thinkpad/home.nix) ];
|
||||
|
||||
};
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, stable, user, devenv, ... }:
|
||||
{ config, lib, pkgs, stable, user, devenv, inputs, ... }:
|
||||
|
||||
{
|
||||
imports = # Home Manager Modules
|
||||
|
|
@ -6,8 +6,12 @@
|
|||
[ (import ../modules/programs/wofi.nix) ] ++
|
||||
[ (import ../modules/editors/nvim/home.nix) ] ++
|
||||
[ (import ../modules/programs/devenv/home.nix) ] ++
|
||||
[ (import ../modules/programs/kitty.nix) ] ++
|
||||
[ (import ../modules/shell/tmux/home.nix) ] ++
|
||||
[ (import ../modules/editors/lvim/home.nix) ] ++
|
||||
[ (import ../modules/themes/home.nix) ] ++
|
||||
[ (import ../modules/programs/mako.nix) ] ++
|
||||
[ (import ../modules/programs/alacritty.nix) ] ++
|
||||
[ (import ../modules/shell/zsh/home.nix) ];
|
||||
|
||||
|
||||
|
|
@ -21,6 +25,7 @@
|
|||
homeDirectory = "/home/${user}";
|
||||
|
||||
packages = with pkgs; [
|
||||
libnotify
|
||||
jetbrains.datagrip
|
||||
kubernetes-helm
|
||||
argocd
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue