-repl-flakes, fix:homeConfiguration module

flake.lock

@@ -38,16 +38,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1711668574,
-        "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
+        "lastModified": 1724531977,
+        "narHash": "sha256-XROVLf9ti4rrNCFLr+DmXRZtPjCQTW4cYy59owTEmxk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
+        "rev": "2527da1ef492c495d5391f3bcf9c1dd9f4514e32",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -39,16 +39,16 @@
       forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
     overlays = import ./overlays {inherit inputs;};
     nixosConfigurations = {
-      m3-kratos = nixpkgs.lib.nixosSystem {
+      m3-kratos-vm = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
         modules = [./hosts/m3-kratos];
       };
     };
     homeConfigurations = {
-      "m3tam3re@m3tam3re" = home-manager.lib.homeManagerConfiguration {
+      "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,33 @@
+{pkgs, ...}: {
+  imports = [
+    ./fish.nix
+    ./fzf.nix
+    ./neofetch.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/features/cli/fzf.nix

@@ -0,0 +1,38 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.features.cli.fzf;
+in {
+  options.features.cli.fzf.enable = mkEnableOption "enable fuzzy finder";
+
+  config = mkIf cfg.enable {
+    programs.fzf = {
+      enable = true;
+      enableFishIntegration = true;
+
+      colors = {
+        "fg" = "#f8f8f2";
+        "bg" = "#282a36";
+        "hl" = "#bd93f9";
+        "fg+" = "#f8f8f2";
+        "bg+" = "#44475a";
+        "hl+" = "#bd93f9";
+        "info" = "#ffb86c";
+        "prompt" = "#50fa7b";
+        "pointer" = "#ff79c6";
+        "marker" = "#ff79c6";
+        "spinner" = "#ffb86c";
+        "header" = "#6272a4";
+      };
+      defaultOptions = [
+        "--preview='bat --color=always -n {}'"
+        "--bind 'ctrl-/:toggle-preview'"
+      ];
+      defaultCommand = "fd --type f --exclude .git --follow --hidden";
+      changeDirWidgetCommand = "fd --type d --exclude .git --follow --hidden";
+    };
+  };
+}

home/features/cli/neofetch.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.features.cli.neofetch;
+in {
+  options.features.cli.neofetch.enable = mkEnableOption "enable neofetch";
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [neofetch];
+  };
+}

home/features/desktop/default.nix

@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  imports = [
+    ./wayland.nix
+  ];
+
+  home.packages = with pkgs; [
+  ];
+}

home/features/desktop/wayland.nix

@@ -0,0 +1,251 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.features.desktop.wayland;
+in {
+  options.features.desktop.wayland.enable = mkEnableOption "wayland extra tools and config";
+
+  config = mkIf cfg.enable {
+    programs.waybar = {
+      enable = true;
+      style = ''
+        @define-color background-darker rgba(30, 31, 41, 230);
+        @define-color background #282a36;
+        @define-color selection #44475a;
+        @define-color foreground #f8f8f2;
+        @define-color comment #6272a4;
+        @define-color cyan #8be9fd;
+        @define-color green #50fa7b;
+        @define-color orange #ffb86c;
+        @define-color pink #ff79c6;
+        @define-color purple #bd93f9;
+        @define-color red #ff5555;
+        @define-color yellow #f1fa8c;
+
+        * {
+            border: none;
+            border-radius: 0;
+            font-family: FiraCode Nerd Font;
+            font-weight: bold;
+            font-size: 14px;
+            min-height: 0;
+        }
+
+        window#waybar {
+            background: rgba(21, 18, 27, 0);
+            color: #cdd6f4;
+        }
+
+        tooltip {
+            background: #1e1e2e;
+            border-radius: 10px;
+            border-width: 2px;
+            border-style: solid;
+            border-color: #11111b;
+        }
+
+        #workspaces button {
+            padding: 5px;
+            color: #313244;
+            margin-right: 5px;
+        }
+
+        #workspaces button.active {
+            color: #11111b;
+            background: #a6e3a1;
+            border-radius: 10px;
+        }
+
+        #workspaces button.focused {
+            color: #a6adc8;
+            background: #eba0ac;
+            border-radius: 10px;
+        }
+
+        #workspaces button.urgent {
+            color: #11111b;
+            background: #a6e3a1;
+            border-radius: 10px;
+        }
+
+        #workspaces button:hover {
+            background: #11111b;
+            color: #cdd6f4;
+            border-radius: 10px;
+        }
+
+        #custom-language,
+        #custom-updates,
+        #custom-caffeine,
+        #custom-weather,
+        #window,
+        #clock,
+        #battery,
+        #pulseaudio,
+        #network,
+        #workspaces,
+        #tray,
+        #backlight {
+            background: #1e1e2e;
+            padding: 0px 10px;
+            margin: 3px 0px;
+            margin-top: 10px;
+            border: 1px solid #181825;
+        }
+
+        #tray {
+            border-radius: 10px;
+            margin-right: 10px;
+        }
+
+        #workspaces {
+            background: #1e1e2e;
+            border-radius: 10px;
+            margin-left: 10px;
+            padding-right: 0px;
+            padding-left: 5px;
+        }
+
+        #custom-caffeine {
+            color: #89dceb;
+            border-radius: 10px 0px 0px 10px;
+            border-right: 0px;
+            margin-left: 10px;
+        }
+
+        #custom-language {
+            color: #f38ba8;
+            border-left: 0px;
+            border-right: 0px;
+        }
+
+        #custom-updates {
+            color: #f5c2e7;
+            border-left: 0px;
+            border-right: 0px;
+        }
+
+        #window {
+            border-radius: 10px;
+            margin-left: 60px;
+            margin-right: 60px;
+        }
+
+        #clock {
+            color: #fab387;
+            border-radius: 10px 0px 0px 10px;
+            margin-left: 0px;
+            border-right: 0px;
+        }
+
+        #network {
+            color: #f9e2af;
+            border-left: 0px;
+            border-right: 0px;
+        }
+
+        #pulseaudio {
+            color: #89b4fa;
+            border-left: 0px;
+            border-right: 0px;
+        }
+
+        #pulseaudio.microphone {
+            color: #cba6f7;
+            border-left: 0px;
+            border-right: 0px;
+        }
+
+        #battery {
+            color: #a6e3a1;
+            border-radius: 0 10px 10px 0;
+            margin-right: 10px;
+            border-left: 0px;
+        }
+
+        #custom-weather {
+            border-radius: 0px 10px 10px 0px;
+            border-right: 0px;
+            margin-left: 0px;
+        }
+      '';
+      settings = {
+        mainbar = {
+          layer = "top";
+          position = "top";
+          mod = "dock";
+          exclusive = true;
+          passthrough = false;
+          gtk-layer-shell = true;
+          height = 0;
+          modules-left = ["clock" "custom/weather" "hyprland/workspaces"];
+          modules-center = ["hyprland/window"];
+          modules-right = [
+            "tray"
+          ];
+
+          "hyprland/window" = {
+            format = "👉 {}";
+            seperate-outputs = true;
+          };
+          "hyprland/workspaces" = {
+            disable-scroll = true;
+            all-outputs = true;
+            on-click = "activate";
+            format = " {name} {icon} ";
+            on-scroll-up = "hyprctl dispatch workspace e+1";
+            on-scroll-down = "hyprctl dispatch workspace e-1";
+            format-icons = {
+              "1" = "";
+              "2" = "";
+              "3" = "";
+              "4" = "";
+              "5" = "";
+              "6" = "";
+              "7" = "";
+            };
+            persistent_workspaces = {
+              "1" = [];
+              "2" = [];
+              "3" = [];
+              "4" = [];
+            };
+          };
+          "custom/weather" = {
+            format = "{}°C";
+            tooltip = true;
+            interval = 3600;
+            exec = "wttrbar --location Pockau-Lengefeld";
+            return-type = "json";
+          };
+          tray = {
+            icon-size = 13;
+            spacing = 10;
+          };
+          clock = {
+            format = " {:%R   %d/%m}";
+            tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+          };
+        };
+      };
+    };
+
+    home.packages = with pkgs; [
+      grim
+      hyprlock
+      qt6.qtwayland
+      slurp
+      waypipe
+      wf-recorder
+      wl-mirror
+      wl-clipboard
+      wlogout
+      wtype
+      ydotool
+    ];
+  };
+}

