From c5ffac15d31539a1b994885860a9a84304e0db4a Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Wed, 27 Mar 2024 11:30:17 -0500 Subject: [PATCH 1/4] renamed entrypoint modules to default.nix --- hosts/archlaptop-vm/home.nix | 6 +++--- hosts/gabe-archlaptop.nix | 4 ++-- hosts/gabe-workstation.nix | 4 ++-- hosts/workstation-vm/home.nix | 6 +++--- modules/home-manager/{home-manager.nix => default.nix} | 0 modules/home-manager/kittty/{kitty.nix => default.nix} | 0 modules/home-manager/terminal/{terminal.nix => default.nix} | 6 +++--- .../terminal/nushell/{nushell.nix => default.nix} | 0 .../home-manager/terminal/nvim/cmp/{cmp.nix => default.nix} | 0 .../home-manager/terminal/nvim/{nvim.nix => default.nix} | 6 +++--- .../home-manager/terminal/nvim/lsp/{lsp.nix => default.nix} | 0 .../nvim/treesitter/{treesitter.nix => default.nix} | 0 .../terminal/zellij/{zellij.nix => default.nix} | 0 13 files changed, 16 insertions(+), 16 deletions(-) rename modules/home-manager/{home-manager.nix => default.nix} (100%) rename modules/home-manager/kittty/{kitty.nix => default.nix} (100%) rename modules/home-manager/terminal/{terminal.nix => default.nix} (94%) rename modules/home-manager/terminal/nushell/{nushell.nix => default.nix} (100%) rename modules/home-manager/terminal/nvim/cmp/{cmp.nix => default.nix} (100%) rename modules/home-manager/terminal/nvim/{nvim.nix => default.nix} (89%) rename modules/home-manager/terminal/nvim/lsp/{lsp.nix => default.nix} (100%) rename modules/home-manager/terminal/nvim/treesitter/{treesitter.nix => default.nix} (100%) rename modules/home-manager/terminal/zellij/{zellij.nix => default.nix} (100%) diff --git a/hosts/archlaptop-vm/home.nix b/hosts/archlaptop-vm/home.nix index e63168b..8067937 100644 --- a/hosts/archlaptop-vm/home.nix +++ b/hosts/archlaptop-vm/home.nix @@ -24,9 +24,9 @@ home.username = "gabe"; home.homeDirectory = "/home/gabe"; imports = [ - ../../modules/home-manager/terminal/terminal.nix - ../../modules/home-manager/home-manager.nix - ../../modules/home-manager/kittty/kitty.nix + ../../modules/home-manager/terminal + ../../modules/home-manager + ../../modules/home-manager/kittty inputs.nixvim.homeManagerModules.nixvim ]; } diff --git a/hosts/gabe-archlaptop.nix b/hosts/gabe-archlaptop.nix index 7846018..9712f25 100644 --- a/hosts/gabe-archlaptop.nix +++ b/hosts/gabe-archlaptop.nix @@ -24,7 +24,7 @@ home.username = "gabe"; home.homeDirectory = "/home/gabe"; imports = [ - ../modules/home-manager/terminal/terminal.nix - ../modules/home-manager/home-manager.nix + ../modules/home-manager/terminal + ../modules/home-manager ]; } diff --git a/hosts/gabe-workstation.nix b/hosts/gabe-workstation.nix index 099cba4..d85725b 100644 --- a/hosts/gabe-workstation.nix +++ b/hosts/gabe-workstation.nix @@ -27,7 +27,7 @@ home.username = "gabe"; home.homeDirectory = "/home/gabe"; imports = [ - ../modules/home-manager/terminal/terminal.nix - ../modules/home-manager/home-manager.nix + ../modules/home-manager/terminal + ../modules/home-manager ]; } diff --git a/hosts/workstation-vm/home.nix b/hosts/workstation-vm/home.nix index e63168b..8067937 100644 --- a/hosts/workstation-vm/home.nix +++ b/hosts/workstation-vm/home.nix @@ -24,9 +24,9 @@ home.username = "gabe"; home.homeDirectory = "/home/gabe"; imports = [ - ../../modules/home-manager/terminal/terminal.nix - ../../modules/home-manager/home-manager.nix - ../../modules/home-manager/kittty/kitty.nix + ../../modules/home-manager/terminal + ../../modules/home-manager + ../../modules/home-manager/kittty inputs.nixvim.homeManagerModules.nixvim ]; } diff --git a/modules/home-manager/home-manager.nix b/modules/home-manager/default.nix similarity index 100% rename from modules/home-manager/home-manager.nix rename to modules/home-manager/default.nix diff --git a/modules/home-manager/kittty/kitty.nix b/modules/home-manager/kittty/default.nix similarity index 100% rename from modules/home-manager/kittty/kitty.nix rename to modules/home-manager/kittty/default.nix diff --git a/modules/home-manager/terminal/terminal.nix b/modules/home-manager/terminal/default.nix similarity index 94% rename from modules/home-manager/terminal/terminal.nix rename to modules/home-manager/terminal/default.nix index a9f57c8..02341fd 100644 --- a/modules/home-manager/terminal/terminal.nix +++ b/modules/home-manager/terminal/default.nix @@ -39,13 +39,13 @@ }; imports = [ - ./nushell/nushell.nix + ./nushell ./zsh.nix ./git.nix ./starship.nix ./voice.nix - ./nvim/nvim.nix - ./zellij/zellij.nix + ./nvim + ./zellij ]; programs = { diff --git a/modules/home-manager/terminal/nushell/nushell.nix b/modules/home-manager/terminal/nushell/default.nix similarity index 100% rename from modules/home-manager/terminal/nushell/nushell.nix rename to modules/home-manager/terminal/nushell/default.nix diff --git a/modules/home-manager/terminal/nvim/cmp/cmp.nix b/modules/home-manager/terminal/nvim/cmp/default.nix similarity index 100% rename from modules/home-manager/terminal/nvim/cmp/cmp.nix rename to modules/home-manager/terminal/nvim/cmp/default.nix diff --git a/modules/home-manager/terminal/nvim/nvim.nix b/modules/home-manager/terminal/nvim/default.nix similarity index 89% rename from modules/home-manager/terminal/nvim/nvim.nix rename to modules/home-manager/terminal/nvim/default.nix index 55e3a88..7baf16b 100644 --- a/modules/home-manager/terminal/nvim/nvim.nix +++ b/modules/home-manager/terminal/nvim/default.nix @@ -31,8 +31,8 @@ ./gitsigns.nix ./which-key.nix ./telescope.nix - ./treesitter/treesitter.nix - ./cmp/cmp.nix - ./lsp/lsp.nix + ./treesitter + ./cmp + ./lsp ]; } diff --git a/modules/home-manager/terminal/nvim/lsp/lsp.nix b/modules/home-manager/terminal/nvim/lsp/default.nix similarity index 100% rename from modules/home-manager/terminal/nvim/lsp/lsp.nix rename to modules/home-manager/terminal/nvim/lsp/default.nix diff --git a/modules/home-manager/terminal/nvim/treesitter/treesitter.nix b/modules/home-manager/terminal/nvim/treesitter/default.nix similarity index 100% rename from modules/home-manager/terminal/nvim/treesitter/treesitter.nix rename to modules/home-manager/terminal/nvim/treesitter/default.nix diff --git a/modules/home-manager/terminal/zellij/zellij.nix b/modules/home-manager/terminal/zellij/default.nix similarity index 100% rename from modules/home-manager/terminal/zellij/zellij.nix rename to modules/home-manager/terminal/zellij/default.nix From 380b92d50b8916a19046aa867c63515850eddddb Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Wed, 27 Mar 2024 18:05:32 -0500 Subject: [PATCH 2/4] 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. --- flake.nix | 4 ++-- hosts/{gabe-workstation.nix => gabe-gv-workstation.nix} | 0 justfile | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename hosts/{gabe-workstation.nix => gabe-gv-workstation.nix} (100%) diff --git a/flake.nix b/flake.nix index 240d144..5b46e25 100644 --- a/flake.nix +++ b/flake.nix @@ -77,12 +77,12 @@ 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 extraSpecialArgs = {inherit inputs outputs;}; # > Our main home-manager configuration file < modules = [ - ./hosts/gabe-workstation.nix + ./hosts/gabe-gv-workstation.nix nixvim.homeManagerModules.nixvim ]; }; diff --git a/hosts/gabe-workstation.nix b/hosts/gabe-gv-workstation.nix similarity index 100% rename from hosts/gabe-workstation.nix rename to hosts/gabe-gv-workstation.nix diff --git a/justfile b/justfile index 3763e65..f765370 100644 --- a/justfile +++ b/justfile @@ -1,16 +1,16 @@ default: just --list -nixos target: +nixos target=`hostname`: sudo nixos-rebuild --flake .#{{target}} switch -home-manager target: +home-manager target=(`whoami`+"@"+`hostname`): home-manager --flake .#{{target}} switch -check-home-manager target: +check-home-manager target=(`whoami`+"@"+`hostname`): 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 format: From fbefcac1643f576b62b4a486f1462d05654eba9c Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Thu, 28 Mar 2024 12:19:32 -0500 Subject: [PATCH 3/4] fixed git workdir includes. --- modules/home-manager/terminal/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home-manager/terminal/git.nix b/modules/home-manager/terminal/git.nix index c8b092d..2cb9226 100644 --- a/modules/home-manager/terminal/git.nix +++ b/modules/home-manager/terminal/git.nix @@ -68,7 +68,7 @@ if config.host.git.workProfile.enable then [ { - condition = "gitdir:~/work/"; + condition = "gitdir:~/work/**"; contents.user.email = config.host.git.workProfile.email; } ] From d6c331b940f40cd139324def53c761d6e8c4d4e9 Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Thu, 28 Mar 2024 13:31:11 -0500 Subject: [PATCH 4/4] added config options for git delta. --- modules/home-manager/terminal/git.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/home-manager/terminal/git.nix b/modules/home-manager/terminal/git.nix index 2cb9226..5d36d93 100644 --- a/modules/home-manager/terminal/git.nix +++ b/modules/home-manager/terminal/git.nix @@ -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'"; 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.background="dark"; userEmail = config.host.git.profile.email;