-repl-flakes, fix:homeConfiguration module

home/features/cli/default.nix

@@ -22,7 +22,6 @@
   home.packages = with pkgs; [
     coreutils
     fd
-    gcc
     htop
     httpie
     jq

home/features/desktop/hyprland.nix

@@ -30,7 +30,7 @@ in {
         ];
 
         input = {
-          kb_layout = "us";
+          kb_layout = "de,us";
           kb_variant = "";
           kb_model = "";
           kb_rules = "";

home/m3tam3re/home.nix

@@ -26,7 +26,6 @@
   home.packages = with pkgs; [
     kitty
     wofi
-    zellij-ps
     # # Adds the 'hello' command to your environment. It prints a friendly
     # # "Hello, world!" when run.
     # pkgs.hello

hosts/common/default.nix

@@ -40,9 +40,7 @@
     };
   };
 
-  nix = let
-    flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
-  in {
+  nix = {
     settings = {
       experimental-features = "nix-command flakes";
       trusted-users = [
@@ -55,8 +53,10 @@
       options = "--delete-older-than 30d";
     };
     optimise.automatic = true;
-    registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
-    nixPath = ["/etc/nix/path"] ++ lib.mapAttrsToList (flakeName: _: "${flakeName}=flake:${flakeName}") flakeInputs;
+    registry =
+      (lib.mapAttrs (_: flake: {inherit flake;}))
+      ((lib.filterAttrs (_: lib.isType "flake")) inputs);
+    nixPath = ["/etc/nix/path"];
   };
   users.defaultUserShell = pkgs.fish;
 }

hosts/m3-kratos/configuration.nix

@@ -21,7 +21,7 @@
 
   # Enable networking
   networking.networkmanager.enable = true;
-  networking.networkmanager.unmanaged = ["interface-name:ve-*"];
+
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
@@ -86,10 +86,8 @@
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
-  networking.nat.enable = true;
-  networking.nat.internalInterfaces = ["ve-+"];
-  networking.nat.externalInterface = "enp1s0";
   # networking.firewall.enable = false;
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

hosts/m3-kratos/services/containers/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ./echo.nix
-    ./httpd.nix
     ./nginx.nix
   ];
 }

hosts/m3-kratos/services/containers/httpd.nix

@@ -1,56 +0,0 @@
-{
-  containers.httpd = {
-    autoStart = true;
-    ephemeral = true;
-    privateNetwork = true;
-    hostAddress = "192.168.100.10";
-    localAddress = "192.168.100.11";
-    forwardPorts = [
-      {
-        containerPort = 80;
-        hostPort = 80;
-      }
-    ];
-    config = {...}: {
-      services.httpd = {
-        enable = true;
-        adminAddr = "foo@example.org";
-      };
-      networking.firewall.allowedTCPPorts = [80];
-      system.stateVersion = "24.05";
-    };
-    bindMounts = {
-      "/root/data" = {
-        hostPath = "/home/m3tam3re/data/";
-        isReadOnly = false;
-      };
-    };
-  };
-  containers.httpd2 = {
-    autoStart = true;
-    ephemeral = true;
-    privateNetwork = true;
-    hostAddress = "192.168.100.10";
-    localAddress = "192.168.100.12";
-    forwardPorts = [
-      {
-        containerPort = 80;
-        hostPort = 8080;
-      }
-    ];
-    config = {...}: {
-      services.httpd = {
-        enable = true;
-        adminAddr = "foo@example.org";
-      };
-      networking.firewall.allowedTCPPorts = [80];
-      system.stateVersion = "24.05";
-    };
-    bindMounts = {
-      "/root/data" = {
-        hostPath = "/home/m3tam3re/data/";
-        isReadOnly = false;
-      };
-    };
-  };
-}

pkgs/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   # Define your custom packages here
-  zellij-ps = pkgs.callPackage ./zellij-ps {};
+  #  my-package = pkgs.callPackage ./my-package {};
 }

pkgs/my-package/default.nix

@@ -0,0 +1,2 @@
+# Your custom nix-package
+# ...

pkgs/zellij-ps/default.nix

@@ -1,39 +0,0 @@
-{
-  lib,
-  fish,
-  fd,
-  fzf,
-  makeWrapper,
-  zellij,
-  fetchFromGitea,
-  stdenv,
-}:
-stdenv.mkDerivation {
-  pname = "zellij-ps";
-  version = "0.1.0";
-
-  src = fetchFromGitea {
-    domain = "code.m3tam3re.com";
-    owner = "m3tam3re";
-    repo = "helper-scripts";
-    rev = "08a3217b83391c1110545c1ee3161eecd5dbe5e9";
-    sha256 = "1sc4i58mwcg3qsq0wwl5rvk08ykbxc497bq7mrxiirndsarskby7";
-  };
-
-  buildInputs = [];
-  nativeBuildInputs = [makeWrapper];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp zellij-ps.fish $out/bin/zellij-ps
-    wrapProgram $out/bin/zellij-ps \
-      --prefix PATH : ${lib.makeBinPath [fish fd fzf zellij]}
-  '';
-  meta = with lib; {
-    description = "A small project script for zellij";
-    homepage = "https://code.m3tam3re.com/m3tam3re/helper-scripts";
-    license = licenses.mit;
-    maintainers = with maintainers; [m3tam3re];
-    platforms = platforms.unix;
-  };
-}