completely remove secondary home-manager section

This commit is contained in:
Noah Masur 2022-04-28 21:40:21 -04:00
parent cb66ca402e
commit 2a225debe5
9 changed files with 291 additions and 277 deletions

View File

@ -37,6 +37,7 @@
inherit user fullName font;
};
modules = [
home-manager.nixosModules.home-manager
./nixos/configuration.nix
./nixos/hardware-configuration.nix
./nixos/home.nix
@ -45,17 +46,6 @@
./modules/gaming
./modules/services/keybase.nix
./modules/applications/firefox.nix
home-manager.nixosModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
gui = true;
inherit user fullName font;
};
users.${user} = {
imports = [
./modules/applications/alacritty.nix
./modules/shell/fish.nix
./modules/shell/utilities.nix
@ -65,10 +55,6 @@
];
};
};
}
];
};
};
devShells.x86_64-linux.default = pkgs.mkShell {
buildInputs = with pkgs; [ stylua nixfmt shfmt shellcheck ];

View File

@ -1,4 +1,6 @@
{ pkgs, config, font, ... }: {
{ pkgs, user, font, ... }: {
home-manager.users.${user} = {
programs.alacritty = {
enable = true;
settings = {
@ -68,4 +70,5 @@
draw_bold_text_with_bright_colors = false;
};
};
};
}

View File

@ -1,13 +1,19 @@
{ config, pkgs, ... }: {
{ pkgs, user, ... }: {
home-manager.users.${user} = {
home.packages = with pkgs; [
neovim
gcc # for tree-sitter
];
xdg.configFile = { "nvim/init.lua".source = ../../nvim.configlink/init.lua; };
xdg.configFile = {
"nvim/init.lua".source = ../../nvim.configlink/init.lua;
};
programs.git.extraConfig.core.editor = "nvim";
home.sessionVariables = { EDITOR = "nvim"; };
};
}

View File

@ -3,7 +3,16 @@
services.keybase.enable = true;
services.kbfs.enable = true;
home-manager.users.${user}.home.packages =
[ (lib.mkIf gui pkgs.keybase-gui) ];
home-manager.users.${user} = {
home.packages = [ (lib.mkIf gui pkgs.keybase-gui) ];
home.file = let
ignorePatterns = ''
keybase/
kbfs/'';
in {
".rgignore".text = ignorePatterns;
".fdignore".text = ignorePatterns;
};
};
}

View File

@ -1,5 +1,6 @@
{ pkgs, ... }: {
{ pkgs, user, ... }: {
home-manager.users.${user} = {
programs.fish = {
enable = true;
functions = { };
@ -112,4 +113,5 @@
"starship.toml".source = ../../starship/starship.toml.configlink;
"fish/functions".source = ../../fish.configlink/functions;
};
};
}

View File

@ -1,5 +1,6 @@
{ config, pkgs, fullName, ... }: {
{ pkgs, user, fullName, ... }: {
home-manager.users.${user} = {
programs.git = {
enable = true;
userName = fullName;
@ -39,5 +40,6 @@
gcp = "git cherry-pick";
cdg = "cd (git rev-parse --show-toplevel)";
};
};
}

View File

@ -1,7 +1,8 @@
{ config, pkgs, ... }: {
{ pkgs, user, ... }: {
imports = [ ./git.nix ];
home-manager.users.${user} = {
programs.gh = {
enable = true;
enableGitCredentialHelper = true;
@ -10,10 +11,12 @@
programs.fish.shellAbbrs = {
ghr = "gh repo view -w";
gha = "gh run list | head -1 | awk '{ print $(NF-2) }' | xargs gh run view";
gha =
"gh run list | head -1 | awk '{ print $(NF-2) }' | xargs gh run view";
grw = "gh run watch";
grf = "gh run view --log-failed";
grl = "gh run view --log";
};
};
}

View File

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ pkgs, user, ... }:
let
@ -9,14 +9,13 @@ let
!*.tfvars
.terraform/
.target/
/Library/
keybase/
kbfs/
'';
/Library/'';
in {
home.packages = with pkgs; [
home-manager.users.${user}.home = {
packages = with pkgs; [
unzip
rsync
fzf
@ -35,9 +34,11 @@ in {
glow
];
home.file = {
file = {
".rgignore".text = ignorePatterns;
".fdignore".text = ignorePatterns;
};
};
}

View File

@ -5,6 +5,8 @@ let
notes_path = "$HOME/dev/personal/notes";
in {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${user} = {
nixpkgs.config.allowUnfree = true;