home/m3tam3re/home.nix

@@ -1,10 +1,12 @@
 # This is a default home.nix generated by the follwing hone-manager command
-# 
+#
 # home-manager init ./
-
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = lib.mkDefault "your-name";
@@ -21,7 +23,9 @@
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = [
+  home.packages = with pkgs; [
+    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,19 @@
-{ config, ... }: { imports = [ ./home.nix ../common ]; }
+{
+  imports = [
+    ../common
+    ../features/cli
+    ../features/desktop
+    ./home.nix
+  ];
+
+  features = {
+    cli = {
+      fish.enable = true;
+      fzf.enable = true;
+      neofetch.enable = true;
+    };
+    desktop = {
+      wayland.enable = true;
+    };
+  };
+}

hosts/common/default.nix

@@ -1,10 +1,19 @@
 # Common configuration for all hosts
 {
+  pkgs,
   lib,
   inputs,
   outputs,
   ...
 }: {
+  imports = [
+    ./users
+    inputs.home-manager.nixosModules.home-manager
+  ];
+  home-manager = {
+    useUserPackages = true;
+    extraSpecialArgs = {inherit inputs outputs;};
+  };
   nixpkgs = {
     # You can add overlays here
     overlays = [
@@ -48,4 +57,5 @@
       ((lib.filterAttrs (_: lib.isType "flake")) inputs);
     nixPath = ["/etc/nix/path"];
   };
+  users.defaultUserShell = pkgs.fish;
 }

hosts/common/users/default.nix

@@ -0,0 +1,3 @@
+{
+  imports = [./m3tam3re.nix];
+}

hosts/common/users/m3tam3re

@@ -0,0 +1 @@
+../../../home/m3tam3re

hosts/common/users/m3tam3re.nix

@@ -0,0 +1,30 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  users.users.m3tam3re = {
+    initialHashedPassword = "$y$j9T$IoChbWGYRh.rKfmm0G86X0$bYgsWqDRkvX.EBzJTX.Z0RsTlwspADpvEF3QErNyCMC";
+    isNormalUser = true;
+    description = "m3tam3re";
+    extraGroups = [
+      "wheel"
+      "networkmanager"
+      "libvirtd"
+      "flatpak"
+      "audio"
+      "video"
+      "plugdev"
+      "input"
+      "kvm"
+      "qemu-libvirtd"
+    ];
+    openssh.authorizedKeys.keys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3YEmpYbM+cpmyD10tzNRHEn526Z3LJOzYpWEKdJg8DaYyPbDn9iyVX30Nja2SrW4Wadws0Y8DW+Urs25/wVB6mKl7jgPJVkMi5hfobu3XAz8gwSdjDzRSWJrhjynuaXiTtRYED2INbvjLuxx3X8coNwMw58OuUuw5kNJp5aS2qFmHEYQErQsGT4MNqESe3jvTP27Z5pSneBj45LmGK+RcaSnJe7hG+KRtjuhjI7RdzMeDCX73SfUsal+rHeuEw/mmjYmiIItXhFTDn8ZvVwpBKv7xsJG90DkaX2vaTk0wgJdMnpVIuIRBa4EkmMWOQ3bMLGkLQeK/4FUkNcvQ/4+zcZsg4cY9Q7Fj55DD41hAUdF6SYODtn5qMPsTCnJz44glHt/oseKXMSd556NIw2HOvihbJW7Rwl4OEjGaO/dF4nUw4c9tHWmMn9dLslAVpUuZOb7ykgP0jk79ldT3Dv+2Hj0CdAWT2cJAdFX58KQ9jUPT3tBnObSF1lGMI7t77VU= m3tam3re@m3-nix"
+    ];
+    packages = [inputs.home-manager.packages.${pkgs.system}.default];
+  };
+  home-manager.users.m3tam3re =
+    import ../../../home/m3tam3re/${config.networking.hostName}.nix;
+}

hosts/m3-kratos/configuration.nix

@@ -46,14 +46,6 @@
     variant = "";
   };
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.m3tam3re = {
-    isNormalUser = true;
-    description = "m3tam3re";
-    extraGroups = ["networkmanager" "wheel"];
-    packages = with pkgs; [];
-  };
-
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
@@ -87,6 +79,9 @@
     enable = true;
     xwayland.enable = true;
   };
+
+  programs.fish.enable = true;
+
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];