Compare commits

...

4 commits

Author SHA1 Message Date
Gabe Venberg d6c331b940 added config options for git delta. 2024-03-28 13:31:11 -05:00
Gabe Venberg fbefcac164 fixed git workdir includes. 2024-03-28 12:19:32 -05:00
Gabe Venberg 380b92d50b justfile defaults to building current machines config.
I think just is still a good fit for this. Much more and a nushell
script might be more appropriate.
2024-03-27 18:05:32 -05:00
Gabe Venberg c5ffac15d3 renamed entrypoint modules to default.nix 2024-03-27 11:30:17 -05:00
16 changed files with 30 additions and 24 deletions

View file

@ -77,12 +77,12 @@
nixvim.homeManagerModules.nixvim nixvim.homeManagerModules.nixvim
]; ];
}; };
"gabe@workstation" = home-manager.lib.homeManagerConfiguration { "gabe@gv-workstation" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs;}; extraSpecialArgs = {inherit inputs outputs;};
# > Our main home-manager configuration file < # > Our main home-manager configuration file <
modules = [ modules = [
./hosts/gabe-workstation.nix ./hosts/gabe-gv-workstation.nix
nixvim.homeManagerModules.nixvim nixvim.homeManagerModules.nixvim
]; ];
}; };

View file

@ -24,9 +24,9 @@
home.username = "gabe"; home.username = "gabe";
home.homeDirectory = "/home/gabe"; home.homeDirectory = "/home/gabe";
imports = [ imports = [
../../modules/home-manager/terminal/terminal.nix ../../modules/home-manager/terminal
../../modules/home-manager/home-manager.nix ../../modules/home-manager
../../modules/home-manager/kittty/kitty.nix ../../modules/home-manager/kittty
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim
]; ];
} }

View file

@ -24,7 +24,7 @@
home.username = "gabe"; home.username = "gabe";
home.homeDirectory = "/home/gabe"; home.homeDirectory = "/home/gabe";
imports = [ imports = [
../modules/home-manager/terminal/terminal.nix ../modules/home-manager/terminal
../modules/home-manager/home-manager.nix ../modules/home-manager
]; ];
} }

View file

@ -27,7 +27,7 @@
home.username = "gabe"; home.username = "gabe";
home.homeDirectory = "/home/gabe"; home.homeDirectory = "/home/gabe";
imports = [ imports = [
../modules/home-manager/terminal/terminal.nix ../modules/home-manager/terminal
../modules/home-manager/home-manager.nix ../modules/home-manager
]; ];
} }

View file

@ -24,9 +24,9 @@
home.username = "gabe"; home.username = "gabe";
home.homeDirectory = "/home/gabe"; home.homeDirectory = "/home/gabe";
imports = [ imports = [
../../modules/home-manager/terminal/terminal.nix ../../modules/home-manager/terminal
../../modules/home-manager/home-manager.nix ../../modules/home-manager
../../modules/home-manager/kittty/kitty.nix ../../modules/home-manager/kittty
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim
]; ];
} }

View file

@ -1,16 +1,16 @@
default: default:
just --list just --list
nixos target: nixos target=`hostname`:
sudo nixos-rebuild --flake .#{{target}} switch sudo nixos-rebuild --flake .#{{target}} switch
home-manager target: home-manager target=(`whoami`+"@"+`hostname`):
home-manager --flake .#{{target}} switch home-manager --flake .#{{target}} switch
check-home-manager target: check-home-manager target=(`whoami`+"@"+`hostname`):
home-manager build --no-out-link --flake .#{{target}} home-manager build --no-out-link --flake .#{{target}}
bootstrap-home-manager target: bootstrap-home-manager target=(`whoami`+"@"+`hostname`):
nix run --extra-experimental-features "nix-command flakes" --no-write-lock-file github:nix-community/home-manager/ -- --extra-experimental-features "nix-command flakes" --flake .#{{target}} switch nix run --extra-experimental-features "nix-command flakes" --no-write-lock-file github:nix-community/home-manager/ -- --extra-experimental-features "nix-command flakes" --flake .#{{target}} switch
format: format:

View file

@ -39,13 +39,13 @@
}; };
imports = [ imports = [
./nushell/nushell.nix ./nushell
./zsh.nix ./zsh.nix
./git.nix ./git.nix
./starship.nix ./starship.nix
./voice.nix ./voice.nix
./nvim/nvim.nix ./nvim
./zellij/zellij.nix ./zellij
]; ];
programs = { programs = {

View file

@ -32,7 +32,13 @@
graph = "log --graph --topo-order --all --pretty=format:'%C(auto)%h %C(cyan)%an %C(blue)%ar %C(auto)%d %s'"; graph = "log --graph --topo-order --all --pretty=format:'%C(auto)%h %C(cyan)%an %C(blue)%ar %C(auto)%d %s'";
recent = "branch --sort=-committerdate --format='%(committerdate:relative)%09%(refname:short)'"; recent = "branch --sort=-committerdate --format='%(committerdate:relative)%09%(refname:short)'";
}; };
delta.enable = true; delta = {
enable = true;
options = {
side-by-side = true;
line-numbers = true;
};
};
# difftastic.enable=true; # difftastic.enable=true;
# difftastic.background="dark"; # difftastic.background="dark";
userEmail = config.host.git.profile.email; userEmail = config.host.git.profile.email;
@ -68,7 +74,7 @@
if config.host.git.workProfile.enable if config.host.git.workProfile.enable
then [ then [
{ {
condition = "gitdir:~/work/"; condition = "gitdir:~/work/**";
contents.user.email = config.host.git.workProfile.email; contents.user.email = config.host.git.workProfile.email;
} }
] ]

View file

@ -31,8 +31,8 @@
./gitsigns.nix ./gitsigns.nix
./which-key.nix ./which-key.nix
./telescope.nix ./telescope.nix
./treesitter/treesitter.nix ./treesitter
./cmp/cmp.nix ./cmp
./lsp/lsp.nix ./lsp
]; ];
} }