diff --git a/.envrc b/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/.gitignore b/.gitignore index e81be07..1df9283 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,3 @@ result-* # ---> Kate # Ignore kate's swap files *.kate-swp - - -# ---> Direnv -.direnv diff --git a/.justfile b/.justfile deleted file mode 100644 index 64c0604..0000000 --- a/.justfile +++ /dev/null @@ -1,17 +0,0 @@ -# Hide the default option from the recipes list -_default: print-recipes - -find-results: - find . -name '*result*' - -print-recipes: - @just --list - -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 diff --git a/flake.nix b/flake.nix index 283a6e4..c38ecab 100644 --- a/flake.nix +++ b/flake.nix @@ -101,15 +101,13 @@ in { devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell { - name = "toast-devshell"; + name = "Environment for toast's nixos configurations"; # 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; [ agenix.packages.x86_64-linux.default git nix-diff - just - nix-diff ]; shellHook ='' export PS1="$PS1(toast-configs)> " diff --git a/roles/common/programs/bash.nix b/roles/common/programs/bash.nix index a87dea5..c1684bf 100644 --- a/roles/common/programs/bash.nix +++ b/roles/common/programs/bash.nix @@ -2,9 +2,6 @@ { home-manager.users.toast = { config, ... }: { - programs.bash = { - enable = true; - enableVteIntegration = true; + programs.bash.enable = true; }; - }; } diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix index bc89f3a..8641b50 100755 --- a/roles/common/programs/default.nix +++ b/roles/common/programs/default.nix @@ -14,7 +14,6 @@ ./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 deleted file mode 100644 index c0ab11a..0000000 --- a/roles/common/programs/direnv.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: - -{ - programs.direnv = { - enable = true; - nix-direnv = { - enable = true; - }; - }; -}