From 7f8155840c3a00f6d67879bcdc55061ccda57aa5 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 23 Feb 2024 10:42:44 +0100 Subject: [PATCH 01/10] Flake: change name of devshell --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c38ecab..825c5dd 100644 --- a/flake.nix +++ b/flake.nix @@ -101,7 +101,7 @@ in { devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell { - name = "Environment for toast's nixos configurations"; + name = "toast-devshell"; # The agenix cli is not needed to activate a configuration, so instead of installing it # I'll just add it to de devShell, since that's the only real time I'm going to use it. packages = with nixpkgs.legacyPackages.x86_64-linux; [ From 2018954c98d3488ed0326e42ce6c1dd9491b0073 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 23 Feb 2024 11:03:35 +0100 Subject: [PATCH 02/10] Common/bash: enable VTE integration --- roles/common/programs/bash.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/common/programs/bash.nix b/roles/common/programs/bash.nix index c1684bf..a87dea5 100644 --- a/roles/common/programs/bash.nix +++ b/roles/common/programs/bash.nix @@ -2,6 +2,9 @@ { home-manager.users.toast = { config, ... }: { - programs.bash.enable = true; + programs.bash = { + enable = true; + enableVteIntegration = true; }; + }; } From c0529d52257c7eb1c1b2e68be892895ab44050d8 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 23 Feb 2024 12:07:22 +0100 Subject: [PATCH 03/10] Common: add direnv --- roles/common/programs/default.nix | 1 + roles/common/programs/direnv.nix | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 roles/common/programs/direnv.nix diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix index 8641b50..bc89f3a 100755 --- a/roles/common/programs/default.nix +++ b/roles/common/programs/default.nix @@ -14,6 +14,7 @@ ./bat.nix ./btop.nix ./helix.nix + ./direnv.nix ]; # Some programs dont have a programs.*.enable option, so I install their package here environment.systemPackages = with pkgs; [ diff --git a/roles/common/programs/direnv.nix b/roles/common/programs/direnv.nix new file mode 100644 index 0000000..af02580 --- /dev/null +++ b/roles/common/programs/direnv.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + programs.direnv = { + enable = true; + }; +} From 61c2b3dcbbc1ef5b3c594ef292a92a2ade6d43b0 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 23 Feb 2024 12:08:19 +0100 Subject: [PATCH 04/10] Common/direnv: enable nix-direnv --- roles/common/programs/direnv.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/common/programs/direnv.nix b/roles/common/programs/direnv.nix index af02580..c0ab11a 100644 --- a/roles/common/programs/direnv.nix +++ b/roles/common/programs/direnv.nix @@ -1,7 +1,10 @@ -{ ... }: +{ ... }: { programs.direnv = { enable = true; + nix-direnv = { + enable = true; + }; }; } From 06ec5105999ac1e37fa865c00aed4d1f44afe25f Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 23 Feb 2024 12:10:47 +0100 Subject: [PATCH 05/10] Add .envrc --- .envrc | 1 + .gitignore | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index 1df9283..e81be07 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,7 @@ result-* # ---> Kate # Ignore kate's swap files *.kate-swp + + +# ---> Direnv +.direnv From 975b402ff7030bc17c8481e26c381e89e9c0714a Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 23 Feb 2024 12:32:04 +0100 Subject: [PATCH 06/10] Flake: add just to devshell --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 825c5dd..4e99901 100644 --- a/flake.nix +++ b/flake.nix @@ -108,6 +108,7 @@ agenix.packages.x86_64-linux.default git nix-diff + just ]; shellHook ='' export PS1="$PS1(toast-configs)> " From e2d5273ed8bab0b0cc432da8eb4e2faa87d599df Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 23 Feb 2024 12:32:17 +0100 Subject: [PATCH 07/10] Add justfile --- .justfile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .justfile diff --git a/.justfile b/.justfile new file mode 100644 index 0000000..9c7c34e --- /dev/null +++ b/.justfile @@ -0,0 +1,8 @@ +# Hide the default option from the recipes list +_default: print-recipes + +find-results: + find . -name '*result*' + +print-recipes: + @just --list From 8b2709ae33a2760caec4bca860b348a081e1a628 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 23 Feb 2024 12:50:00 +0100 Subject: [PATCH 08/10] Justfile: add build-nixos recipe --- .justfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.justfile b/.justfile index 9c7c34e..a9173e3 100644 --- a/.justfile +++ b/.justfile @@ -6,3 +6,8 @@ find-results: print-recipes: @just --list + +alias build := build-nixos +# Build a NixOS configuration +build-nixos host=`hostname`: + nixos-rebuild build --flake .#{{host}} From a9aa0dff0011b7fcc68b7b45c2a0bc604b0a8458 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 23 Feb 2024 12:59:07 +0100 Subject: [PATCH 09/10] Flake: add nix-diff to devshell --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 4e99901..283a6e4 100644 --- a/flake.nix +++ b/flake.nix @@ -109,6 +109,7 @@ git nix-diff just + nix-diff ]; shellHook ='' export PS1="$PS1(toast-configs)> " From f012eb6d2bef1cd3881668b8a7c5984011f0cad4 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 23 Feb 2024 13:43:25 +0100 Subject: [PATCH 10/10] Justfile: add nix-diff recipe --- .justfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.justfile b/.justfile index a9173e3..64c0604 100644 --- a/.justfile +++ b/.justfile @@ -11,3 +11,7 @@ alias build := build-nixos # Build a NixOS configuration build-nixos host=`hostname`: nixos-rebuild build --flake .#{{host}} + +# nix-diff with some parameters piped to less +nix-diff left right: + nix-diff --color=always --skip-already-compared {{left}} {{right}} | less -F