-repl-flakes, fix:homeConfiguration module

flake.nix

@@ -48,7 +48,7 @@
       "m3tam3re@m3-kratos-vm" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages."x86_64-linux";
         extraSpecialArgs = {inherit inputs outputs;};
-        modules = [./home/m3tam3re/m3tam3re.nix];
+        modules = [./home/m3tam3re/m3-kratos.nix];
       };
     };
   };

home/common/default.nix

@@ -1,4 +1,10 @@
-{ config, lib, outputs, pkgs, ... }: {
+{
+  config,
+  lib,
+  outputs,
+  pkgs,
+  ...
+}: {
   nixpkgs = {
     # You can add overlays here
     overlays = [
@@ -29,7 +35,7 @@
   nix = {
     package = lib.mkDefault pkgs.nix;
     settings = {
-      experimental-features = [ "nix-command" "flakes" "repl-flake" ];
+      experimental-features = ["nix-command" "flakes"];
       warn-dirty = false;
     };
   };

home/features/cli/default.nix

@@ -0,0 +1,31 @@
+{pkgs, ...}: {
+  imports = [
+    ./fish.nix
+  ];
+
+  programs.zoxide = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
+  programs.eza = {
+    enable = true;
+    enableFishIntegration = true;
+    enableBashIntegration = true;
+    extraOptions = ["-l" "--icons" "--git" "-a"];
+  };
+
+  programs.bat = {enable = true;};
+
+  home.packages = with pkgs; [
+    coreutils
+    fd
+    htop
+    httpie
+    jq
+    procs
+    ripgrep
+    tldr
+    zip
+  ];
+}

home/features/cli/fish.nix

@@ -0,0 +1,32 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.features.cli.fish;
+in {
+  options.features.cli.fish.enable = mkEnableOption "enable extended fish configuration";
+
+  config = mkIf cfg.enable {
+    programs.fish = {
+      enable = true;
+      loginShellInit = ''
+        set -x NIX_PATH nixpkgs=channel:nixos-unstable
+        set -x NIX_LOG info
+        set -x TERMINAL kitty
+
+        if test (tty) = "/dev/tty1"
+          exec Hyprland &> /dev/null
+        end
+      '';
+      shellAbbrs = {
+        ".." = "cd ..";
+        "..." = "cd ../..";
+        ls = "eza";
+        grep = "rg";
+        ps = "procs";
+      };
+    };
+  };
+}

home/m3tam3re/home.nix

@@ -24,7 +24,8 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = with pkgs; [
-    cowsay
+    kitty
+    wofi
     # # Adds the 'hello' command to your environment. It prints a friendly
     # # "Hello, world!" when run.
     # pkgs.hello

home/m3tam3re/m3-kratos.nix

@@ -1 +1,13 @@
-{ config, ... }: { imports = [ ./home.nix ../common ]; }
+{config, ...}: {
+  imports = [
+    ../common
+    ../features/cli
+    ./home.nix
+  ];
+
+  features = {
+    cli = {
+      fish.enable = false;
+    };
+  };
+}

hosts/common/default.nix

@@ -1,5 +1,6 @@
 # Common configuration for all hosts
 {
+  pkgs,
   lib,
   inputs,
   outputs,
@@ -56,4 +57,5 @@
       ((lib.filterAttrs (_: lib.isType "flake")) inputs);
     nixPath = ["/etc/nix/path"];
   };
+  users.defaultUserShell = pkgs.fish;
 }

hosts/common/users/m3tam3re.nix

@@ -26,5 +26,5 @@
     packages = [inputs.home-manager.packages.${pkgs.system}.default];
   };
   home-manager.users.m3tam3re =
-    import m3tam3re/${config.networking.hostName}.nix;
+    import ../../../home/m3tam3re/${config.networking.hostName}.nix;
 }

hosts/m3-kratos/configuration.nix

@@ -79,6 +79,9 @@
     enable = true;
     xwayland.enable = true;
   };
+
+  programs.fish.enable = true;
+
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];