From ad7ae417b96d5ca63e067aab43aa48bf341551d0 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 15 Jul 2024 17:28:58 +0200 Subject: [PATCH] Replace shell aliases with justfile recipes for managing nix commands --- flake/formatter.nix | 7 +++++-- justfile | 24 ++++++++++++++++++++++++ modules/nixos/nix-helper.nix | 11 ----------- users/seb/home.nix | 1 + 4 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 justfile diff --git a/flake/formatter.nix b/flake/formatter.nix index f6bf331..cdccc7b 100644 --- a/flake/formatter.nix +++ b/flake/formatter.nix @@ -6,8 +6,11 @@ formatter = (inputs.treefmt-nix.lib.evalModule pkgs { projectRootFile = "flake.nix"; - programs.nixfmt.enable = true; - programs.prettier.enable = true; + programs = { + nixfmt.enable = true; + prettier.enable = true; + just.enable = true; + }; }).config.build.wrapper; }; } diff --git a/justfile b/justfile new file mode 100644 index 0000000..10706c8 --- /dev/null +++ b/justfile @@ -0,0 +1,24 @@ +set quiet := true + +rebuild := "sudo -v && nh os" + +default: + just --list --unsorted + +switch: + {{ rebuild }} switch + +test: + {{ rebuild }} test + +boot: + {{ rebuild }} boot + +reboot: boot + reboot + +update: + nix flake update + +fmt: + nix fmt diff --git a/modules/nixos/nix-helper.nix b/modules/nixos/nix-helper.nix index 5cf5512..47f705e 100644 --- a/modules/nixos/nix-helper.nix +++ b/modules/nixos/nix-helper.nix @@ -5,16 +5,5 @@ config = lib.mkIf config.myConfig.nix-helper.enable { environment.sessionVariables.FLAKE = "/home/seb/Projects/nixos/my-config"; programs.nh.enable = true; - - environment.shellAliases = - let - rebuild = "sudo -v && nh os"; - in - { - nrs = "${rebuild} switch"; - nrt = "${rebuild} test"; - nrb = "${rebuild} boot"; - nrrb = "nrb && reboot"; - }; }; } diff --git a/users/seb/home.nix b/users/seb/home.nix index 2c9ae00..8e48f55 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -15,6 +15,7 @@ home.packages = [ pkgs.fastfetch + pkgs.just pkgs.cinnamon.nemo-with-extensions pkgs.jetbrains.idea-community