update

.forgejo/workflows/nix_build.yaml

@@ -1,15 +1,18 @@
 name: Build all NixOS Configurations
+
 on:
   push:
     branches:
       - "**"
   schedule:
     - cron: "30 2/6 * * *" # not to frequent, GitHub only allows a few pulls per hour
+
 jobs:
   nix build:
     runs-on: native
     steps:
       - uses: actions/checkout@v4
+
       - name: update nix flakes
         if: ${{ github.event_name == 'schedule' }}
         # we need to use our ssh key here because we need access to private flakes
@@ -27,6 +30,7 @@ jobs:
           echo $SSH_AGENT_PID
           kill $SSH_AGENT_PID
           rm .ssh_key
+
       - name: nix flake archive/check
         # we need to use our ssh key here because we need access to private flakes
         run: |
@@ -44,16 +48,25 @@ jobs:
           echo $SSH_AGENT_PID
           kill $SSH_AGENT_PID
           rm .ssh_key
+
       - name: nix build orbi
         run: nix build .#nixosConfigurations.orbi.config.system.build.toplevel
+
       - name: nix build cream
         run: nix build .#nixosConfigurations.cream.config.system.build.toplevel
+
       - name: nix build cherry
         run: nix build .#nixosConfigurations.cherry.config.system.build.toplevel
+
       - name: nix build chungus
         run: nix build .#nixosConfigurations.chungus.config.system.build.toplevel
+
+      - name: nix build sternchen
+        run: nix build .#nixosConfigurations.sternchen.config.system.build.toplevel
+
       - name: nix build usbstick
         run: nix build .#nixosConfigurations.usbstick.config.system.build.toplevel
+
       - name: commit & push
         if: ${{ github.event_name == 'schedule' }}
         # only if all nix builds are fine we update our branch

components/README.md

@@ -1,8 +1,6 @@
 # components concept
 
 - components are kinda opinionated.
-- should be project agnostic (e.g.: configure bugwarrior via options but leave
+- should be project agnostic (e.g.: configure bugwarrior via options but leave specifics out).
-  specifics out).
+- `component.<toplevel>.enabled` should usually be the default for all it subcomponents (`comonent.<topleve>.<subcomponent>.enabled`).
-- `component.<toplevel>.enabled` should usually be the default for all it
-  subcomponents (`comonent.<topleve>.<subcomponent>.enabled`).
   - But default should make sense here!

components/chaospott.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with lib;
 {
 

components/default.nix

@@ -14,4 +14,5 @@
     ./yubikey.nix
   ];
 
+
 }

components/gui/audio.nix

@@ -1,10 +1,5 @@
 # TODO test `alsactl init` after suspend to reinit mic
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 {
   options.components.gui.audio.enable = mkOption {

components/gui/default.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, lib, config, ... }:
-  pkgs,
-  lib,
-  config,
-  ...
-}:
 with lib;
 {
   options.components.gui = {

components/gui/home-manager/default.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, lib, config, ... }:
-  pkgs,
-  lib,
-  config,
-  ...
-}:
 with lib;
 {
 

components/gui/kmonad.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 {
 
   options.components.gui.kmonad.enable = lib.mkOption {
@@ -84,21 +79,9 @@
 
         in
         {
-          nativ = keyboard "/dev/input/by-path/platform-i8042-serio-0-event-kbd" [
+          nativ = keyboard "/dev/input/by-path/platform-i8042-serio-0-event-kbd" [ "lctl" "lmet" "lalt" ];
-            "lctl"
+          dasKeyboard = keyboard "/dev/input/by-id/usb-Metadot_-_Das_Keyboard_Das_Keyboard-event-kbd" [ "lctl" "lmet" "lalt" ];
-            "lmet"
+          uhk = keyboard "/dev/input/by-id/usb-Ultimate_Gadget_Laboratories_UHK_60_v2-event-kbd" [ "lctl" "lmet" "lalt" ];
-            "lalt"
-          ];
-          dasKeyboard = keyboard "/dev/input/by-id/usb-Metadot_-_Das_Keyboard_Das_Keyboard-event-kbd" [
-            "lctl"
-            "lmet"
-            "lalt"
-          ];
-          uhk = keyboard "/dev/input/by-id/usb-Ultimate_Gadget_Laboratories_UHK_60_v2-event-kbd" [
-            "lctl"
-            "lmet"
-            "lalt"
-          ];
         };
     };
   };

components/gui/noti.nix

@@ -1,11 +1,6 @@
 # notify me when a command is finished
 # todo : secret managment is shit
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with lib;
 {
   options.components.gui.noti.enable = mkOption {

components/gui/pass.nix

@@ -1,17 +1,11 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 let
 
   # desktop file
   # ------------
   # makes it possible to be used by other programs
-  desktopFile =
+  desktopFile = name: bin:
-    name: bin:
     pkgs.writeTextFile {
       name = "${name}.desktop";
       destination = "/share/applications/${name}.desktop";
@@ -40,9 +34,7 @@ in
     environment.systemPackages = [
       (pkgs.pass.withExtensions (ext: [ ext.pass-otp ]))
       # todo : use upstream desktop file creator
-      (desktopFile "passmenu" "${
+      (desktopFile "passmenu" "${pkgs.pass.withExtensions (ext: [ext.pass-otp])}/bin/passmenu --type -l 10")
-        pkgs.pass.withExtensions (ext: [ ext.pass-otp ])
-      }/bin/passmenu --type -l 10")
 
       pkgs.otpmenu
 

components/gui/steam.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with lib;
 {
   options.components.gui.steam.enable = mkOption {
@@ -27,12 +22,7 @@ with lib;
       isSystemUser = true;
       home = "/home/steam";
       createHome = true;
-      extraGroups = [
+      extraGroups = [ "audio" "input" "video" "pipewire" ];
-        "audio"
-        "input"
-        "video"
-        "pipewire"
-      ];
       group = "steam";
       shell = pkgs.bashInteractive;
     };

components/gui/suspend.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 {
   options.components.gui.suspend.enable = mkOption {
@@ -18,11 +13,13 @@ with lib;
       requiredBy = [ "sleep.target" ];
       environment =
         let
-          display = if (config.services.xserver.display != null) then config.services.xserver.display else 0;
+          display =
+            if (config.services.xserver.display != null) then
+              config.services.xserver.display
+            else
+              0;
         in
-        {
+        { DISPLAY = ":${toString display}"; };
-          DISPLAY = ":${toString display}";
-        };
       script = ''
         ${pkgs.xlockmore}/bin/xlock -mode life1d -size 1 &
         sleep 1

components/gui/vscode.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with lib;
 {
   options.components.gui.vscode.enable = mkOption {

components/gui/wayland.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with lib;
 {
 

components/gui/xorg/default.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with lib;
 {
 
@@ -83,3 +78,4 @@ with lib;
 
   };
 }
+

components/gui/xorg/xlock.nix

@@ -1,9 +1,4 @@
-{
+{ lib, pkgs, config, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
 with lib;
 let
 

components/mainUser.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with lib;
 with types;
 let
@@ -11,10 +6,15 @@ let
   cfg = config.components.mainUser;
 
   # todo : use optionalList
-  dockerGroup = if (config.virtualisation.docker.enable) then [ "docker" ] else [ ];
+  dockerGroup =
+    if (config.virtualisation.docker.enable) then [ "docker" ] else [ ];
 
   # todo : use optionalList
-  vboxGroup = if (config.virtualisation.virtualbox.host.enable) then [ "vboxusers" ] else [ ];
+  vboxGroup =
+    if (config.virtualisation.virtualbox.host.enable) then
+      [ "vboxusers" ]
+    else
+      [ ];
 
 in
 {
@@ -73,16 +73,8 @@ in
         uid = cfg.uid;
         home = "/home/${cfg.userName}";
         initialPassword = cfg.userName;
-        extraGroups = [
+        extraGroups = [ "wheel" "networkmanager" "transmission" "wireshark" "audio" "pipewire" "input" "dialout" ]
-          "wheel"
+          ++ dockerGroup ++ vboxGroup ++ cfg.extraGroups;
-          "networkmanager"
-          "transmission"
-          "wireshark"
-          "audio"
-          "pipewire"
-          "input"
-          "dialout"
-        ] ++ dockerGroup ++ vboxGroup ++ cfg.extraGroups;
         openssh.authorizedKeys.keyFiles = cfg.authorizedKeyFiles;
         group = config.users.groups.mainUser.name;
       };

components/media/icecast.nix

@@ -4,12 +4,7 @@
 # * connect via mixxx to it.
 # * add the podcast to mpd in the same network
 # --------------------------------------------------
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 
 let

components/media/tts.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 {
 

components/media/video.nix

@@ -1,34 +1,30 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 
 with lib;
 
 let
-  obs-cmd = pkgs.rustPlatform.buildRustPackage rec {
+  obs-cmd = pkgs.rustPlatform.buildRustPackage
-    pname = "obs-cmd";
+    rec {
-    version = "v0.15.2";
+      pname = "obs-cmd";
-    src = pkgs.fetchFromGitHub {
+      version = "v0.15.2";
-      owner = "grigio";
+      src = pkgs.fetchFromGitHub {
-      repo = "obs-cmd";
+        owner = "grigio";
-      rev = version;
+        repo = "obs-cmd";
-      sha256 = "sha256-RRkP0QLWcJLKv8oqESjMgHGW1QScANG7+fzR/rwSyDI=";
+        rev = version;
-    };
+        sha256 = "sha256-RRkP0QLWcJLKv8oqESjMgHGW1QScANG7+fzR/rwSyDI=";
+      };
 
-    cargoSha256 = "sha256-JqR7MAt2VNEnZGbn+hExtFG6F7X0KhFM1n7GZ+QaHc0=";
+      cargoSha256 = "sha256-JqR7MAt2VNEnZGbn+hExtFG6F7X0KhFM1n7GZ+QaHc0=";
-    #cargoSha256 = fakeSha256;
+      #cargoSha256 = fakeSha256;
 
-    meta = with lib; {
+      meta = with lib; {
-      description = "a minimal obs CLI for obs-websocket v5";
+        description = "a minimal obs CLI for obs-websocket v5";
-      homepage = "https://github.com/grigio/obs-cmd";
+        homepage = "https://github.com/grigio/obs-cmd";
-      license = licenses.mit;
+        license = licenses.mit;
-      maintainers = [ maintainers.mrVanDalo ];
+        maintainers = [ maintainers.mrVanDalo ];
-      platforms = platforms.all;
+        platforms = platforms.all;
+      };
     };
-  };
 
   # Lassulus streaming setup
   # -------------------------
@@ -57,12 +53,7 @@ let
     name = "screen-keys";
     paths =
       let
-        screenKeyScript =
+        screenKeyScript = { position ? "bottom", size ? "small", ... }:
-          {
-            position ? "bottom",
-            size ? "small",
-            ...
-          }:
           pkgs.writeShellScriptBin "screenkeys-${position}-${size}" # sh
             ''
               ${pkgs.screenkey}/bin/screenkey \
@@ -74,41 +65,27 @@ let
                                 "$@"
             '';
       in
-      lib.flatten (
+      lib.flatten (lib.flip map [ "large" "small" "medium" ] (size:
-        lib.flip map
+        lib.flip map [ "top" "center" "bottom" ]
-          [
+          (position: screenKeyScript { inherit size position; })));
-            "large"
-            "small"
-            "medium"
-          ]
-          (
-            size:
-            lib.flip map [
-              "top"
-              "center"
-              "bottom"
-            ] (position: screenKeyScript { inherit size position; })
-          )
-      );
   };
 
+
   mpvReview =
     let
-      moveToDir =
+      moveToDir = key: dir: pkgs.writeText "move-with-${key}.lua" ''
-        key: dir:
+        tmp_dir = "${dir}"
-        pkgs.writeText "move-with-${key}.lua" ''
-          tmp_dir = "${dir}"
 
-          function move_current_track_${key}()
+        function move_current_track_${key}()
-            track = mp.get_property("path")
+          track = mp.get_property("path")
-            os.execute("mkdir -p '" .. tmp_dir .. "'")
+          os.execute("mkdir -p '" .. tmp_dir .. "'")
-            os.execute("mv '" .. track .. "' '" .. tmp_dir .. "'")
+          os.execute("mv '" .. track .. "' '" .. tmp_dir .. "'")
-            print("moved '" .. track .. "' to " .. tmp_dir)
+          print("moved '" .. track .. "' to " .. tmp_dir)
-            mp.command("playlist-next")
+          mp.command("playlist-next")
-          end
+        end
 
-          mp.add_key_binding("${key}", "move_current_track_${key}", move_current_track_${key})
+        mp.add_key_binding("${key}", "move_current_track_${key}", move_current_track_${key})
-        '';
+      '';
       delete = moveToDir "D" "./.graveyard";
       good = moveToDir "G" "./.good";
     in
@@ -133,6 +110,7 @@ in
 
   config = mkIf (config.components.media.video.enable) {
 
+
     home-manager.sharedModules = [
       {
         programs.obs-studio = {
@@ -145,6 +123,7 @@ in
       }
     ];
 
+
     boot.kernelModules = [ "v4l2loopback" ];
     boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
 
@@ -158,6 +137,7 @@ in
       alphaSafe
       sanitizeFolder
 
+
       # obs studio stuff
       obs-cli
       v4l-utils
@@ -174,6 +154,8 @@ in
       handbrake
       ffmpeg-full
 
+
     ];
   };
 }
+

components/monitor/logs-promtail.nix

@@ -33,7 +33,7 @@ in
       services.promtail = {
         enable = true;
         configuration = {
-          server.disable = true;
+          server. disable = true;
           positions.filename = "/var/cache/promtail/positions.yaml";
 
           clients = [
@@ -49,15 +49,7 @@ in
               _end = ''{{ end }}'';
               elseblock = index: replacement: "${_elseif index}${_replace index replacement}";
               ifblock = index: replacement: "${_if index}${_replace index replacement}";
-              createTemplateLine =
+              createTemplateLine = list: "${concatStrings (imap0 (index: replacement: if index == 0 then ifblock index replacement else elseblock index replacement) list)}${_end}";
-                list:
-                "${
-                  concatStrings (
-                    imap0 (
-                      index: replacement: if index == 0 then ifblock index replacement else elseblock index replacement
-                    ) list
-                  )
-                }${_end}";
             in
             [
               {
@@ -125,35 +117,36 @@ in
                   }
                   {
                     # Map facility to human readable
-                    template = {
+                    template =
-                      source = "facility_label";
+                      {
-                      template = createTemplateLine [
+                        source = "facility_label";
-                        "kern" # Kernel messages
+                        template = createTemplateLine [
-                        "user" # User-level messages
+                          "kern" # Kernel messages
-                        "mail" # Mail system	Archaic POSIX still supported and sometimes used (for more mail(1))
+                          "user" # User-level messages
-                        "daemon" # System daemons	All daemons, including systemd and its subsystems
+                          "mail" # Mail system	Archaic POSIX still supported and sometimes used (for more mail(1))
-                        "auth" # Security/authorization messages	Also watch for different facility 10
+                          "daemon" # System daemons	All daemons, including systemd and its subsystems
-                        "syslog" # Messages generated internally by syslogd	For syslogd implementations (not used by systemd, see facility 3)
+                          "auth" # Security/authorization messages	Also watch for different facility 10
-                        "lpr" # Line printer subsystem (archaic subsystem)
+                          "syslog" # Messages generated internally by syslogd	For syslogd implementations (not used by systemd, see facility 3)
-                        "news" # Network news subsystem (archaic subsystem)
+                          "lpr" # Line printer subsystem (archaic subsystem)
-                        "uucp" # UUCP subsystem (archaic subsystem)
+                          "news" # Network news subsystem (archaic subsystem)
-                        "clock" # Clock daemon	systemd-timesyncd
+                          "uucp" # UUCP subsystem (archaic subsystem)
-                        "authpriv" # Security/authorization messages	Also watch for different facility 4
+                          "clock" # Clock daemon	systemd-timesyncd
-                        "ftp" # FTP daemon
+                          "authpriv" # Security/authorization messages	Also watch for different facility 4
-                        "-" # NTP subsystem
+                          "ftp" # FTP daemon
-                        "-" # Log audit
+                          "-" # NTP subsystem
-                        "-" # Log alert
+                          "-" # Log audit
-                        "cron" # Scheduling daemon
+                          "-" # Log alert
-                        "local0" # Local use 0 (local0)
+                          "cron" # Scheduling daemon
-                        "local1" # Local use 1 (local1)
+                          "local0" # Local use 0 (local0)
-                        "local2" # Local use 2 (local2)
+                          "local1" # Local use 1 (local1)
-                        "local3" # Local use 3 (local3)
+                          "local2" # Local use 2 (local2)
-                        "local4" # Local use 4 (local4)
+                          "local3" # Local use 3 (local3)
-                        "local5" # Local use 5 (local5)
+                          "local4" # Local use 4 (local4)
-                        "local6" # Local use 6 (local6)
+                          "local5" # Local use 5 (local5)
-                        "local7" # Local use 7 (local7)
+                          "local6" # Local use 6 (local6)
-                      ];
+                          "local7" # Local use 7 (local7)
-                    };
+                        ];
+                      };
                   }
                   {
                     # Key is REQUIRED and the name for the label that will be created.

components/monitor/metrics-export-zfs.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 with types;
 {
@@ -23,11 +18,9 @@ with types;
           {
             job_name = "zfs";
             scrape_interval = "10s";
-            static_configs = [
+            static_configs = [{
-              {
+              targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.zfs.port}" ];
-                targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.zfs.port}" ];
+            }];
-              }
-            ];
           }
         ];
         service.pipelines.metrics.receivers = [ "prometheus" ];

components/monitor/metrics-netdata.nix

@@ -1,9 +1,4 @@
-{
+{ lib, pkgs, config, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
 with lib;
 with types;
 {
@@ -23,7 +18,7 @@ with types;
         scrape_interval = "10s";
         metrics_path = "/api/v1/allmetrics";
         params.format = [ "prometheus" ];
-        static_configs = [ { targets = [ "127.0.0.1:19999" ]; } ];
+        static_configs = [{ targets = [ "127.0.0.1:19999" ]; }];
       }
     ];
 

components/monitor/metrics-prometheus.nix

@@ -36,7 +36,7 @@ in
           job_name = "opentelemetry";
           metrics_path = "/metrics";
           scrape_interval = "10s";
-          static_configs = [ { targets = [ "localhost:${toString cfg.port}" ]; } ];
+          static_configs = [{ targets = [ "localhost:${toString cfg.port}" ]; }];
         }
       ];
     })

components/monitor/metrics-telegraf.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with lib;
 with types;
 let
@@ -29,9 +24,7 @@ in
         receivers.influxdb.endpoint = "127.0.0.1:${toString cfg.influxDBPort}";
         service.pipelines.metrics.receivers = [ "influxdb" ];
       };
-      services.telegraf.extraConfig.outputs.influxdb_v2.urls = [
+      services.telegraf.extraConfig.outputs.influxdb_v2.urls = [ "http://127.0.0.1:${toString cfg.influxDBPort}" ];
-        "http://127.0.0.1:${toString cfg.influxDBPort}"
-      ];
     })
 
     (mkIf config.components.monitor.telegraf.enable {
@@ -48,7 +41,7 @@ in
             processes = { };
             system = { };
             systemd_units = { };
-            ping = [ { urls = [ "10.100.0.1" ]; } ]; # actually important to make machine visible over wireguard
+            ping = [{ urls = [ "10.100.0.1" ]; }]; # actually important to make machine visible over wireguard
           };
         };
       };

components/monitor/opentelemetry.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 with types;
 let
@@ -27,10 +22,7 @@ in
       description = "endpoint to ship opentelementry data too";
     };
     exporter.debug = mkOption {
-      type = nullOr (enum [
+      type = nullOr (enum [ "logs" "metrics" ]);
-        "logs"
-        "metrics"
-      ]);
       default = null;
       description = "enable debug exporter.";
     };
@@ -69,13 +61,11 @@ in
               include = ".*";
               match_type = "regexp";
               action = "update";
-              operations = [
+              operations = [{
-                {
+                action = "add_label";
-                  action = "add_label";
+                new_label = "machine";
-                  new_label = "machine";
+                new_value = config.networking.hostName;
-                  new_value = config.networking.hostName;
+              }];
-                }
-              ];
             }
           ];
         };
@@ -95,6 +85,7 @@ in
       };
     })
 
+
     (mkIf (config.components.monitor.opentelemetry.exporter.debug != null) {
       services.opentelemetry-collector.settings = {
         exporters.debug = {
@@ -120,26 +111,24 @@ in
     })
     (mkIf
       (
-        config.components.monitor.opentelemetry.exporter.endpoint != null
+        config.components.monitor.opentelemetry.exporter.endpoint != null &&
-        && config.components.monitor.logs.enable
+        config.components.monitor.logs.enable
       )
       {
         services.opentelemetry-collector.settings = {
           service.pipelines.logs.exporters = [ "otlp" ];
         };
-      }
+      })
-    )
     (mkIf
       (
-        config.components.monitor.opentelemetry.exporter.endpoint != null
+        config.components.monitor.opentelemetry.exporter.endpoint != null &&
-        && config.components.monitor.metrics.enable
+        config.components.monitor.metrics.enable
       )
       {
         services.opentelemetry-collector.settings = {
           service.pipelines.metrics.exporters = [ "otlp" ];
         };
-      }
+      })
-    )
 
     # ship from other instance
     (mkIf (config.components.monitor.opentelemetry.receiver.endpoint != null) {
@@ -149,26 +138,26 @@ in
     })
     (mkIf
       (
-        config.components.monitor.opentelemetry.receiver.endpoint != null
+        config.components.monitor.opentelemetry.receiver.endpoint != null &&
-        && config.components.monitor.logs.enable
+        config.components.monitor.logs.enable
       )
       {
         services.opentelemetry-collector.settings = {
           service.pipelines.logs.receivers = [ "otlp" ];
         };
-      }
+      })
-    )
     (mkIf
       (
-        config.components.monitor.opentelemetry.receiver.endpoint != null
+        config.components.monitor.opentelemetry.receiver.endpoint != null &&
-        && config.components.monitor.metrics.enable
+        config.components.monitor.metrics.enable
       )
       {
         services.opentelemetry-collector.settings = {
           service.pipelines.metrics.receivers = [ "otlp" ];
         };
-      }
+      })
-    )
+
+
 
     # scrape opentelemetry-colectors metrics
     # todo: this should be collected another way (opentelemetry internal?)
@@ -180,11 +169,9 @@ in
             {
               job_name = "otelcol";
               scrape_interval = "10s";
-              static_configs = [
+              static_configs = [{
-                {
+                targets = [ cfg.metrics.endpoint ];
-                  targets = [ cfg.metrics.endpoint ];
+              }];
-                }
-              ];
               metric_relabel_configs = [
                 {
                   source_labels = [ "__name__" ];
@@ -208,7 +195,7 @@ in
 
       };
     })
-    (mkIf (!config.components.monitor.metrics.enable) {
+    (mkIf (! config.components.monitor.metrics.enable) {
       services.opentelemetry-collector.settings = {
         service.telemetry.metrics.level = "none";
       };

components/network/nginx.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, assets, ... }:
-  config,
-  lib,
-  pkgs,
-  assets,
-  ...
-}:
 with lib;
 {
   options.components.network.nginx.enable = mkOption {
@@ -22,13 +16,8 @@ with lib;
 
       environment.systemPackages = [
         pkgs.nginx-config-formatter
-        (pkgs.writers.writePython3Bin "nginx-show-config" {
+        (pkgs.writers.writePython3Bin "nginx-show-config" { flakeIgnore = [ "E265" "E225" "W292" ]; }
-          flakeIgnore = [
+          (lib.fileContents "${assets}/nginx-show-config.py"))
-            "E265"
-            "E225"
-            "W292"
-          ];
-        } (lib.fileContents "${assets}/nginx-show-config.py"))
       ];
 
       security.acme.defaults.email = "contact@ingolf-wagner.de";
@@ -96,11 +85,7 @@ with lib;
           root = pkgs.landingpage.override {
             jsonConfig =
               let
-                entry =
+                entry = { machine, items ? [ ] }:
-                  {
-                    machine,
-                    items ? [ ],
-                  }:
                   {
                     text = machine;
                     items = [
@@ -189,12 +174,14 @@ with lib;
                     {
                       label = "Hetzner Cloud";
                       href = "https://console.hetzner.cloud/projects";
-                      image = "https://media.giphy.com/media/NECZ8crkbXR0k/giphy.gif";
+                      image =
+                        "https://media.giphy.com/media/NECZ8crkbXR0k/giphy.gif";
                     }
                     {
                       label = "Cups";
                       href = "http://localhost:631/";
-                      image = "https://media.giphy.com/media/7hU7x4GPurk2c/giphy.gif";
+                      image =
+                        "https://media.giphy.com/media/7hU7x4GPurk2c/giphy.gif";
                     }
                   ];
                 }
@@ -204,42 +191,52 @@ with lib;
                     {
                       label = "NixOS Manual";
                       href = "https://nixos.org/nixos/manual/";
-                      image = "https://media.giphy.com/media/dsdVyKkSqccEzoPufX/giphy.gif";
+                      image =
+                        "https://media.giphy.com/media/dsdVyKkSqccEzoPufX/giphy.gif";
                     }
                     {
                       label = "Nixpkgs Manual";
                       href = "https://nixos.org/nixpkgs/manual/";
-                      image = "https://media.giphy.com/media/dsdVyKkSqccEzoPufX/giphy.gif";
+                      image =
+                        "https://media.giphy.com/media/dsdVyKkSqccEzoPufX/giphy.gif";
                     }
                     {
                       label = "NixOS Reference";
-                      href = "https://storage.googleapis.com/files.tazj.in/nixdoc/manual.html#sec-functions-library";
+                      href =
-                      image = "https://media.giphy.com/media/LkjlH3rVETgsg/giphy.gif";
+                        "https://storage.googleapis.com/files.tazj.in/nixdoc/manual.html#sec-functions-library";
+                      image =
+                        "https://media.giphy.com/media/LkjlH3rVETgsg/giphy.gif";
                     }
                     {
                       label = "Nix Packages";
                       href = "https://nixos.org/nixos/packages.html";
-                      image = "https://media.giphy.com/media/l2YWlohvjPnsvkdEc/giphy.gif";
+                      image =
+                        "https://media.giphy.com/media/l2YWlohvjPnsvkdEc/giphy.gif";
                     }
                     {
                       label = "NixOS Language specific helpers";
-                      href = "https://nixos.wiki/wiki/Language-specific_package_helpers";
+                      href =
-                      image = "https://media.giphy.com/media/LkjlH3rVETgsg/giphy.gif";
+                        "https://nixos.wiki/wiki/Language-specific_package_helpers";
+                      image =
+                        "https://media.giphy.com/media/LkjlH3rVETgsg/giphy.gif";
                     }
                     {
                       label = "NixOS Weekly";
                       href = "https://weekly.nixos.org/";
-                      image = "https://media.giphy.com/media/lXiRLb0xFzmreM8k8/giphy.gif";
+                      image =
+                        "https://media.giphy.com/media/lXiRLb0xFzmreM8k8/giphy.gif";
                     }
                     {
                       label = "NixOS Security";
                       href = "https://broken.sh/";
-                      image = "https://media.giphy.com/media/BqILAHjH1Ttm0/giphy.gif";
+                      image =
+                        "https://media.giphy.com/media/BqILAHjH1Ttm0/giphy.gif";
                     }
                     {
                       label = "NixOS RFCs";
                       href = "https://github.com/NixOS/rfcs/";
-                      image = "https://media.giphy.com/media/Uq9bGjGKg08M0/giphy.gif";
+                      image =
+                        "https://media.giphy.com/media/Uq9bGjGKg08M0/giphy.gif";
                     }
                   ];
                 }

components/network/sshd/default.nix

@@ -1,10 +1,4 @@
-{
+{ pkgs, config, lib, assets, ... }:
-  pkgs,
-  config,
-  lib,
-  assets,
-  ...
-}:
 with lib;
 with types;
 let
@@ -12,7 +6,8 @@ let
   cfg = config.components.network.sshd;
 
   # maybe ascii-image-converter is also nice here
-  sshBanner = pkgs.runCommand "ssh-banner" { nativeBuildInputs = [ pkgs.boxes ]; } ''
+  sshBanner = pkgs.runCommand "ssh-banner"
+    { nativeBuildInputs = [ pkgs.boxes ]; } ''
     echo "${config.networking.hostName}" | boxes -d ansi -s 80x1 -a r > $out
   '';
 

components/network/sshd/known-hosts-manual.nix

@@ -1,10 +1,4 @@
-{
+{ pkgs, config, lib, clanLib, ... }:
-  pkgs,
-  config,
-  lib,
-  clanLib,
-  ...
-}:
 with lib;
 let
   publicKey = clanLib.readFact "ssh.id_ed25519.pub";

components/network/sshd/known-hosts-public.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 {
   config = mkIf (config.components.network.sshd.enable) {
@@ -33,66 +28,65 @@ with lib;
       };
       gitlab = {
         hostNames = [ "gitlab.com" ];
-        publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=";
+        publicKey =
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=";
       };
       gitlab-bk = {
-        hostNames = [
+        hostNames = [ "gitlab.bk-bund-berlin.de" "116.203.133.59" ];
-          "gitlab.bk-bund-berlin.de"
+        publicKey =
-          "116.203.133.59"
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCG/sjnOlbrmpUliFtM5fmZTcm2wpUoP5OQEzFrrkkwhstCO9fMty9mp5qnKlezYA9+l78RTd218qFjSKYxTQNw=";
-        ];
-        publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCG/sjnOlbrmpUliFtM5fmZTcm2wpUoP5OQEzFrrkkwhstCO9fMty9mp5qnKlezYA9+l78RTd218qFjSKYxTQNw=";
       };
       # space-left
       gitlabSpaceLeft = {
         hostNames = [ "git.space-left.org" ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAapztj8I3xy6Ea8A1q7Mo5C6zdgsK1bguAXcKUDCRBO";
+        publicKey =
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAapztj8I3xy6Ea8A1q7Mo5C6zdgsK1bguAXcKUDCRBO";
       };
       # c-base
       "bnd-cbase" = {
         hostNames = [ "bnd.cbrp3.c-base.org" ];
-        publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDknNl4M2WZChp1N/eRIpem2AEOceGIqvjo0ptBuwxUn0w0B8MGTVqoI+pnUVypORJRoNrLPOAkmEVr32BDN3E=";
+        publicKey =
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDknNl4M2WZChp1N/eRIpem2AEOceGIqvjo0ptBuwxUn0w0B8MGTVqoI+pnUVypORJRoNrLPOAkmEVr32BDN3E=";
       };
       "shell.cbase" = {
         hostNames = [ "shell.c-base.org" ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOBKBn0mZtG3KWxpFqqcog8zvdIVrZmwj+ARujuNIAfo";
+        publicKey =
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOBKBn0mZtG3KWxpFqqcog8zvdIVrZmwj+ARujuNIAfo";
       };
       "kgb.cbase" = {
         hostNames = [ "kgb.cbrp3.c-base.org" ];
-        publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAdyl7fnnCqomghJ1TDbh5FWFQWFwoO1Y1U/FpmWd8a9RcQvN0Izhg/7A+7ptDxbmpVii8hqfghlqUwtvVy7jo8=";
+        publicKey =
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAdyl7fnnCqomghJ1TDbh5FWFQWFwoO1Y1U/FpmWd8a9RcQvN0Izhg/7A+7ptDxbmpVii8hqfghlqUwtvVy7jo8=";
       };
       "cns.cbase" = {
         hostNames = [ "cns.c-base.org" ];
-        publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOtlyLA2nMK9Uqpv4EbWS+rZ9Mx4bAjURmH+zrXkuRGBcU1cKm+TZfWe9/rPX57KaMPBDyIygOJIsM2T5SqX90A=";
+        publicKey =
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOtlyLA2nMK9Uqpv4EbWS+rZ9Mx4bAjURmH+zrXkuRGBcU1cKm+TZfWe9/rPX57KaMPBDyIygOJIsM2T5SqX90A=";
       };
       "lassulus" = {
         hostNames = [ "[lassul.us]:45621" ];
-        publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsANFdMi825qWQXQbWLYuNZ6/fARt3lnh1KStQHQQMD";
+        publicKey =
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsANFdMi825qWQXQbWLYuNZ6/fARt3lnh1KStQHQQMD";
       };
       renoise = {
-        hostNames = [
+        hostNames = [ "*.renoise.com" "renoise.com" "94.130.128.97" ];
-          "*.renoise.com"
+        publicKey =
-          "renoise.com"
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLXxhBlYQJxgcLqKywpl1tI1N/+B5bkptAnR2a3tsRybq0IHZnIkSRGUYcu5zPwJT+bitVw8BvIaGzxI+Zm2ivE=";
-          "94.130.128.97"
-        ];
-        publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLXxhBlYQJxgcLqKywpl1tI1N/+B5bkptAnR2a3tsRybq0IHZnIkSRGUYcu5zPwJT+bitVw8BvIaGzxI+Zm2ivE=";
       };
       git-renoise = {
-        hostNames = [
+        hostNames = [ "[git.renoise.com]:2229" "[94.130.128.97]:2229" ];
-          "[git.renoise.com]:2229"
+        publicKey =
-          "[94.130.128.97]:2229"
+          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmIOTjQsD1TaD9MiECcRqwfAXfRdbI+2pkuF+zhBUkrX41NA4LzifPY4Iw3PlklE0YGIOzYyNitzkdgxIWkeqa0Y9iL3gGZBuLFORj5YXWlDKB2RrPAsZRL8y69y4H6RWPpL6DHHsf9eT+HgRzWzzn5nUFLfkCsuM96BqjIKN1pinIBcE6gst1UUSwSTjK8XZA5d4BiSrLF4HiNXnDm+qniYGbGkzZcjn1ua+l0GdGbfg9TotFnSK/QXgN3MeHHDZKnIjOIkOXCY+L5URe0RHo6pBFdj+BLr211AJhB52MrDNudQcY6eSQiJ08LeE6SkcrsQO/VZ/JnOkHxHd2mOyH";
-        ];
-        publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmIOTjQsD1TaD9MiECcRqwfAXfRdbI+2pkuF+zhBUkrX41NA4LzifPY4Iw3PlklE0YGIOzYyNitzkdgxIWkeqa0Y9iL3gGZBuLFORj5YXWlDKB2RrPAsZRL8y69y4H6RWPpL6DHHsf9eT+HgRzWzzn5nUFLfkCsuM96BqjIKN1pinIBcE6gst1UUSwSTjK8XZA5d4BiSrLF4HiNXnDm+qniYGbGkzZcjn1ua+l0GdGbfg9TotFnSK/QXgN3MeHHDZKnIjOIkOXCY+L5URe0RHo6pBFdj+BLr211AJhB52MrDNudQcY6eSQiJ08LeE6SkcrsQO/VZ/JnOkHxHd2mOyH";
       };
       "siteground" = {
-        hostNames = [
+        hostNames = [ "[es5.siteground.eu]:18765" "[37.60.224.6]:18765" ];
-          "[es5.siteground.eu]:18765"
+        publicKey =
-          "[37.60.224.6]:18765"
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHZuvHooyHa69rU+SfOghM6yfc7bce5cMi9sh5JkoLPi+m8QEkX3oiG9rRpAhp0GYnB74M4l1+0XlxmG7/HVmq0=";
-        ];
-        publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHZuvHooyHa69rU+SfOghM6yfc7bce5cMi9sh5JkoLPi+m8QEkX3oiG9rRpAhp0GYnB74M4l1+0XlxmG7/HVmq0=";
       };
       "cracksucht.de" = {
         hostNames = [ "cracksucht.de" ];
-        publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVqpWzX+C7veO/1MDSdh5ukFhpI4cfXevbl6DVb9gVt1wdYB0JsiMiWfl13MZJy9iEP/KfwRLYmu8i36tDR9uJfHQyLK8G7q2DhrleIPgM3dFCdDU1QtulE8hEq/ZsqzMn/QIHYIipIqzNfmC/xnpX2gIo09T7EY+n863ALlj+GqxMb4nr2XDLY+Lllo2yMzylJIz9q8U5hOmzrlCnBpf2MPMwanHXnZXj2CmO80VyBHnAMJ/h72AN1qzDaHFlhxh0Li/POc1bpDjiVjiUPgimHZWpi3VObxWLLn2zf+RH2lx0yXMccSEnkWvHp+Ll5apIUUS+vTlDo3niWpEfGZLl root@debian";
+        publicKey =
+          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVqpWzX+C7veO/1MDSdh5ukFhpI4cfXevbl6DVb9gVt1wdYB0JsiMiWfl13MZJy9iEP/KfwRLYmu8i36tDR9uJfHQyLK8G7q2DhrleIPgM3dFCdDU1QtulE8hEq/ZsqzMn/QIHYIipIqzNfmC/xnpX2gIo09T7EY+n863ALlj+GqxMb4nr2XDLY+Lllo2yMzylJIz9q8U5hOmzrlCnBpf2MPMwanHXnZXj2CmO80VyBHnAMJ/h72AN1qzDaHFlhxh0Li/POc1bpDjiVjiUPgimHZWpi3VObxWLLn2zf+RH2lx0yXMccSEnkWvHp+Ll5apIUUS+vTlDo3niWpEfGZLl root@debian";
       };
     };
 

components/network/sshd/known-hosts-zerotier.nix

@@ -1,34 +1,34 @@
-{
+{ lib, config, clanLib, ... }:
-  lib,
-  config,
-  clanLib,
-  ...
-}:
 with lib;
 with types;
 let
   machines = clanLib.allMachineNames;
   publicKey = clanLib.readFact "ssh.id_ed25519.pub";
   tld = config.clan.static-hosts.topLevelDomain;
-  knownHosts = lib.genAttrs machines (machine: {
+  knownHosts = lib.genAttrs machines
-    hostNames = [
+    (machine:
-      "${machine}"
+      {
-      "${machine}.${tld}"
+        hostNames = [
-      "${machine}.private"
+          "${machine}"
-    ];
+          "${machine}.${tld}"
-    publicKey = publicKey machine;
+          "${machine}.private"
-  });
+        ];
+        publicKey = publicKey machine;
+      }
+    );
   bootMachines = clanLib.readFactFromAllMachines "ssh.boot.id_ed25519.pub";
-  knownBootHosts = lib.mapAttrs' (
+  knownBootHosts = lib.mapAttrs'
-    machine: publicKey:
+    (machine: publicKey: nameValuePair
-    nameValuePair "boot_${machine}" {
+      "boot_${machine}"
-      inherit publicKey;
+      {
-      hostNames = [
+        inherit publicKey;
-        "[${machine}]:2222"
+        hostNames = [
-        "[${machine}.public]:2222"
+          "[${machine}]:2222"
-      ];
+          "[${machine}.public]:2222"
-    }
+        ];
-  ) bootMachines;
+      }
+    )
+    bootMachines;
 in
 {
 

components/network/syncthing.nix

@@ -1,13 +1,15 @@
-{
+{ config, lib, pkgs, factsGenerator, clanLib, ... }:
-  config,
+let
-  lib,
+  clanMachines =
-  pkgs,
+    lib.mapAttrs
-  factsGenerator,
+      (machine: facts: {
-  clanLib,
+        name = machine;
-  ...
+        id = facts."syncthing.pub";
-}:
+        addresses = [ "tcp://[${facts."zerotier-ip"}]:22000" ];
-with lib;
+      })
-{
+      (clanLib.readFactsFromAllMachines [ "syncthing.pub" "zerotier-ip" ]);
+in
+with lib; {
 
   # networking.firewall.interfaces."gummybears".allowedTCPPorts = [ 8384 ];
 
@@ -20,19 +22,6 @@ with lib;
     cert = config.clan.core.facts.services.syncthing.secret."syncthing.cert".path;
     settings.devices =
       let
-        clanMachines =
-          lib.mapAttrs
-            (machine: facts: {
-              name = machine;
-              id = facts."syncthing.pub";
-              addresses = [ "tcp://[${facts."zerotier-ip"}]:22000" ];
-            })
-            (
-              clanLib.readFactsFromAllMachines [
-                "syncthing.pub"
-                "zerotier-ip"
-              ]
-            );
         device = machine: id: {
           "${machine}" = {
             name = machine;
@@ -43,26 +32,22 @@ with lib;
       in
       clanMachines
       // (device "iPhone" "RPQBSRB-DYEUUWQ-EAPMBA2-PL4MJ73-Y4F4ZTH-TAD7DUE-GEK56BG-HYW6YAF")
-      // (device "bumba" "JS7PWTO-VKFGBUP-GNFLSWP-MGFJ2KH-HLO2LKW-V3RPCR6-PCB5SQC-42FCKQZ");
+      // (device "bumba" "JS7PWTO-VKFGBUP-GNFLSWP-MGFJ2KH-HLO2LKW-V3RPCR6-PCB5SQC-42FCKQZ")
+    ;
 
     settings.folders = {
 
+      # needs to be on encrypted drives
+      # -------------------------------
       audiobooks = {
         enable = lib.mkDefault false;
         path = lib.mkDefault "/tmp/audiobooks";
-        devices = [
+        devices = [ "chungus" "orbi" ];
-          "chungus"
-          "orbi"
-        ];
       };
       books = {
         enable = lib.mkDefault false;
         path = lib.mkDefault "/tmp/books";
-        devices = [
+        devices = [ "chungus" "cream" "cherry" ];
-          "chungus"
-          "cream"
-          "cherry"
-        ];
         versioning = {
           type = "simple";
           params.keep = "2";
@@ -71,20 +56,12 @@ with lib;
       desktop = {
         enable = lib.mkDefault false;
         path = lib.mkDefault "/tmp/desktop";
-        devices = [
+        devices = [ "chungus" "cream" "cherry" ];
-          "chungus"
-          "cream"
-          "cherry"
-        ];
       };
       finance = {
         enable = lib.mkDefault false;
         path = lib.mkDefault "/tmp/finance";
-        devices = [
+        devices = [ "chungus" "cream" "cherry" ];
-          "chungus"
-          "cream"
-          "cherry"
-        ];
         versioning = {
           type = "simple";
           params.keep = "10";
@@ -93,46 +70,27 @@ with lib;
       flix = {
         enable = lib.mkDefault false;
         path = lib.mkDefault "/tmp/flix";
-        devices = [
+        devices = [ "chungus" "orbi" ];
-          "chungus"
-          "orbi"
-        ];
       };
       logseq = {
         enable = lib.mkDefault false;
         path = lib.mkDefault "/tmp/logseq";
-        devices = [
+        devices = [ "chungus" "cream" "cherry" "iPhone" ];
-          "chungus"
-          "cream"
-          "cherry"
-          "iPhone"
-        ];
       };
       lectures = {
         enable = lib.mkDefault false;
         path = lib.mkDefault "/tmp/lectures";
-        devices = [
+        devices = [ "chungus" "orbi" ];
-          "chungus"
-          "orbi"
-        ];
       };
       oscar_cpap = {
         enable = lib.mkDefault false;
         path = lib.mkDefault "/tmp/oscar_cpap";
-        devices = [
+        devices = [ "chungus" "cream" "cherry" ];
-          "chungus"
-          "cream"
-          "cherry"
-        ];
       };
       password-store = {
         enable = lib.mkDefault false;
         path = lib.mkDefault "/tmp/password-store";
-        devices = [
+        devices = [ "chungus" "cream" "cherry" ];
-          "chungus"
-          "cream"
-          "cherry"
-        ];
         versioning = {
           type = "simple";
           params.keep = "10";
@@ -142,12 +100,18 @@ with lib;
       share = {
         enable = lib.mkDefault false;
         path = lib.mkDefault "/tmp/password-store";
-        devices = [
+        devices = [ "cream" "cherry" "orbi" ];
-          "cream"
-          "cherry"
-          "orbi"
-        ];
       };
+      # todo remove if zfs is is used
+      #nextcloud_backup = {
+      #  enable = lib.mkDefault false;
+      #  path = lib.mkDefault "/tmp/lost-fotos";
+      #  devices = [ "chungus"  ];
+      #  versioning = {
+      #    type = "simple";
+      #    params.keep = "2";
+      #  };
+      #};
     };
   };
 

components/network/tinc/default.nix

@@ -1,10 +1,4 @@
-{
+{ lib, config, factsGenerator, clanLib, ... }:
-  lib,
-  config,
-  factsGenerator,
-  clanLib,
-  ...
-}:
 with lib;
 {
 
@@ -26,21 +20,18 @@ with lib;
   };
 
   config = mkMerge [
-    (mkIf config.tinc.private.enable (
+    (mkIf config.tinc.private.enable (import ./private.nix {
-      import ./private.nix {
+      ipv4 = config.tinc.private.ipv4;
-        ipv4 = config.tinc.private.ipv4;
+      ipv6 = null;
-        ipv6 = null;
+      inherit (lib) optionalString concatStringsSep mapAttrsToList;
-        inherit (lib) optionalString concatStringsSep mapAttrsToList;
+      inherit config factsGenerator clanLib;
-        inherit config factsGenerator clanLib;
+    }))
-      }
+    (mkIf config.tinc.secret.enable (import ./secret.nix {
-    ))
+      ipv4 = config.tinc.secret.ipv4;
-    (mkIf config.tinc.secret.enable (
+      ipv6 = null;
-      import ./secret.nix {
+      inherit (lib) optionalString concatStringsSep mapAttrsToList;
-        ipv4 = config.tinc.secret.ipv4;
+      inherit config factsGenerator clanLib;
-        ipv6 = null;
+    }))
-        inherit (lib) optionalString concatStringsSep mapAttrsToList;
-        inherit config factsGenerator clanLib;
-      }
-    ))
   ];
 }
+

components/network/tinc/private.nix

@@ -1,13 +1,12 @@
-{
+{ ipv4
-  ipv4,
+, ipv6
-  ipv6,
+, config
-  config,
+, optionalString
-  optionalString,
+, concatStringsSep
-  concatStringsSep,
+, factsGenerator
-  factsGenerator,
+, mapAttrsToList
-  mapAttrsToList,
+, clanLib
-  clanLib,
+, ...
-  ...
 }:
 let
   hosts = {
@@ -52,36 +51,35 @@ in
 
   services.tinc.networks = {
     ${network} = {
-      ed25519PrivateKeyFile =
+      ed25519PrivateKeyFile = config.clan.core.facts.services.tinc_private.secret."tinc.private.ed25519_key.priv".path;
-        config.clan.core.facts.services.tinc_private.secret."tinc.private.ed25519_key.priv".path;
       interfaceType = "tap";
       extraConfig = ''
         LocalDiscovery = yes
       '';
       hostSettings = {
         mobi = {
-          subnets = [ { address = hosts.mobi; } ];
+          subnets = [{ address = hosts.mobi; }];
           settings.Ed25519PublicKey = "X5sp3YYevVNUrzYvi+HZ2iW5WbO0bIb58jR4jZFH6MB";
         };
         bobi = {
-          subnets = [ { address = hosts.bobi; } ];
+          subnets = [{ address = hosts.bobi; }];
           settings.Ed25519PublicKey = "jwvNd4oAgz2cWEI74VTVYU1qgPWq823/a0iEDqJ8KMD";
         };
         cream = {
-          subnets = [ { address = hosts.cream; } ];
+          subnets = [{ address = hosts.cream; }];
           settings.Ed25519PublicKey = Ed25519PublicKey "cream";
         };
         cherry = {
-          subnets = [ { address = hosts.cherry; } ];
+          subnets = [{ address = hosts.cherry; }];
           settings.Ed25519PublicKey = Ed25519PublicKey "cherry";
         };
         chungus = {
-          subnets = [ { address = hosts.chungus; } ];
+          subnets = [{ address = hosts.chungus; }];
           settings.Ed25519PublicKey = Ed25519PublicKey "chungus";
         };
         orbi = {
-          addresses = [ { address = "95.216.66.212"; } ];
+          addresses = [{ address = "95.216.66.212"; }];
-          subnets = [ { address = hosts.orbi; } ];
+          subnets = [{ address = hosts.orbi; }];
           settings.Ed25519PublicKey = Ed25519PublicKey "orbi";
         };
       };
@@ -102,8 +100,6 @@ in
     LinkLocalAddressing = no
   '';
 
-  networking.extraHosts = concatStringsSep "\n" (
+  networking.extraHosts = concatStringsSep "\n" (mapAttrsToList (name: ip: "${ip} ${name}.${network}") (hosts // subDomains));
-    mapAttrsToList (name: ip: "${ip} ${name}.${network}") (hosts // subDomains)
-  );
 
 }

components/network/tinc/secret.nix

@@ -1,12 +1,11 @@
-{
+{ ipv4
-  ipv4,
+, ipv6
-  ipv6,
+, config
-  config,
+, optionalString
-  optionalString,
+, concatStringsSep
-  concatStringsSep,
+, mapAttrsToList
-  mapAttrsToList,
+, factsGenerator
-  factsGenerator,
+, ...
-  ...
 }:
 let
   port = 721;
@@ -24,37 +23,31 @@ in
 
   services.tinc.networks = {
     ${network} = {
-      ed25519PrivateKeyFile =
+      ed25519PrivateKeyFile = config.clan.core.facts.services.tinc_secret.secret."tinc.secret.ed25519_key.priv".path;
-        config.clan.core.facts.services.tinc_secret.secret."tinc.secret.ed25519_key.priv".path;
       extraConfig = ''
         LocalDiscovery = yes
         Port = ${toString port}
       '';
       hostSettings = {
         sternchen = {
-          subnets = [ { address = hosts.sternchen; } ];
+          subnets = [{ address = hosts.sternchen; }];
           settings.Ed25519PublicKey = "Z567IKl00Kw5JFBNwMvjL33QYe2hRoNtQcNIDFRPReB";
         };
         cream = {
-          subnets = [ { address = hosts.cream; } ];
+          subnets = [{ address = hosts.cream; }];
           settings.Ed25519PublicKey = "Y/YRA90mAlNEmdhUWlUTHjjsco6d6hlvW11sPtarIdL";
         };
         cherry = {
-          subnets = [ { address = hosts.cherry; } ];
+          subnets = [{ address = hosts.cherry; }];
           settings.Ed25519PublicKey = "BsPIrZjbzn0aryC0HO3OXSb4oFCMmzNDmMDQmxUXUuC";
         };
         sterni = {
-          subnets = [ { address = hosts.sterni; } ];
+          subnets = [{ address = hosts.sterni; }];
           settings.Ed25519PublicKey = "r6mRDc814z2YtyG9ev/XXV2SgquqWR8n53V13xNXb7O";
         };
         robi = {
-          addresses = [
+          addresses = [{ address = "144.76.13.147"; port = port; }];
-            {
+          subnets = [{ address = hosts.robi; }];
-              address = "144.76.13.147";
-              port = port;
-            }
-          ];
-          subnets = [ { address = hosts.robi; } ];
           settings.Ed25519PublicKey = "bZUbSdME4fwudNVbUoNO7PpoOS2xALsyTs81F260KbL";
         };
       };
@@ -75,37 +68,23 @@ in
     LinkLocalAddressing = no
   '';
 
-  networking.extraHosts = concatStringsSep "\n" (
+  networking.extraHosts = concatStringsSep "\n" (mapAttrsToList (name: ip: "${ip} ${name}.${network}") hosts);
-    mapAttrsToList (name: ip: "${ip} ${name}.${network}") hosts
-  );
 
   services.openssh.knownHosts = {
     "cream.${network}" = {
-      hostNames = [
+      hostNames = [ "cream.${network}" hosts.cream ];
-        "cream.${network}"
-        hosts.cream
-      ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIConHiCL7INgAhuN6Z9TqP0zP+xNpdV7+OHwUca4IRDD";
     };
     "sternchen.${network}" = {
-      hostNames = [
+      hostNames = [ "sterni.${network}" hosts.sterni ];
-        "sterni.${network}"
-        hosts.sterni
-      ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILriD/0+65L1mkbjKENwpvB3wUMXz/rEf9J8wuJjJa0q";
     };
     "sterni.${network}" = {
-      hostNames = [
+      hostNames = [ "sterni.${network}" hosts.sterni ];
-        "sterni.${network}"
-        hosts.sterni
-      ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEQRH4gzT4vWSx3KN80ePPYhSPZRUae/qSyEym6pJTht";
     };
     "robi" = {
-      hostNames = [
+      hostNames = [ "robi.${network}" hosts.robi ];
-        "robi.${network}"
-        hosts.robi
-      ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK2PGX6cZuBUGX4VweMzi0aRh4uQ61yngCzZGcK3w5XV";
     };
   };

components/network/wifi.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with lib;
 with types;
 {
@@ -27,6 +22,7 @@ with types;
     # Setting this value to 1 means to try activation once, without retry.
     networking.networkmanager.settings.main.autoconnect-retries-default = 999;
 
+
     hardware.enableRedistributableFirmware = true;
 
     # because Networkd-wait-online is just failing.
@@ -51,3 +47,4 @@ with types;
   };
 
 }
+

components/network/wireguard.nix

@@ -28,4 +28,6 @@ with lib;
     '';
   };
 
+
 }
+

components/nixos/upgrade-diff.nix

@@ -1,10 +1,5 @@
 # MIT Jörg Thalheim - https://github.com/Mic92/dotfiles/blob/c6cad4e57016945c4816c8ec6f0a94daaa0c3203/nixos/modules/upgrade-diff.nix
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 {
 
   options.components.nixos.update-diff.enable = lib.mkOption {

components/terminal/bash.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 {
   options.components.terminal.bash.enable = mkOption {
@@ -21,6 +16,7 @@ with lib;
 
       interactiveShellInit = "set -o vi";
 
+
       shellAliases = {
         ls = "ls --color=tty";
         l = "ls -CFh";

components/terminal/default.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with lib;
 {
   options.components.terminal = {

components/terminal/direnv.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 {
   options.components.terminal.direnv.enable = mkOption {
@@ -17,10 +12,7 @@ with lib;
     home-manager.sharedModules = [
       {
         programs.direnv.enable = true;
-        programs.git.ignores = [
+        programs.git.ignores = [ ".envrc" ".direnv" ];
-          ".envrc"
-          ".direnv"
-        ];
       }
     ];
 

components/terminal/git.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with lib;
 {
   options.components.terminal.git.enable = mkOption {
@@ -13,6 +8,7 @@ with lib;
 
   config = mkIf (config.components.terminal.git.enable) {
 
+
     environment.systemPackages = with pkgs; [
       git
       gita
@@ -33,3 +29,4 @@ with lib;
     ];
   };
 }
+

components/terminal/heygpt.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with lib;
 {
   options.components.terminal.heygpt.enable = mkOption {

components/terminal/hoard.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 let
   hoardSrc = pkgs.fetchFromGitHub {
@@ -36,26 +31,10 @@ in
         config_home_path = "/home/palo/.config/hoard";
         trove_path = "/home/palo/.config/hoard/trove.yml";
         query_prefix = " >";
-        primary_color = [
+        primary_color = [ 87 142 87 ];
-          87
+        secondary_color = [ 203 184 144 ];
-          142
+        tertiary_color = [ 30 30 30 ];
-          87
+        command_color = [ 30 30 30 ];
-        ];
-        secondary_color = [
-          203
-          184
-          144
-        ];
-        tertiary_color = [
-          30
-          30
-          30
-        ];
-        command_color = [
-          30
-          30
-          30
-        ];
         parameter_token = "#";
         read_from_current_directory = true;
       };

components/terminal/remote-install.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 {
   options.components.terminal.remote-install.enable = mkOption {
@@ -15,7 +10,7 @@ with lib;
     services.tor = {
       enable = true;
       client.enable = true;
-      relay.onionServices.liveos.map = [ { port = 1337; } ];
+      relay.onionServices.liveos.map = [{ port = 1337; }];
     };
 
     environment.systemPackages = [

components/terminal/wtf.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 let
 
@@ -59,29 +54,23 @@ let
     echo
   '';
 
-  userHighlight =
+  userHighlight = map ({ user, ... }: user)
-    map ({ user, ... }: user) (builtins.attrValues config.services.browser.configList)
+    (builtins.attrValues config.services.browser.configList)
-    ++ [ "steam" ];
+  ++ [ "steam" ];
 
   activeUsers = pkgs.writers.writeBash "active-users" ''
     ${pkgs.procps}/bin/ps -eo user \
      | ${pkgs.gnused}/bin/sed '1 d' \
      | ${pkgs.coreutils}/bin/sort  \
      | ${pkgs.coreutils}/bin/uniq \
-     | ${pkgs.gnugrep}/bin/egrep --color=always '(${pkgs.lib.concatStringsSep "|" userHighlight})|$'
+     | ${pkgs.gnugrep}/bin/egrep --color=always '(${
+       pkgs.lib.concatStringsSep "|" userHighlight
+     })|$'
   '';
 
   # default settings
   wtfModule =
-    args@{
+    args@{ height ? 1, width ? 1, top, left, enabled ? true, type, ... }:
-      height ? 1,
-      width ? 1,
-      top,
-      left,
-      enabled ? true,
-      type,
-      ...
-    }:
     {
       enabled = enabled;
       focusable = false;
@@ -89,157 +78,106 @@ let
       position.left = left;
       position.height = height;
       position.width = width;
-    }
+    } // (lib.filterAttrs
-    // (lib.filterAttrs (
+      (key: _: lib.all (x: x != key) [ "height" "width" "top" "left" ])
-      key: _:
+      args);
-      lib.all (x: x != key) [
-        "height"
-        "width"
-        "top"
-        "left"
-      ]
-    ) args);
 
   # command runner module
-  cmdRunner =
+  cmdRunner = args@{ cmd, ... }:
-    args@{ cmd, ... }:
+    wtfModule ({
-    wtfModule (
+      type = "cmdrunner";
-      {
+      focusable = false;
-        type = "cmdrunner";
+      refreshInterval = 300;
-        focusable = false;
+    } // args);
-        refreshInterval = 300;
-      }
-      // args
-    );
 
   modules = {
     inherit cmdRunner;
 
-    digitalclock =
+    digitalclock = args@{ top, left, ... }:
-      args@{ top, left, ... }:
+      cmdRunner ({
-      cmdRunner (
+        cmd = pkgs.writers.writeDash "clock" ''
-        {
+          ${pkgs.toilet}/bin/toilet --font future `${pkgs.coreutils}/bin/date +"%a %H:%M"`
-          cmd = pkgs.writers.writeDash "clock" ''
+          ${pkgs.coreutils}/bin/date +"%B %d %Y"
-            ${pkgs.toilet}/bin/toilet --font future `${pkgs.coreutils}/bin/date +"%a %H:%M"`
+        '';
-            ${pkgs.coreutils}/bin/date +"%B %d %Y"
+        title = "";
-          '';
+        refreshInterval = 30;
-          title = "";
+      } // args);
-          refreshInterval = 30;
-        }
-        // args
-      );
 
-    clocks =
+    clocks = args@{ top, left, ... }:
-      args@{ top, left, ... }:
+      wtfModule ({
-      wtfModule (
+        type = "clocks";
-        {
+        title = "";
-          type = "clocks";
+        border = false;
-          title = "";
+        colors.rows = {
-          border = false;
+          even = "white";
-          colors.rows = {
+          odd = "white";
-            even = "white";
+        };
-            odd = "white";
+        locations = {
-          };
+          UTC = "Etc/UTC";
-          locations = {
+          Berlin = "Europe/Berlin";
-            UTC = "Etc/UTC";
+          Cuba = "America/Havana";
-            Berlin = "Europe/Berlin";
+          Wellington = "Pacific/Auckland";
-            Thailand = "Asia/Bangkok";
+        };
-            #Cuba = "America/Havana";
+        sort = "alphabetical";
-            #Wellington = "Pacific/Auckland";
+        refreshInterval = 60;
-          };
+      } // args);
-          sort = "alphabetical";
-          refreshInterval = 60;
-        }
-        // args
-      );
 
-    resourceusage =
+    resourceusage = args@{ top, left, ... }:
-      args@{ top, left, ... }:
+      wtfModule ({
-      wtfModule (
+        type = "resourceusage";
-        {
+        title = "";
-          type = "resourceusage";
+        cpuCombined = false;
-          title = "";
+        refreshInterval = 5;
-          cpuCombined = false;
+      } // args);
-          refreshInterval = 5;
-        }
-        // args
-      );
 
-    power =
+    power = args@{ top, left, ... }:
-      args@{ top, left, ... }:
+      wtfModule ({
-      wtfModule (
+        type = "power";
-        {
+        title = "";
-          type = "power";
+        refreshInterval = 100;
-          title = "";
+      } // args);
-          refreshInterval = 100;
-        }
-        // args
-      );
 
-    prettyweather =
+    prettyweather = args@{ top, left, ... }:
-      args@{ top, left, ... }:
+      wtfModule ({
-      wtfModule (
+        type = "prettyweather";
-        {
+        title = "";
-          type = "prettyweather";
+        city = "Essen";
-          title = "";
+        unit = "m";
-          city = "Essen";
+        view = 0;
-          unit = "m";
+        language = "en";
-          view = 0;
+        refreshInterval = 3600;
-          language = "en";
+      } // args);
-          refreshInterval = 3600;
-        }
-        // args
-      );
 
-    feedreader =
+    feedreader = args@{ top, left, feeds, ... }:
-      args@{
+      wtfModule ({
-        top,
+        type = "feedreader";
-        left,
+        title = "";
-        feeds,
+        refreshInterval = 3600;
-        ...
+        focusable = true;
-      }:
+        #feedLimit = 10;
-      wtfModule (
+        colors.rows = {
-        {
+          even = "white";
-          type = "feedreader";
+          odd = "white";
-          title = "";
+        };
-          refreshInterval = 3600;
+      } // args);
-          focusable = true;
-          #feedLimit = 10;
-          colors.rows = {
-            even = "white";
-            odd = "white";
-          };
-        }
-        // args
-      );
 
-    github =
+    github = args@{ top, left, username, apiKey, ... }:
-      args@{
+      wtfModule ({
-        top,
+        type = "github";
-        left,
+        title = "";
-        username,
+        refreshInterval = 3600;
-        apiKey,
+        feedlimit = 10;
-        ...
-      }:
-      wtfModule (
-        {
-          type = "github";
-          title = "";
-          refreshInterval = 3600;
-          feedlimit = 10;
 
-          enableStatus = true;
+        enableStatus = true;
-          #  customQueries:
+        #  customQueries:
-          #    othersPRs:
+        #    othersPRs:
-          #      title: "Others Pull Requests"
+        #      title: "Others Pull Requests"
-          #      filter: "is:open is:pr -author:wtfutil"
+        #      filter: "is:open is:pr -author:wtfutil"
-          #  repositories:
+        #  repositories:
-          #    - "wtfutil/wtf"
+        #    - "wtfutil/wtf"
-          #    - "wtfutil/docs"
+        #    - "wtfutil/docs"
-          #    - "umbrella-corp/wesker-api"
+        #    - "umbrella-corp/wesker-api"
-        }
+      } // args);
-        // args
-      );
 
   };
 
@@ -252,20 +190,8 @@ let
         normal = "green";
       };
       grid = {
-        columns = [
+        columns = [ 28 0 0 ];
-          28
+        rows = [ 9 9 9 9 9 9 0 ];
-          0
-          0
-        ];
-        rows = [
-          9
-          9
-          9
-          9
-          9
-          9
-          0
-        ];
       };
       refreshInterval = 1;
       mods = with modules; {
@@ -300,7 +226,8 @@ let
           top = 4;
           left = 1;
           height = 1;
-          feeds = [ "https://latesthackingnews.com/category/hacking-tools/feed/" ];
+          feeds =
+            [ "https://latesthackingnews.com/category/hacking-tools/feed/" ];
         };
         nixos = feedreader {
           title = "NixOS Weekly";
@@ -337,20 +264,8 @@ let
         normal = "green";
       };
       grid = {
-        columns = [
+        columns = [ 33 12 28 36 0 ];
-          33
+        rows = [ 9 4 6 6 0 ];
-          12
-          28
-          36
-          0
-        ];
-        rows = [
-          9
-          4
-          6
-          6
-          0
-        ];
       };
       refreshInterval = 1;
       mods = with modules; {
@@ -376,16 +291,12 @@ let
           left = 0;
         };
 
-        yfinance = wtfModule {
+        rates = wtfModule {
           type = "yfinance";
           top = 3;
           left = 0;
           title = "rates";
-          symbols = [
+          symbols = [ "EURUSD=X" "EURNZD=X" ];
-            "EURUSD=X"
-            "EURNZD=X"
-            "EURTHB=X"
-          ];
           refreshInterval = 60;
         };
 
@@ -396,12 +307,7 @@ let
 
         calendar = cmdRunner {
           title = "";
-          args = [
+          args = [ "-3" "--monday" "--color=never" "-w" ];
-            "-3"
-            "--monday"
-            "--color=never"
-            "-w"
-          ];
           cmd = "cal";
           top = 1;
           left = 1;
@@ -463,12 +369,9 @@ let
     };
   };
 
-  createDashboard =
+  createDashboard = { json, name }:
-    { json, name }:
+    let configuration = pkgs.writeText "config.yml" (builtins.toJSON json);
-    let
+    in pkgs.writers.writeBashBin name ''
-      configuration = pkgs.writeText "config.yml" (builtins.toJSON json);
-    in
-    pkgs.writers.writeBashBin name ''
       ${pkgs.wtf}/bin/wtfutil --config=${toString configuration}
     '';
 

components/terminal/zsh.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 {
   options.components.terminal.zsh.enable = mkOption {

components/timezone.nix

@@ -1,9 +1,8 @@
-{ lib, ... }:
 {
   # some system stuff
   # -----------------
   time.timeZone = "Europe/Berlin";
-  #time.timeZone = "Pacific/Auckland";
+  #time.timeZone = lib.mkDefault "Pacific/Auckland";
-  #time.timeZone = "Asia/Singapore";
+  #time.timeZone = lib.mkDefault "Asia/Singapore";
-  #time.timeZone = "Asia/Makassar";
+  #time.timeZone = lib.mkDefault "Asia/Makassar";
 }

components/virtualisation/docker.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with lib;
 {
 

components/virtualisation/podman.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with lib;
 {
 

components/virtualisation/qemu.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with lib;
 {
 

components/virtualisation/virtualbox.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with lib;
 {
 

components/yubikey.nix

@@ -1,12 +1,7 @@
 # References:
 # * https://github.com/drduh/YubiKey-Guide
 # * https://nixos.wiki/wiki/Yubikey
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with lib;
 {
 
@@ -21,6 +16,7 @@ with lib;
     services.pcscd.enable = true;
     services.udev.packages = [ pkgs.yubikey-personalization ];
 
+
     environment.systemPackages = [
 
       pkgs.yubikey-personalization

features/boot/ssh.nix

@@ -1,11 +1,4 @@
-{
+{ config, lib, pkgs, factsGenerator, clanLib, ... }:
-  config,
-  lib,
-  pkgs,
-  factsGenerator,
-  clanLib,
-  ...
-}:
 with lib;
 with types;
 
@@ -18,7 +11,8 @@ with types;
     kernelModules = mkOption {
       type = listOf str;
       default = [ ];
-      description = "nix-shell -p pciutils --run 'lspci -v' will tell you which kernel module is used for the ethernet interface";
+      description =
+        "nix-shell -p pciutils --run 'lspci -v' will tell you which kernel module is used for the ethernet interface";
     };
   };
 
@@ -48,3 +42,4 @@ with types;
   };
 
 }
+

features/boot/tor.nix

@@ -1,11 +1,4 @@
-{
+{ config, lib, pkgs, factsGenerator, clanLib, ... }:
-  config,
-  lib,
-  pkgs,
-  factsGenerator,
-  clanLib,
-  ...
-}:
 with lib;
 with types;
 {
@@ -23,13 +16,14 @@ with types;
       name = "initrd";
       addressPrefix = "init";
     };
-    boot.initrd.secrets = mapAttrs' (name: file: nameValuePair "/etc/tor/onion/bootup/${name}" file) (
+    boot.initrd.secrets =
-      genAttrs [
+      mapAttrs' (name: file: nameValuePair "/etc/tor/onion/bootup/${name}" file)
-        "hostname"
+        (genAttrs [
-        "hs_ed25519_public_key"
+          "hostname"
-        "hs_ed25519_secret_key"
+          "hs_ed25519_public_key"
-      ] (secret: config.clan.core.facts.services."initrd.tor".secret."tor.initrd.${secret}".path)
+          "hs_ed25519_secret_key"
-    );
+        ]
+          (secret: config.clan.core.facts.services."initrd.tor".secret."tor.initrd.${secret}".path));
 
     boot.initrd.systemd.storePaths = [
       pkgs.tor
@@ -49,10 +43,7 @@ with types;
     boot.initrd.systemd.services.tor = {
       description = "tor during init";
       wantedBy = [ "initrd.target" ];
-      after = [
+      after = [ "network.target" "initrd-nixos-copy-secrets.service" ];
-        "network.target"
-        "initrd-nixos-copy-secrets.service"
-      ];
       before = [ "shutdown.target" ];
       conflicts = [ "shutdown.target" ];
 
@@ -62,15 +53,17 @@ with types;
         pkgs.iproute2
         pkgs.coreutils
       ];
-      script = ''
+      script =
-        echo "tor: preparing onion folder"
+        ''
-        # have to do this otherwise tor does not want to start
+          echo "tor: preparing onion folder"
-        chmod -R 700 /etc/tor
+          # have to do this otherwise tor does not want to start
+          chmod -R 700 /etc/tor
 
-        echo "tor: starting tor"
+          echo "tor: starting tor"
-        tor -f /etc/tor/tor.rc --verify-config
+          tor -f /etc/tor/tor.rc --verify-config
-        tor -f /etc/tor/tor.rc
+          tor -f /etc/tor/tor.rc
-      '';
+        '';
     };
   };
 }
+

features/network/fail2ban.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with lib;
 {
   options.features.network.fail2ban.enable = mkOption {

features/network/sshguard.nix

@@ -1,10 +1,4 @@
-{
+{ pkgs, config, lib, assets, ... }:
-  pkgs,
-  config,
-  lib,
-  assets,
-  ...
-}:
 with lib;
 with types;
 {

flake.lock

@@ -120,7 +120,6 @@
         "flake-parts": [
           "flake-parts"
         ],
-        "nixos-facter-modules": "nixos-facter-modules",
         "nixos-images": "nixos-images",
         "nixpkgs": [
           "nixpkgs"
@@ -130,11 +129,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1726339325,
+        "lastModified": 1724336239,
-        "narHash": "sha256-bJhxZywuBdQ4vk/t12U1Y9pKKM5VbchKvvM95838+bQ=",
+        "narHash": "sha256-p8zpAx/w3PjaGaTyOP/wus4eJAdHPKxOtvDKfEHcs9Y=",
         "ref": "refs/heads/main",
-        "rev": "17da259ff99e2d4079f686ba837eb55a2ac9e79b",
+        "rev": "3fe873855a39b71e2b4e9fca1be1ec10cf5a6024",
-        "revCount": 4100,
+        "revCount": 3822,
         "type": "git",
         "url": "https://git.clan.lol/clan/clan-core"
       },
@@ -165,28 +164,6 @@
         "type": "github"
       }
     },
-    "devshell": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nix-topology",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1713532798,
-        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -195,11 +172,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725377834,
+        "lastModified": 1723080788,
-        "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=",
+        "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe",
+        "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed",
         "type": "github"
       },
       "original": {
@@ -231,22 +208,6 @@
       }
     },
     "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -287,11 +248,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726153070,
+        "lastModified": 1722555600,
-        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
         "type": "github"
       },
       "original": {
@@ -321,24 +282,6 @@
         "type": "github"
       }
     },
-    "flake-parts_4": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
-      },
-      "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1644229661,
@@ -359,11 +302,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1701680307,
+        "lastModified": 1694529238,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -373,24 +316,6 @@
       }
     },
     "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
       "locked": {
         "lastModified": 1631561581,
         "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
@@ -405,30 +330,9 @@
         "type": "github"
       }
     },
-    "flake-utils_5": {
+    "flake-utils_4": {
       "inputs": {
-        "systems": [
+        "systems": "systems_3"
-          "stylix",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_6": {
-      "inputs": {
-        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -460,28 +364,6 @@
         "type": "github"
       }
     },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-topology",
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "gnome-shell": {
       "flake": false,
       "locked": {
@@ -501,16 +383,14 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1726357542,
+        "lastModified": 1723986931,
-        "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
+        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
+        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
         "type": "github"
       },
       "original": {
@@ -547,11 +427,11 @@
       },
       "locked": {
         "dir": "nix",
-        "lastModified": 1726080562,
+        "lastModified": 1724217668,
-        "narHash": "sha256-Inh/OXdaw5tG/GrVjjhVELtSTZFPGLG3UcN/J5oFWy8=",
+        "narHash": "sha256-cqeOaZkDdcttgWjlokEXYyokBm3guoOGQUC1lvOurO0=",
         "owner": "kmonad",
         "repo": "kmonad",
-        "rev": "4e17fc4432dad3664d39274e4e698c7a5497216d",
+        "rev": "4c324f1631b3b2f7e17e804b0ed3ac314e57bcb8",
         "type": "github"
       },
       "original": {
@@ -564,7 +444,7 @@
     "landingpage": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1709213960,
@@ -580,44 +460,21 @@
         "type": "github"
       }
     },
-    "nix-topology": {
-      "inputs": {
-        "devshell": "devshell",
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "pre-commit-hooks": "pre-commit-hooks"
-      },
-      "locked": {
-        "lastModified": 1725483443,
-        "narHash": "sha256-WzOlGMKV/51Fccn/OMHcm5yrqgbOJZrJIy1ya4pW0u8=",
-        "owner": "oddlama",
-        "repo": "nix-topology",
-        "rev": "8738d94670265beb166954c4e3a26e432f79f68c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oddlama",
-        "repo": "nix-topology",
-        "type": "github"
-      }
-    },
     "nixos-anywhere": {
       "inputs": {
         "disko": "disko_2",
         "flake-parts": "flake-parts_3",
         "nixos-images": "nixos-images_2",
         "nixos-stable": "nixos-stable",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1726219387,
+        "lastModified": 1722000256,
-        "narHash": "sha256-fACBWdZsLcFrrLsP7M//qIyIgecWEn3W8btu3WiGShE=",
+        "narHash": "sha256-urCCUTXgkHPh9eN3JAKAa8f09nltFxtAQaLyHbOOKxw=",
         "owner": "nix-community",
         "repo": "nixos-anywhere",
-        "rev": "00a41d52a37f3d3e15d45715a1f5fded0e966e6b",
+        "rev": "1933f2e7e2395ee88b15d3a411a363775e83274d",
         "type": "github"
       },
       "original": {
@@ -626,29 +483,13 @@
         "type": "github"
       }
     },
-    "nixos-facter-modules": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1725379040,
-        "narHash": "sha256-yJIy595vpcdAYznxamszZhteQCIZM3OJUOIKeU4cIq4=",
-        "owner": "numtide",
-        "repo": "nixos-facter-modules",
-        "rev": "a389bf16ed7db1f7e6a5e9dc4b5547e927498803",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nixos-facter-modules",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1725885300,
+        "lastModified": 1724067415,
-        "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
+        "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
+        "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
         "type": "github"
       },
       "original": {
@@ -668,11 +509,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725726968,
+        "lastModified": 1724028934,
-        "narHash": "sha256-sqkJZDj4NjPFhWCDoSyXJoBRfRfXIyvhfssGqLvzgW8=",
+        "narHash": "sha256-2M5dqS7UbAKfrO+1U+P/t5S2QIGbuGIsTNMYJzwB17g=",
         "owner": "nix-community",
         "repo": "nixos-images",
-        "rev": "51c98a9f328e7aad81d8aa048f38e4e5c86d3389",
+        "rev": "b733f0680a42cc01d6ad53896fb5ca40a66d5e79",
         "type": "github"
       },
       "original": {
@@ -772,11 +613,11 @@
     },
     "nixpkgs-legacy_2405": {
       "locked": {
-        "lastModified": 1726320982,
+        "lastModified": 1724242322,
-        "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
+        "narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
+        "rev": "224042e9a3039291f22f4f2ded12af95a616cca0",
         "type": "github"
       },
       "original": {
@@ -798,41 +639,13 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
       }
     },
-    "nixpkgs-lib_2": {
-      "locked": {
-        "lastModified": 1722555339,
-        "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1710695816,
-        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable-small": {
       "locked": {
-        "lastModified": 1726346340,
+        "lastModified": 1724306539,
-        "narHash": "sha256-S15Ylznn8MBWIooDT65Z7E3h9N7XpB5VMx7ZdHZ/JGA=",
+        "narHash": "sha256-9jF5qr44cnvWoXhE0cr114GHT5Adav3q/DKJ6n9tor8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c60562f3643f6c1604cba0c7177834266bd35af9",
+        "rev": "6c31eb9b990446880000e3297f69f4fdee5b69d7",
         "type": "github"
       },
       "original": {
@@ -843,6 +656,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1645527175,
         "narHash": "sha256-WeewqaO48sCctiN+iwgZZEJRU29Si7vHHoLCINAvuk8=",
@@ -857,7 +686,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1717926692,
         "narHash": "sha256-THcv8qDqobZefHHluPjx/8n+MtVVb8ag/oJbKMqKNRo=",
@@ -873,13 +702,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
-        "lastModified": 1726062873,
+        "lastModified": 1724224976,
-        "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
+        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
+        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
         "type": "github"
       },
       "original": {
@@ -889,7 +718,23 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1701263465,
+        "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1632855891,
         "narHash": "sha256-crW76mt9/kbUBiKy/KiSnsQ9JEYgD3StDuYAMVkTbM0=",
@@ -903,13 +748,13 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_8": {
       "locked": {
-        "lastModified": 1726033636,
+        "lastModified": 1724265050,
-        "narHash": "sha256-U5BSY461QUg9x0fatmPSczjVpszOJTdJWQVmFTxt9LU=",
+        "narHash": "sha256-RbWuBZn2QYNRPgfrQLtj7/AMEXOmlLT+kduufdmcRP8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "62f0186c41a3f1398e3e025f7dc0ccc603482d5a",
+        "rev": "e590723c5186bdad64e3cdaf9ed72cb984caa48e",
         "type": "github"
       },
       "original": {
@@ -919,6 +764,43 @@
         "type": "github"
       }
     },
+    "overviewer": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_6",
+        "pandoc_template": "pandoc_template"
+      },
+      "locked": {
+        "lastModified": 1701775518,
+        "narHash": "sha256-qJ+lyo5/FY35bddRd26y/bpKzRd99lvUeX88iY2VctQ=",
+        "ref": "main",
+        "rev": "13176fcd5b4689d1b15f1f9d19e946fff45dc3c3",
+        "revCount": 28,
+        "type": "git",
+        "url": "ssh://forgejo@git.ingolf-wagner.de/palo/overviewer.git"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "ssh://forgejo@git.ingolf-wagner.de/palo/overviewer.git"
+      }
+    },
+    "pandoc_template": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1597233765,
+        "narHash": "sha256-ixEY21akLEjvSmOaH3z+K73jHqOMtijaOxesw1DKseA=",
+        "owner": "tajmone",
+        "repo": "pandoc-goodies",
+        "rev": "c7963da8590c2815d733ddf194d82d950ba94648",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tajmone",
+        "repo": "pandoc-goodies",
+        "type": "github"
+      }
+    },
     "permown": {
       "inputs": {
         "nixpkgs": [
@@ -941,8 +823,8 @@
     },
     "polygon-art": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1688766095,
@@ -958,64 +840,29 @@
         "url": "https://git.ingolf-wagner.de/palo/polygon-art.git"
       }
     },
-    "pre-commit-hooks": {
+    "private_assets": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": [
-          "nix-topology",
-          "flake-utils"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nix-topology",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
       "locked": {
-        "lastModified": 1714478972,
+        "lastModified": 1723916901,
-        "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
+        "narHash": "sha256-/1i1OTqP8Q7DmNqvwyAmKvxxzYr9qiniNM790lKOl4c=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "2849da033884f54822af194400f8dff435ada242",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
-    "private-parts": {
-      "inputs": {
-        "flake-parts": "flake-parts_4",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix_3"
-      },
-      "locked": {
-        "lastModified": 1726350656,
-        "narHash": "sha256-mdjvgRc1kfbQ1Z7Nscf6bOBK7LvIMI7sWGx78uqmuNs=",
         "ref": "main",
-        "rev": "5f550dbeaca257ab021315bba36cabd29120d20f",
+        "rev": "e7a82f91a7347be4cbc786a22450a78bc11c71ce",
-        "revCount": 78,
+        "revCount": 67,
         "type": "git",
-        "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git"
+        "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git"
       },
       "original": {
         "ref": "main",
         "type": "git",
-        "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git"
+        "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git"
       }
     },
     "retiolum": {
       "locked": {
-        "lastModified": 1725753611,
+        "lastModified": 1723579214,
-        "narHash": "sha256-sxA8nkZBT0MfbneBEuIfdDCFVNig9b5Nu3cTM0Bo59k=",
+        "narHash": "sha256-YKzjA2J1io2FR6Y1ZS98jKDLnxWKnJXq4ITto93e5Zg=",
         "owner": "Mic92",
         "repo": "retiolum",
-        "rev": "4a766277e2bedb94df583f3236147f51edf84e65",
+        "rev": "be646cb8778ad3dd11a5f9227bc3b8ae4338d46f",
         "type": "github"
       },
       "original": {
@@ -1033,22 +880,21 @@
         "home-manager-utils": "home-manager-utils",
         "kmonad": "kmonad",
         "landingpage": "landingpage",
-        "nix-topology": "nix-topology",
         "nixos-anywhere": "nixos-anywhere",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-legacy_2211": "nixpkgs-legacy_2211",
         "nixpkgs-legacy_2311": "nixpkgs-legacy_2311",
         "nixpkgs-legacy_2405": "nixpkgs-legacy_2405",
         "nixpkgs-unstable-small": "nixpkgs-unstable-small",
+        "overviewer": "overviewer",
         "permown": "permown",
         "polygon-art": "polygon-art",
-        "private-parts": "private-parts",
+        "private_assets": "private_assets",
         "retiolum": "retiolum",
         "srvos": "srvos",
         "stylix": "stylix",
-        "taskshell": "taskshell",
+        "taskshell": "taskshell"
-        "treefmt-nix": "treefmt-nix_4"
       }
     },
     "sops-nix": {
@@ -1062,11 +908,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725765163,
+        "lastModified": 1723501126,
-        "narHash": "sha256-rfd2c47iVSFI6bRYy5l8wRijRBaYDeU7dM8XCDUGqlA=",
+        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "b68757cd2c3fa66d6ccaa0d046ce42a9324e0070",
+        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
         "type": "github"
       },
       "original": {
@@ -1077,14 +923,14 @@
     },
     "srvos": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
-        "lastModified": 1726102228,
+        "lastModified": 1724287640,
-        "narHash": "sha256-9WRTBxEq2P1lqFGXcVAlXx5Eh95rmvHM6/x13fVcUAY=",
+        "narHash": "sha256-MAjp8fUU6/WambitI/jOVxgjuH3YEfE6A8l4EtonktY=",
         "owner": "nix-community",
         "repo": "srvos",
-        "rev": "b9fae7b4351851d050333df6cef1b02b01b2ca2d",
+        "rev": "9810f43ff22a10b6f70c38d6085ac6c201b26640",
         "type": "github"
       },
       "original": {
@@ -1102,23 +948,21 @@
         "base16-kitty": "base16-kitty",
         "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_5",
         "gnome-shell": "gnome-shell",
         "home-manager": [
           "home-manager"
         ],
         "nixpkgs": [
           "nixpkgs"
-        ],
+        ]
-        "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1726170940,
+        "lastModified": 1724260414,
-        "narHash": "sha256-sobkRkGBaMX9pD0bwU1iVPWi0WtQvZqlHyl1YtvNDio=",
+        "narHash": "sha256-EP1yFDEm/f7+j+fE3TI7KZb5xJH6KNMtmlZciktC71c=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "35233f929629c8eb64e939e35260fc8347f94df9",
+        "rev": "c5f8f06543b70248a076f888177c7362a24d5dcc",
         "type": "github"
       },
       "original": {
@@ -1172,39 +1016,9 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "taskshell": {
       "inputs": {
-        "flake-utils": "flake-utils_6",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1231,11 +1045,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725271838,
+        "lastModified": 1723808491,
-        "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
+        "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
+        "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
         "type": "github"
       },
       "original": {
@@ -1264,47 +1078,6 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
-    },
-    "treefmt-nix_3": {
-      "inputs": {
-        "nixpkgs": [
-          "private-parts",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1724833132,
-        "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_4": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1725271838,
-        "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -1,46 +1,80 @@
 {
-
-  # "git+file:///<full-path>" for fixing an input
   inputs = {
 
-    clan-core.inputs.flake-parts.follows = "flake-parts";
-    clan-core.inputs.nixpkgs.follows = "nixpkgs";
-    clan-core.url = "git+https://git.clan.lol/clan/clan-core";
-    clan-fact-generators.inputs.clan-core.follows = "clan-core";
-    clan-fact-generators.url = "github:mrvandalo/clan-fact-generators";
-    flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
     flake-parts.url = "github:hercules-ci/flake-parts";
-    home-manager-utils.inputs.home-manager.follows = "home-manager";
+    flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
-    home-manager-utils.url = "github:mrvandalo/home-manager-utils";
+
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    clan-fact-generators = {
-    home-manager.url = "github:nix-community/home-manager";
+      url = "github:mrvandalo/clan-fact-generators";
-    kmonad.inputs.nixpkgs.follows = "nixpkgs"; # fixme: kmonad crashes every now and than and the keyboard is not usable anymore.
+      inputs.clan-core.follows = "clan-core";
-    kmonad.url = "github:kmonad/kmonad?dir=nix"; # todo: mabye use https://github.com/jtroo/kanata instead
+    };
-    landingpage.url = "github:mrVanDalo/landingpage";
+
-    nixos-anywhere.url = "github:nix-community/nixos-anywhere";
+    clan-core = {
-    nix-topology.inputs.nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.clan.lol/clan/clan-core";
-    nix-topology.url = "github:oddlama/nix-topology";
+      #url = "git+file:///home/palo/dev/clan-core";
-    nixos-hardware.url = "github:nixos/nixos-hardware";
+      inputs.nixpkgs.follows = "nixpkgs"; # Needed if your configuration uses nixpkgs unstable.
+      inputs.flake-parts.follows = "flake-parts";
+    };
+
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
     nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11";
     nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11";
     nixpkgs-legacy_2405.url = "github:nixos/nixpkgs/nixos-24.05";
-    nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
+    nixos-hardware.url = "github:nixos/nixos-hardware";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixos-anywhere.url = "github:nix-community/nixos-anywhere";
-    permown.inputs.nixpkgs.follows = "nixpkgs";
+
-    permown.url = "github:mrVanDalo/module.permown";
+    home-manager = {
-    polygon-art.url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
+      #url = "github:nix-community/home-manager/release-23.11";
-    private-parts.inputs.nixpkgs.follows = "nixpkgs"; # only private input
+      url = "github:nix-community/home-manager";
-    private-parts.url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git?ref=main";
+      #inputs.nixpkgs.follows = "nixpkgs";
-    #private-parts.url = "git+file:///home/palo/dev/nixos/nixos-private-parts";
+    };
-    retiolum.url = "github:Mic92/retiolum";
+
+    polygon-art = {
+      url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
+    };
+
+    home-manager-utils = {
+      url = "github:mrvandalo/home-manager-utils";
+      inputs.home-manager.follows = "home-manager";
+    };
+
+    permown = {
+      url = "github:mrVanDalo/module.permown";
+      #url = "git+file:///home/palo/dev/nixos/permown";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    private_assets = {
+      #url = "git+file:///home/palo/dev/nixos/nixos-private-assets";
+      url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main";
+      flake = true;
+    };
+
+    retiolum = {
+      url = "github:Mic92/retiolum";
+      #url = "git+file:///home/palo/dev/nixos/retiolum";
+    };
+
     srvos.url = "github:nix-community/srvos";
-    stylix.inputs.home-manager.follows = "home-manager";
+
-    stylix.inputs.nixpkgs.follows = "nixpkgs";
+    landingpage = {
-    stylix.url = "github:danth/stylix";
+      #url = "git+file:///home/palo/dev/landingpage";
-    taskshell.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:mrVanDalo/landingpage";
-    taskshell.url = "github:mrvandalo/taskshell";
+    };
-    treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
+
-    treefmt-nix.url = "github:numtide/treefmt-nix";
+    # todo: mabye use https://github.com/jtroo/kanata instead
+    # fixme: kmonad crashes every now and than and the keyboard is not usable anymore.
+    kmonad = {
+      url = "github:kmonad/kmonad?dir=nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    stylix = {
+      url = "github:danth/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
 
     # smoke test framwork to trigger tests (enable if I  want to use it for real)
     #smoke = {
@@ -48,172 +82,152 @@
     #  inputs.nixpkgs.follows = "nixpkgs";
     #};
 
+    # had to override it to  remove colors
+    taskshell = {
+      url = "github:mrvandalo/taskshell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # my  own tool
+    overviewer.url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/overviewer.git?ref=main";
   };
 
   outputs =
-    inputs@{
+    inputs@{ self
-      self,
+    , clan-core
-      clan-core,
+    , clan-fact-generators
-      clan-fact-generators,
+    , flake-parts
-      flake-parts,
+    , home-manager
-      home-manager,
+    , home-manager-utils
-      home-manager-utils,
+    , kmonad
-      kmonad,
+    , landingpage
-      landingpage,
+    , nixos-anywhere
-      nixos-anywhere,
+    , nixos-hardware
-      nixos-hardware,
+    , nixpkgs
-      nixpkgs,
+    , nixpkgs-legacy_2211
-      nixpkgs-legacy_2211,
+    , nixpkgs-legacy_2311
-      nixpkgs-legacy_2311,
+    , nixpkgs-legacy_2405
-      nixpkgs-legacy_2405,
+    , nixpkgs-unstable-small
-      nixpkgs-unstable-small,
+    , overviewer
-      permown,
+    , permown
-      polygon-art,
+    , polygon-art
-      private-parts,
+    , private_assets
-      retiolum,
+    , retiolum
-      srvos,
+    , srvos
-      stylix,
+    , stylix
-      taskshell,
+    , taskshell
-      treefmt-nix,
-      nix-topology,
     }:
 
     let
+      #system = "x86_64-linux";
+
+      #pkgs = nixpkgs.legacyPackages.${system};
       inherit (nixpkgs) lib;
 
       meta = rec {
         system = "x86_64-linux";
-        pkgs =
+        pkgs = import nixpkgs {
-          let
+          inherit system;
-            allowUnfree = true;
+          config.allowUnfree = true;
-            permittedInsecurePackages = [
+          config.permittedInsecurePackages = [
-              "electron-24.8.6" # for bitwarden
+            "electron-24.8.6" # for bitwarden
-              "python-2.7.18.6"
+            "python-2.7.18.6"
-              "python-2.7.18.7"
+            "python-2.7.18.7"
-              "python-2.7.18.8"
+            "python-2.7.18.8"
-              "electron-27.3.11" # for logseq
+            "electron-27.3.11" # for logseq
-              "electron-28.3.3" # for logseq
+            "electron-28.3.3" # for logseq
-            ];
+          ];
-          in
+          overlays = [
-          import nixpkgs {
+            (_self: _super: {
-            inherit system;
+              unstable-small = import nixpkgs-unstable-small {
-            config = {
+                inherit system;
-              inherit allowUnfree permittedInsecurePackages;
+                config.allowUnfree = true;
-            };
+              };
-            overlays = [
+              legacy_2211 = import nixpkgs-legacy_2211 {
-              (_self: _super: {
+                inherit system;
-                unstable-small = import nixpkgs-unstable-small {
+                config.allowUnfree = true;
-                  inherit system;
+              };
-                  config = {
+              legacy_2311 = import nixpkgs-legacy_2311 {
-                    inherit allowUnfree permittedInsecurePackages;
+                inherit system;
-                  };
+                config.allowUnfree = true;
-                };
+              };
-                legacy_2211 = import nixpkgs-legacy_2211 {
+              legacy_2405 = import nixpkgs-legacy_2405 {
-                  inherit system;
+                inherit system;
-                  config = {
+                config.allowUnfree = true;
-                    inherit allowUnfree permittedInsecurePackages;
+              };
-                  };
+              polygon-art = polygon-art.packages.${system};
-                };
+              landingpage = landingpage.packages.${system}.plain;
-                legacy_2311 = import nixpkgs-legacy_2311 {
+              kmonad = kmonad.packages.${system}.kmonad;
-                  inherit system;
+              tasksh = taskshell.packages.${system}.tasksh;
-                  config = {
+              overviewer = overviewer.packages.${system}.overviewer;
-                    inherit allowUnfree permittedInsecurePackages;
+              pkl = self.packages.${system}.pkl;
-                  };
+            })
-                };
+            (import ./pkgs)
-                legacy_2405 = import nixpkgs-legacy_2405 {
+          ];
-                  inherit system;
+        };
-                  config = {
-                    inherit allowUnfree permittedInsecurePackages;
-                  };
-                };
-                polygon-art = polygon-art.packages.${system};
-                landingpage = landingpage.packages.${system}.plain;
-                kmonad = kmonad.packages.${system}.kmonad;
-                tasksh = taskshell.packages.${system}.tasksh;
-                inherit (self.packages.${system})
-                  otpmenu
-                  taskwarrior-hooks
-                  nsxiv
-                  bugwarrior
-                  ;
-              })
-            ];
-          };
         specialArgs = {
-          inherit inputs;
+          inherit private_assets inputs;
           assets = ./assets;
           factsGenerator = clan-fact-generators.lib { inherit pkgs; };
-          clanLib = import ./lib/clanlib.nix {
+          clanLib = import ./lib/clanlib.nix { inherit (pkgs) lib; machineDir = ./machines; };
-            inherit (pkgs) lib;
+          zerotierDeviceName = "ztbn67ogn2";
-            machineDir = ./machines;
-          };
-          # https://git.clan.lol/clan/clan-core/issues/1575 < here is how I could do this generic
-          zerotierInterface = "ztbn67ogn2";
           components = ./components;
           features = ./features;
         };
       };
 
       clanSetup =
-        {
+        { name
-          name,
+        , host
-          host,
+        , modules
-          modules,
+        }: {
-        }:
-        {
 
           clan.core.networking.targetHost = lib.mkDefault "root@${host}";
           nixpkgs.pkgs = meta.pkgs;
           nixpkgs.hostPlatform = meta.system;
           clan.core.facts.secretStore = "password-store";
 
-          imports =
+          imports = modules ++ defaultModules ++ [
-            modules
+            ./machines/${name}/configuration.nix
-            ++ defaultModules
-            ++ [
-              ./machines/${name}/configuration.nix
-              nix-topology.nixosModules.default
-              self.nixosModules.verify
-            ];
-        };
-
-      zerotierControllerModule = {
-        clan.core.networking.zerotier.controller = {
-          enable = true;
-          public = false;
-        };
-      };
-
-      zerotierModules =
-        { pkgs, ... }:
-        {
-          imports = [
-
-            # this magically adds all my machines in the zero tier network
-            # and makes the controller accept them.
-            # will automatic look into `/machines/<name>/facts/zerotier-ip
-            inputs.clan-core.clanModules.zerotier-static-peers
-
-            # Statically configure the host names of machines based on their respective zerotier-ip.
-            inputs.clan-core.clanModules.static-hosts
-
-            # generate ssh host keys with facts
-            inputs.clan-core.clanModules.sshd
-
-            # manual configs
-            {
-              clan.static-hosts.topLevelDomain = "bear";
-              components.network.zerotier.enable = true;
-              environment.systemPackages = [
-                clan-core.packages.${pkgs.system}.clan-cli
-                (pkgs.writers.writeBashBin "zerotier-script-nodeid" ''
-                  sudo ${pkgs.zerotierone}/bin/zerotier-cli info | cut -d " " -f 3
-                '')
-              ];
-            }
           ];
         };
 
+      zerotierControllerModule =
+        {
+          clan.core.networking.zerotier.controller = {
+            enable = true;
+            public = false;
+          };
+        };
+
+      zerotierModules = { pkgs, ... }: {
+        imports = [
+
+          # this magically adds all my machines in the zero tier network
+          # and makes the controller accept them.
+          # will automatic look into `/machines/<name>/facts/zerotier-ip
+          inputs.clan-core.clanModules.zerotier-static-peers
+
+          # Statically configure the host names of machines based on their respective zerotier-ip.
+          inputs.clan-core.clanModules.static-hosts
+
+          # generate ssh host keys with facts
+          inputs.clan-core.clanModules.sshd
+
+          # manual configs
+          {
+            clan.static-hosts.topLevelDomain = "bear";
+            components.network.zerotier.enable = true;
+            environment.systemPackages = [
+              clan-core.packages.${pkgs.system}.clan-cli
+              (pkgs.writers.writeBashBin "zerotier-script-nodeid" ''
+                sudo ${pkgs.zerotierone}/bin/zerotier-cli info | cut -d " " -f 3
+              '')
+            ];
+          }
+        ];
+      };
+
       defaultModules = [
         # make flake inputs accessiable in NixOS
         {
@@ -221,18 +235,15 @@
           _module.args.inputs = self.inputs;
         }
         # ssh keys
-        (
+        ({ config, ... }: {
-          { config, ... }:
+          users.users.root.openssh.authorizedKeys.keyFiles = [
-          {
+            # master key
-            users.users.root.openssh.authorizedKeys.keyFiles = [
+            ./assets/mrvandalo_rsa.pub
-              # master key
+            # backup key
-              ./assets/mrvandalo_rsa.pub
+            "${config.clan.core.clanDir}/machines/chungus/facts/ssh.syncoid.id_ed25519.pub"
-              # backup key
+            "${config.clan.core.clanDir}/machines/chungus/facts/ssh.rbackup.id_ed25519.pub"
-              "${config.clan.core.clanDir}/machines/chungus/facts/ssh.syncoid.id_ed25519.pub"
+          ];
-              "${config.clan.core.clanDir}/machines/chungus/facts/ssh.rbackup.id_ed25519.pub"
+        })
-            ];
-          }
-        )
         {
           # disable emergency mode everywhere, although it might be needed on laptops
           boot.initrd.systemd.emergencyAccess = false;
@@ -243,20 +254,11 @@
           systemd.enableEmergencyMode = false;
         }
         # configure nix
-        (
+        ({ pkgs, lib, clanLib, ... }:
-          {
-            pkgs,
-            lib,
-            clanLib,
-            ...
-          }:
           {
             nix.settings.substituters = [ "http://cache.orbi.wg0" ];
             nix.settings.trusted-public-keys = [ (clanLib.readFact "nix-serve.pub" "orbi") ];
-            nix.settings.experimental-features = [
+            nix.settings.experimental-features = [ "nix-command" "flakes" ];
-              "nix-command"
-              "flakes"
-            ];
             nix.settings.max-jobs = 1;
             # no channesl needed this way
             nix.nixPath = [ "nixpkgs=${pkgs.path}" ];
@@ -271,9 +273,6 @@
               ./features
               #./modules
               inputs.clan-core.nixosModules.clanCore
-              {
-                clan.core.clanDir = ./.; # fixes issues with clanCore https://git.clan.lol/clan/clan-core/issues/1979
-              }
               # inputs.stylix.nixosModules.stylix # fixme: not working
               permown.nixosModules.permown
               kmonad.nixosModules.default
@@ -284,8 +283,7 @@
             boot.loader.systemd-boot.configurationLimit = lib.mkDefault 10;
             boot.loader.generic-extlinux-compatible.configurationLimit = lib.mkDefault 10;
             boot.loader.grub.configurationLimit = lib.mkDefault 10;
-          }
+          })
-        )
         # My Structure
         ./components
         ./features
@@ -296,228 +294,237 @@
         permown.nixosModules.permown
         kmonad.nixosModules.default
         # some default things I always want
-        (
+        ({ pkgs, ... }: {
-          { pkgs, ... }:
+          boot.tmp.useTmpfs = lib.mkDefault true;
-          {
+          environment.systemPackages = [
-            boot.tmp.useTmpfs = lib.mkDefault true;
+            pkgs.nixpkgs-fmt
-          }
+          ];
-        )
+        })
       ];
 
-      stylixModules =
+      stylixModules = { pkgs, config, ... }: {
-        {
+        imports = [ stylix.nixosModules.stylix ];
-          pkgs,
+        stylix.enable = true;
-          config,
+        stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
-          lib,
+        stylix.image = ./assets/wallpaper.png;
-          ...
+        stylix.fonts = {
-        }:
+          serif = {
-        {
+            package = pkgs.nerdfonts.override { fonts = [ "Ubuntu" ]; };
-          imports = [ stylix.nixosModules.stylix ];
+            name = "Ubuntu";
-          stylix.enable = true;
-          stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
-          stylix.image = ./assets/wallpaper.png;
-
-          home-manager.sharedModules = [
-            {
-              # no need for hyperland
-              # https://github.com/danth/stylix/issues/543
-              stylix.targets.hyprpaper.enable = lib.mkForce false;
-              stylix.targets.hyprland.enable = lib.mkForce false;
-            }
-          ];
-          stylix.fonts = {
-            serif = {
-              package = pkgs.nerdfonts.override { fonts = [ "Ubuntu" ]; };
-              name = "Ubuntu";
-            };
-            sansSerif = {
-              package = pkgs.nerdfonts.override { fonts = [ "Ubuntu" ]; };
-              name = "Ubuntu";
-            };
-            monospace = {
-              package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
-              name = "JetBrains Mono";
-            };
-            emoji = {
-              package = pkgs.noto-fonts-emoji;
-              name = "Noto Color Emoji";
-            };
-            sizes.popups = 15;
           };
-        };
+          sansSerif = {
-
+            package = pkgs.nerdfonts.override { fonts = [ "Ubuntu" ]; };
-      homeManagerModules =
+            name = "Ubuntu";
-        { pkgs, config, ... }:
-        {
-          imports = [
-            home-manager.nixosModules.home-manager
-          ];
-          home-manager.extraSpecialArgs = {
-            assets = ./assets;
           };
-          home-manager.useGlobalPkgs = true;
+          monospace = {
-          home-manager.useUserPackages = true;
+            package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
-          home-manager.backupFileExtension = "backup";
+            name = "JetBrains Mono";
-          home-manager.sharedModules = [
+          };
-            home-manager-utils.hmModule
+          emoji = {
-          ];
+            package = pkgs.noto-fonts-emoji;
+            name = "Noto Color Emoji";
+          };
+          sizes.popups = 15;
         };
+      };
+
+      homeManagerModules = { pkgs, config, ... }: {
+        imports = [
+          home-manager.nixosModules.home-manager
+        ];
+        home-manager.extraSpecialArgs = {
+          inherit private_assets;
+          assets = ./assets;
+        };
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.backupFileExtension = "backup";
+        home-manager.sharedModules = [
+          home-manager-utils.hmModule
+        ];
+      };
 
     in
 
-    flake-parts.lib.mkFlake { inherit inputs; } (
+    flake-parts.lib.mkFlake { inherit inputs; } ({ self, pkgs, ... }: {
-      {
+      # We define our own systems below. you can still use this to add system specific outputs to your flake.
-        self,
+      # See: https://flake.parts/getting-started
-        self',
+      systems = [ "x86_64-linux" ];
-        pkgs,
-        ...
-      }:
-      {
-        systems = [ "x86_64-linux" ];
-        imports = [
-          clan-core.flakeModules.default
-          ./nix/formatter.nix
-          ./nix/packages
-          ./nix/verify
-          ./nix/topology
-        ];
 
-        # Define your clan
+      # import clan-core modules
-        clan = {
+      imports = [
-          # Clan wide settings.
+        clan-core.flakeModules.default
-          meta.name = "gummybears"; # Ensure to choose a unique name.
+      ];
-          specialArgs = meta.specialArgs;
 
-          machines = {
+      perSystem = { pkgs, ... }: {
+        packages.pkl = pkgs.callPackage ./pkgs/pkl { };
+      };
 
-            cream = clanSetup {
+      # Define your clan
-              name = "cream";
+      clan = {
-              host = "cream.bear";
+        # Clan wide settings.
-              modules = [
+        meta.name = "gummybears"; # Ensure to choose a unique name.
-                zerotierModules
+        specialArgs = meta.specialArgs;
-                nixos-hardware.nixosModules.framework-12th-gen-intel
-                retiolum.nixosModules.retiolum
-                private-parts.nixosModules.cream
-                homeManagerModules
-                stylixModules
-                { home-manager.users.mainUser.gui.enable = true; }
-                {
-                  home-manager.users.mainUser = import ./homes/palo;
-                  home-manager.users.root = import ./homes/root;
-                }
-                {
-                  clan.core.machineDescription = "Laptop";
-                }
-              ];
-            };
 
-            cherry = clanSetup {
+        machines = {
-              name = "cherry";
-              host = "cherry.bear";
-              modules = [
-                zerotierModules
-                nixos-hardware.nixosModules.framework-13th-gen-intel
-                retiolum.nixosModules.retiolum
-                private-parts.nixosModules.cherry
-                homeManagerModules
-                stylixModules
-                { home-manager.users.mainUser.gui.enable = true; }
-                {
-                  home-manager.users.mainUser = import ./homes/palo;
-                  home-manager.users.root = import ./homes/root;
-                }
-                {
-                  clan.core.machineDescription = "Laptop";
-                }
-              ];
-            };
 
-            chungus = clanSetup {
+          sternchen = clanSetup {
-              name = "chungus";
+            name = "sternchen";
-              host = "chungus.bear";
+            host = "sternchen.bear";
-              modules = [
+            #host = "192.168.178.25";
-                zerotierModules
+            modules = [
-                zerotierControllerModule
+              nixos-hardware.nixosModules.lenovo-thinkpad-x220
-                homeManagerModules
+              homeManagerModules
-                stylixModules
+              stylixModules
-                retiolum.nixosModules.retiolum
+              { home-manager.users.mainUser.gui.enable = true; }
-                private-parts.nixosModules.chungus
+              {
-                {
+                home-manager.users.mainUser = import ./homes/tina;
-                  home-manager.users.mainUser = import ./homes/palo;
+                home-manager.users.root = import ./homes/root;
-                  home-manager.users.root = import ./homes/root;
+              }
-                }
+              # todo : strange overrides, this should be an option kinda an be changed on another level (the homes/<name> folders or something)
-                {
+              ({ lib, ... }: {
-                  clan.core.machineDescription = "Home Server";
+                home-manager.sharedModules = [
-                }
+                  {
-              ];
+                    programs.atuin.enable = lib.mkForce false;
-            };
+                  }
+                ];
+              })
+              {
+                clan.core.machineDescription = "LaLaptop";
+              }
+            ];
+          };
 
-            orbi = clanSetup {
+          cream = clanSetup {
-              name = "orbi";
+            name = "cream";
-              host = "orbi.bear";
+            host = "cream.bear";
-              #host = "95.216.66.212";
+            modules = [
-              modules = [
+              zerotierModules
-                homeManagerModules
+              nixos-hardware.nixosModules.framework-12th-gen-intel
-                stylixModules
+              retiolum.nixosModules.retiolum
-                zerotierModules
+              private_assets.nixosModules.cream
-                srvos.nixosModules.hardware-hetzner-online-intel
+              private_assets.nixosModules.yubikey
-                #srvos.nixosModules.server
+              homeManagerModules
-                #srvos.nixosModules.mixins-terminfo
+              stylixModules
-                {
+              { home-manager.users.mainUser.gui.enable = true; }
-                  home-manager.users.mainUser = import ./homes/palo;
+              {
-                  home-manager.users.root = import ./homes/root;
+                home-manager.users.mainUser = import ./homes/palo;
-                }
+                home-manager.users.root = import ./homes/root;
-                {
+              }
-                  clan.core.machineDescription = "Internet Server";
+              {
-                }
+                clan.core.machineDescription = "Laptop";
-              ];
+              }
-            };
+            ];
+          };
 
-            probe = clanSetup {
+          cherry = clanSetup {
-              name = "probe";
+            name = "cherry";
-              #host = "167.235.205.150";
+            host = "cherry.bear";
-              host = "95.217.18.54";
+            modules = [
-              modules = [
+              zerotierModules
-                homeManagerModules
+              nixos-hardware.nixosModules.framework-13th-gen-intel
-                stylixModules
+              retiolum.nixosModules.retiolum
-                srvos.nixosModules.hardware-hetzner-cloud
+              private_assets.nixosModules.yubikey
-                srvos.nixosModules.server
+              private_assets.nixosModules.cherry
-                srvos.nixosModules.mixins-terminfo
+              homeManagerModules
-                #inputs.clan-core.clanModules.sshd
+              stylixModules
-                {
+              { home-manager.users.mainUser.gui.enable = true; }
-                  home-manager.users.mainUser = import ./homes/palo;
+              {
-                  home-manager.users.root = import ./homes/root;
+                home-manager.users.mainUser = import ./homes/palo;
-                }
+                home-manager.users.root = import ./homes/root;
-                {
+              }
-                  clan.core.machineDescription = "Dummy Internet Server";
+              {
-                }
+                clan.core.machineDescription = "Laptop";
-              ];
+              }
-            };
+            ];
+          };
 
-            usbstick = clanSetup {
+          chungus = clanSetup {
-              name = "usbstick";
+            name = "chungus";
-              #host = "usbstick.bear";
+            host = "chungus.bear";
-              host = "10.100.0.100";
+            modules = [
-              modules = [
+              zerotierModules
-                homeManagerModules
+              zerotierControllerModule
-                stylixModules
+              homeManagerModules
-                zerotierModules
+              stylixModules
-                { home-manager.users.mainUser.gui.enable = true; }
+              retiolum.nixosModules.retiolum
-                {
+              private_assets.nixosModules.chungus
-                  home-manager.users.mainUser = import ./homes/palo;
+              {
-                  home-manager.users.root = import ./homes/root;
+                home-manager.users.mainUser = import ./homes/palo;
-                }
+                home-manager.users.root = import ./homes/root;
-                {
+              }
-                  clan.core.machineDescription = "USB-Stick for Backup";
+              {
-                }
+                clan.core.machineDescription = "Home Server";
-              ];
+              }
-            };
+            ];
+          };
 
+          orbi = clanSetup {
+            name = "orbi";
+            host = "orbi.bear";
+            #host = "95.216.66.212";
+            modules = [
+              homeManagerModules
+              stylixModules
+              zerotierModules
+              srvos.nixosModules.hardware-hetzner-online-intel
+              #srvos.nixosModules.server
+              #srvos.nixosModules.mixins-terminfo
+              {
+                home-manager.users.mainUser = import ./homes/palo;
+                home-manager.users.root = import ./homes/root;
+              }
+              {
+                clan.core.machineDescription = "Internet Server";
+              }
+            ];
+          };
+
+          probe = clanSetup {
+            name = "probe";
+            #host = "167.235.205.150";
+            host = "95.217.18.54";
+            modules = [
+              homeManagerModules
+              stylixModules
+              srvos.nixosModules.hardware-hetzner-cloud
+              srvos.nixosModules.server
+              srvos.nixosModules.mixins-terminfo
+              #inputs.clan-core.clanModules.sshd
+              {
+                home-manager.users.mainUser = import ./homes/palo;
+                home-manager.users.root = import ./homes/root;
+              }
+              {
+                clan.core.machineDescription = "Dummy Internet Server";
+              }
+            ];
+          };
+
+          usbstick = clanSetup {
+            name = "usbstick";
+            #host = "usbstick.bear";
+            host = "10.100.0.100";
+            modules = [
+              homeManagerModules
+              stylixModules
+              zerotierModules
+              { home-manager.users.mainUser.gui.enable = true; }
+              {
+                home-manager.users.mainUser = import ./homes/palo;
+                home-manager.users.root = import ./homes/root;
+              }
+              {
+                clan.core.machineDescription = "USB-Stick for Backup";
+              }
+            ];
           };
 
         };
 
-      }
+      };
-    );
+
+    });
 
 }
+

homes/common/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./editor.nix
-    ./network.nix
     ./oh-my-posh
     ./packages.nix
     ./terminal.nix

homes/common/network.nix

@@ -1,34 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib;
-{
-  config = mkMerge [
-    {
-      home.packages = [
-        # firewall analysis
-        pkgs.nftables
-        pkgs.nixos-firewall-tool
-
-        # analyser
-        pkgs.dnsutils
-        pkgs.tcpdump
-        pkgs.nmap
-        pkgs.rustscan
-
-        # helper
-        pkgs.ipcalc
-      ];
-
-    }
-
-    (mkIf config.gui.enable {
-      home.packages = [
-        pkgs.wireshark
-      ];
-    })
-  ];
-}

homes/common/oh-my-posh/default.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, config, lib, ... }:
-  pkgs,
-  config,
-  lib,
-  ...
-}:
 with lib;
 {
   programs.oh-my-posh = {

homes/common/oh-my-posh/gmay.json

@@ -12,20 +12,11 @@
           "template": " {{ if .WSL }}WSL at {{ end }}{{.Icon}} ",
           "type": "os"
         },
-        {
-          "background": "#AF3A03",
-          "foreground": "#EBDBB2",
-          "powerline_symbol": "\ue0b0",
-          "style": "powerline",
-          "template": " \uf0e7 ",
-          "type": "root"
-        },
         {
           "background": "#076678",
           "foreground": "#EBDBB2",
-          "powerline_symbol": "\ue0b0",
           "style": "powerline",
-          "template": " {{ if .SSHSession }}\ueba9 {{ end }}{{ .UserName }}@{{ .HostName }} ",
+          "template": " {{ .UserName }}@{{ .HostName }} ",
           "type": "session"
         },
         {
@@ -51,44 +42,28 @@
           "type": "time"
         },
         {
-          "type": "project",
+          "background": "#8F3F71",
+          "foreground": "#EBDBB2",
+          "powerline_symbol": "\ue0b0",
+          "properties": {
+            "fetch_stash_count": true,
+            "fetch_upstream_icon": true
+          },
           "style": "powerline",
-          "powerline_symbol": "",
+          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \ueb4b {{ .StashCount }}{{ end }} ",
-          "foreground": "#193549",
+          "type": "git"
-          "background": "#ffeb3b",
-          "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ if .Version }} {{.Version}}{{ end }} {{ if .Name }}{{ .Name }}{{ end }}{{ end }} "
         },
         {
-          "type": "git",
+          "background": "#9D0006",
-          "style": "powerline",
-          "powerline_symbol": "",
-          "background": "#427b58",
           "foreground": "#EBDBB2",
-          "background_templates": [
+          "powerline_symbol": "\ue0b0",
-            "{{ if or (.Working.Changed) (.Staging.Changed) }}#8f3f71{{ end }}",
+          "style": "powerline",
-            "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#076678{{ end }}",
+          "template": " \uf0e7 ",
-            "{{ if gt .Ahead 0 }}#076678{{ end }}",
+          "type": "root"
-            "{{ if gt .Behind 0 }}#076678{{ end }}"
-          ],
-          "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }}",
-          "properties": {
-            "fetch_status": true,
-            "fetch_upstream_icon": true,
-            "untracked_modes": {
-              "/Users/user/Projects/oh-my-posh/": "no"
-            },
-            "source": "cli",
-            "mapped_branches": {
-              "feat/*": "🚀 ",
-              "bug/*": "🐛 "
-            }
-          }
         },
         {
           "background": "#427B58",
-          "background_templates": [
+          "background_templates": ["{{ if gt .Code 0 }}#9D0006{{ end }}"],
-            "{{ if gt .Code 0 }}#9D0006{{ end }}"
-          ],
           "foreground": "#EBDBB2",
           "leading_diamond": "<transparent,background>\ue0b0</>",
           "properties": {

homes/common/oh-my-posh/gruvbox.json

@@ -13,13 +13,9 @@
         },
         {
           "background": "#fbf1c7",
-          "background_templates": [
+          "background_templates": ["{{ if .Root }}#af3a03{{ end }}"],
-            "{{ if .Root }}#af3a03{{ end }}"
-          ],
           "foreground": "#282828",
-          "foreground_templates": [
+          "foreground_templates": ["{{ if .Root }}#fbf1c7{{ end }}"],
-            "{{ if .Root }}#fbf1c7{{ end }}"
-          ],
           "powerline_symbol": "\ue0b0",
           "style": "powerline",
           "template": " {{ if .SSHSession }} {{ end }}{{ .HostName }} ",

homes/common/packages.nix

@@ -1,16 +1,14 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with pkgs;
 with lib;
 {
   config = mkMerge [
     {
       home.packages = [
+        bind.dnsutils
+        nmap
         hexyl
+        ipcalc
 
         units
         difftastic
@@ -43,6 +41,7 @@ with lib;
 
     }
 
+
     (mkIf config.gui.enable {
       home.packages = [
         libreoffice
@@ -55,7 +54,7 @@ with lib;
         aspellDicts.es
 
         evince
-        nsxiv
+        sxiv
         gimp
         inkscape
 

homes/common/terminal.nix

@@ -1,9 +1,4 @@
-{
+{ lib, pkgs, assets, ... }:
-  lib,
-  pkgs,
-  assets,
-  ...
-}:
 {
 
   programs.zsh = {

homes/common/zfs.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with pkgs;
 with lib;
 {

homes/palo/default.nix

@@ -1,11 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-{
 
   imports = [
     ../common
     ./git.nix
     ./gpg.nix
     ./gui
+    #./hyperland.nix
     ./i3.nix
     ./packages
     ./ssh.nix

homes/palo/doom-emacs.nix

@@ -0,0 +1,35 @@
+{ config, pkgs, lib, ... }:
+with lib;
+{
+  config = mkMerge [
+    {
+      home.packages = [ pkgs.ripgrep ];
+    }
+    (mkIf config.gui.enable {
+      programs.doom-emacs = {
+        enable = lib.mkDefault true;
+        doomPrivateDir = ./doom.d;
+        extraConfig = ''
+          ;; "monospace" means use the system default. However, the default is usually two
+          ;; points larger than I'd like, so I specify size 12 here.
+          (setq doom-font
+            (font-spec :family "Jetbrains Mono" :size ${toString 12} :weight 'light))
+          ;;(setq doom-font
+          ;; (font-spec :family "Terminus" :size ${toString 12} :weight 'light))
+        '';
+        #emacsPackagesOverlay = self: super: {
+        #  # fixes https://github.com/vlaci/nix-doom-emacs/issues/394
+        #  gitignore-mode = pkgs.emacsPackages.git-modes;
+        #  gitconfig-mode = pkgs.emacsPackages.git-modes;
+        #};
+      };
+    })
+    (mkIf (!config.gui.enable) {
+      programs.doom-emacs = {
+        enable = lib.mkDefault true;
+        doomPrivateDir = ./doom.d;
+        package = pkgs.emacs-nox;
+      };
+    })
+  ];
+}

homes/palo/doom.d/config.el

@@ -0,0 +1,4 @@
+;; configure theme
+(setq doom-theme 'doom-solarized-light)
+
+

homes/palo/doom.d/init.el

@@ -0,0 +1,187 @@
+;;; init.el -*- lexical-binding: t; -*-
+
+;; This file controls what Doom modules are enabled and what order they load
+;; in. Remember to run 'doom sync' after modifying it!
+
+;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
+;;      documentation. There you'll find a "Module Index" link where you'll find
+;;      a comprehensive list of Doom's modules and what flags they support.
+
+;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
+;;      'C-c c k' for non-vim users) to view its documentation. This works on
+;;      flags as well (those symbols that start with a plus).
+;;
+;;      Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
+;;      directory (for easy access to its source code).
+
+(doom! :input
+       ;;chinese
+       ;;japanese
+       ;;layout            ; auie,ctsrnm is the superior home row
+
+       :completion
+       company           ; the ultimate code completion backend
+       ;;helm              ; the *other* search engine for love and life
+       ;;ido               ; the other *other* search engine...
+       ivy               ; a search engine for love and life
+
+       :ui
+       ;;deft              ; notational velocity for Emacs
+       doom              ; what makes DOOM look the way it does
+       doom-dashboard    ; a nifty splash screen for Emacs
+       doom-quit         ; DOOM quit-message prompts when you quit Emacs
+       ;;(emoji +unicode)  ; 🙂
+       hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
+       ;;hydra
+       ;;indent-guides     ; highlighted indent columns
+       ;;ligatures         ; ligatures and symbols to make your code pretty again
+       ;;minimap           ; show a map of the code on the side
+       modeline          ; snazzy, Atom-inspired modeline, plus API
+       ;;nav-flash         ; blink cursor line after big motions
+       ;;neotree           ; a project drawer, like NERDTree for vim
+       ophints           ; highlight the region an operation acts on
+       (popup +defaults)   ; tame sudden yet inevitable temporary windows
+       ;;tabs              ; a tab bar for Emacs
+       ;;treemacs          ; a project drawer, like neotree but cooler
+       ;;unicode           ; extended unicode support for various languages
+       vc-gutter         ; vcs diff in the fringe
+       vi-tilde-fringe   ; fringe tildes to mark beyond EOB
+       ;;window-select     ; visually switch windows
+       workspaces        ; tab emulation, persistence & separate workspaces
+       ;;zen               ; distraction-free coding or writing
+
+       :editor
+       (evil +everywhere); come to the dark side, we have cookies
+       file-templates    ; auto-snippets for empty files
+       fold              ; (nigh) universal code folding
+       ;;(format +onsave)  ; automated prettiness
+       ;;god               ; run Emacs commands without modifier keys
+       ;;lispy             ; vim for lisp, for people who don't like vim
+       ;;multiple-cursors  ; editing in many places at once
+       ;;objed             ; text object editing for the innocent
+       ;;parinfer          ; turn lisp into python, sort of
+       ;;rotate-text       ; cycle region at point between text candidates
+       snippets          ; my elves. They type so I don't have to
+       ;;word-wrap         ; soft wrapping with language-aware indent
+
+       :emacs
+       dired             ; making dired pretty [functional]
+       electric          ; smarter, keyword-based electric-indent
+       ;;ibuffer         ; interactive buffer management
+       undo              ; persistent, smarter undo for your inevitable mistakes
+       vc                ; version-control and Emacs, sitting in a tree
+
+       :term
+       ;;eshell            ; the elisp shell that works everywhere
+       ;;shell             ; simple shell REPL for Emacs
+       ;;term              ; basic terminal emulator for Emacs
+       ;;vterm             ; the best terminal emulation in Emacs
+
+       :checkers
+       syntax              ; tasing you for every semicolon you forget
+       ;;(spell +flyspell) ; tasing you for misspelling mispelling
+       ;;grammar           ; tasing grammar mistake every you make
+
+       :tools
+       ;;ansible
+       ;;debugger          ; FIXME stepping through code, to help you add bugs
+       ;;direnv
+       ;;docker
+       ;;editorconfig      ; let someone else argue about tabs vs spaces
+       ;;ein               ; tame Jupyter notebooks with emacs
+       (eval +overlay)     ; run code, run (also, repls)
+       ;;gist              ; interacting with github gists
+       lookup              ; navigate your code and its documentation
+       ;;lsp               ; M-x vscode
+       magit             ; a git porcelain for Emacs
+       ;;make              ; run make tasks from Emacs
+       ;;pass              ; password manager for nerds
+       ;;pdf               ; pdf enhancements
+       ;;prodigy           ; FIXME managing external services & code builders
+       ;;rgb               ; creating color strings
+       ;;taskrunner        ; taskrunner for all your projects
+       ;;terraform         ; infrastructure as code
+       ;;tmux              ; an API for interacting with tmux
+       ;;upload            ; map local to remote projects via ssh/ftp
+
+       :os
+       (:if IS-MAC macos)  ; improve compatibility with macOS
+       ;;tty               ; improve the terminal Emacs experience
+
+       :lang
+       ;;agda              ; types of types of types of types...
+       ;;beancount         ; mind the GAAP
+       ;;cc                ; C > C++ == 1
+       ;;clojure           ; java with a lisp
+       ;;common-lisp       ; if you've seen one lisp, you've seen them all
+       ;;coq               ; proofs-as-programs
+       ;;crystal           ; ruby at the speed of c
+       ;;csharp            ; unity, .NET, and mono shenanigans
+       ;;data              ; config/data formats
+       ;;(dart +flutter)   ; paint ui and not much else
+       ;;elixir            ; erlang done right
+       ;;elm               ; care for a cup of TEA?
+       emacs-lisp        ; drown in parentheses
+       ;;erlang            ; an elegant language for a more civilized age
+       ;;ess               ; emacs speaks statistics
+       ;;factor
+       ;;faust             ; dsp, but you get to keep your soul
+       ;;fsharp            ; ML stands for Microsoft's Language
+       ;;fstar             ; (dependent) types and (monadic) effects and Z3
+       ;;gdscript          ; the language you waited for
+       ;;(go +lsp)         ; the hipster dialect
+       ;;(haskell +dante)  ; a language that's lazier than I am
+       ;;hy                ; readability of scheme w/ speed of python
+       ;;idris             ; a language you can depend on
+       ;;json              ; At least it ain't XML
+       ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
+       ;;javascript        ; all(hope(abandon(ye(who(enter(here))))))
+       ;;julia             ; a better, faster MATLAB
+       ;;kotlin            ; a better, slicker Java(Script)
+       ;;latex             ; writing papers in Emacs has never been so fun
+       ;;lean              ; for folks with too much to prove
+       ;;ledger            ; be audit you can be
+       ;;lua               ; one-based indices? one-based indices
+       markdown            ; writing docs for people to ignore
+       ;;nim               ; python + lisp at the speed of c
+       nix                 ; I hereby declare "nix geht mehr!"
+       ;;ocaml             ; an objective camel
+       (org +roam2)        ; organize your plain life in plain text
+       ;;php               ; perl's insecure younger brother
+       ;;plantuml          ; diagrams for confusing people more
+       ;;purescript        ; javascript, but functional
+       ;;python            ; beautiful is better than ugly
+       ;;qt                ; the 'cutest' gui framework ever
+       ;;racket            ; a DSL for DSLs
+       ;;raku              ; the artist formerly known as perl6
+       ;;rest              ; Emacs as a REST client
+       ;;rst               ; ReST in peace
+       ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+       ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       ;;scala             ; java, but good
+       ;;(scheme +guile)   ; a fully conniving family of lisps
+       sh                ; she sells {ba,z,fi}sh shells on the C xor
+       ;;sml
+       ;;solidity          ; do you need a blockchain? No.
+       ;;swift             ; who asked for emoji variables?
+       ;;terra             ; Earth and Moon in alignment for performance.
+       ;;web               ; the tubes
+       ;;yaml              ; JSON, but readable
+       ;;zig               ; C, but simpler
+
+       :email
+       ;;(mu4e +gmail)
+       ;;notmuch
+       ;;(wanderlust +gmail)
+
+       :app
+       ;;calendar
+       ;;emms
+       ;;everywhere        ; *leave* Emacs!? You must be joking
+       ;;irc               ; how neckbeards socialize
+       ;;(rss +org)        ; emacs as an RSS reader
+       ;;twitter           ; twitter client https://twitter.com/vnought
+
+       :config
+       ;;literate
+       (default +bindings +smartparens))

homes/palo/git.nix

@@ -10,24 +10,16 @@ with pkgs;
       key = "42AC51C9482D0834CF488AF1389EC2D64AC71EAC";
       signByDefault = true;
     };
-    ignores = [
+    ignores = [ "*.swp" "*~" ".idea" ".*penis.*" "result" ".envrc" ".direnv" ];
-      "*.swp"
-      "*~"
-      ".idea"
-      ".*penis.*"
-      "result"
-      ".envrc"
-      ".direnv"
-    ];
     extraConfig = {
       init.defaultBranch = "main";
       pull.ff = "only";
-      push.autoSetupRemote = true;
     };
     #diff-so-fancy.enable = true;
     difftastic.enable = true;
   };
 
+
   home.packages = [
     pre-commit
     gita

homes/palo/gpg.nix

@@ -12,7 +12,8 @@
       keyserver = "keyserver.ubuntu.com";
       personal-digest-preferences = "SHA512";
       cert-digest-algo = "SHA512";
-      default-preference-list = "SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed";
+      default-preference-list =
+        "SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed";
     };
   };
 

homes/palo/gui/alacritty.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, lib, config, ... }:
-  pkgs,
-  lib,
-  config,
-  ...
-}:
 with lib;
 {
 

homes/palo/gui/kitty.nix

@@ -1,9 +1,4 @@
-{
+{ lib, pkgs, config, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
 with lib;
 {
 
@@ -36,5 +31,6 @@ with lib;
       };
     };
 
+
   };
 }

homes/palo/hyperland.nix

@@ -0,0 +1,161 @@
+{ pkgs, ... }:
+{
+
+  home.file.".config/hypr/hyperland.conf".text = ''
+    autogenerated = 1 # remove this line to remove the warning
+    # See https://wiki.hyprland.org/Configuring/Monitors/
+    monitor=,preferred,auto,auto
+
+    # Some default env vars.
+    env = XCURSOR_SIZE,24
+
+    # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
+    input {
+        kb_layout = us
+        kb_variant =
+        kb_model =
+        kb_options =
+        kb_rules =
+
+        follow_mouse = 1
+
+        touchpad {
+            natural_scroll = no
+        }
+
+        sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+    }
+
+    general {
+        # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
+        gaps_in = 5
+        gaps_out = 20
+        border_size = 2
+        col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+        col.inactive_border = rgba(595959aa)
+
+        layout = dwindle
+
+        # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
+        allow_tearing = false
+    }
+
+    decoration {
+        # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
+        rounding = 10
+
+        blur {
+            enabled = true
+            size = 3
+            passes = 1
+        }
+
+        drop_shadow = yes
+        shadow_range = 4
+        shadow_render_power = 3
+        col.shadow = rgba(1a1a1aee)
+    }
+
+    animations {
+        enabled = yes
+
+        # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+        bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+        animation = windows, 1, 7, myBezier
+        animation = windowsOut, 1, 7, default, popin 80%
+        animation = border, 1, 10, default
+        animation = borderangle, 1, 8, default
+        animation = fade, 1, 7, default
+        animation = workspaces, 1, 6, default
+    }
+
+    dwindle {
+        # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+        pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+        preserve_split = yes # you probably want this
+    }
+
+    master {
+        # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+        new_is_master = true
+    }
+
+    gestures {
+        # See https://wiki.hyprland.org/Configuring/Variables/ for more
+        workspace_swipe = off
+    }
+
+    misc {
+        # See https://wiki.hyprland.org/Configuring/Variables/ for more
+        force_default_wallpaper = -1 # Set to 0 to disable the anime mascot wallpapers
+    }
+
+    # Example per-device config
+    # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
+    device:epic-mouse-v1 {
+        sensitivity = -0.5
+    }
+
+    # See https://wiki.hyprland.org/Configuring/Keywords/ for more
+    $mainMod = SUPER
+
+    # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+    bind = $mainMod, enter, exec, alacritty
+    bind = $mainMod, C, killactive,
+    bind = $mainMod, Q, exit,
+    bind = $mainMod, E, exec, dolphin
+    bind = $mainMod, V, togglefloating,
+    bind = $mainMod, R, exec, wofi --show drun
+    bind = $mainMod, P, pseudo, # dwindle
+    bind = $mainMod, J, togglesplit, # dwindle
+
+    # Move focus with mainMod + arrow keys
+    bind = $mainMod, left, movefocus, l
+    bind = $mainMod, right, movefocus, r
+    bind = $mainMod, up, movefocus, u
+    bind = $mainMod, down, movefocus, d
+
+    # Switch workspaces with mainMod + [0-9]
+    bind = $mainMod, 1, workspace, 1
+    bind = $mainMod, 2, workspace, 2
+    bind = $mainMod, 3, workspace, 3
+    bind = $mainMod, 4, workspace, 4
+    bind = $mainMod, 5, workspace, 5
+    bind = $mainMod, 6, workspace, 6
+    bind = $mainMod, 7, workspace, 7
+    bind = $mainMod, 8, workspace, 8
+    bind = $mainMod, 9, workspace, 9
+    bind = $mainMod, 0, workspace, 10
+
+    # Move active window to a workspace with mainMod + SHIFT + [0-9]
+    bind = $mainMod SHIFT, 1, movetoworkspace, 1
+    bind = $mainMod SHIFT, 2, movetoworkspace, 2
+    bind = $mainMod SHIFT, 3, movetoworkspace, 3
+    bind = $mainMod SHIFT, 4, movetoworkspace, 4
+    bind = $mainMod SHIFT, 5, movetoworkspace, 5
+    bind = $mainMod SHIFT, 6, movetoworkspace, 6
+    bind = $mainMod SHIFT, 7, movetoworkspace, 7
+    bind = $mainMod SHIFT, 8, movetoworkspace, 8
+    bind = $mainMod SHIFT, 9, movetoworkspace, 9
+    bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+    # Example special workspace (scratchpad)
+    bind = $mainMod, S, togglespecialworkspace, magic
+    bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
+    # Scroll through existing workspaces with mainMod + scroll
+    bind = $mainMod, mouse_down, workspace, e+1
+    bind = $mainMod, mouse_up, workspace, e-1
+
+    # Move/resize windows with mainMod + LMB/RMB and dragging
+    bindm = $mainMod, mouse:272, movewindow
+    bindm = $mainMod, mouse:273, resizewindow
+
+  '';
+
+}
+

homes/palo/i3.nix

@@ -1,20 +1,8 @@
-{
+{ config, lib, pkgs, osConfig, ... }:
-  config,
-  lib,
-  pkgs,
-  osConfig,
-  ...
-}:
 with lib;
 let
 
-  rofi = pkgs.rofi.override {
+  rofi = pkgs.rofi.override { plugins = [ pkgs.rofi-emoji pkgs.rofi-calc pkgs.xdotool ]; };
-    plugins = [
-      pkgs.rofi-emoji
-      pkgs.rofi-calc
-      pkgs.xdotool
-    ];
-  };
 
   backgroundCommand = pkgs.writers.writeDash "background" ''
     ${pkgs.xorg.xrandr}/bin/xrandr | grep " connected" | grep "primary" | \
@@ -55,7 +43,6 @@ in
         pkgs.autorandr
         pkgs.polygon-art.polygon-art
         pkgs.xdotool # needed for rofi-emoji
-        pkgs.xclicker # makes stuff much easier
       ];
 
     programs.i3status-rust = {
@@ -153,25 +140,21 @@ in
           focus = {
             followMouse = true;
           };
-          colors.focused = with config.lib.stylix.colors.withHashtag; {
+          colors.focused =
-            # stylix color overrides
+            with config.lib.stylix.colors.withHashtag;
-            border = lib.mkForce base08;
-            background = lib.mkForce base0A;
-            text = lib.mkForce base00;
-          };
-          startup = [
-            #{ command = "${pkgs.jellyfin-mpv-shim}/bin/jellyfin-mpv-shim"; always = true; }
             {
-              command = "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator";
+              # stylix color overrides
-              always = true;
+              border = lib.mkForce base08;
-            }
+              background = lib.mkForce base0A;
-            {
+              text = lib.mkForce base00;
-              command = toString backgroundCommand;
+            };
-              always = true;
+          startup =
-            }
+            [
-            {
+              #{ command = "${pkgs.jellyfin-mpv-shim}/bin/jellyfin-mpv-shim"; always = false; }
-              command = toString (
+              { command = "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator"; always = true; }
-                pkgs.writers.writeDash "xsettings" ''
+              { command = toString backgroundCommand; always = true; }
+              {
+                command = toString (pkgs.writers.writeDash "xsettings" ''
                   # to allow sudo commands to access X
                   ${pkgs.xorg.xhost}/bin/xhost +
                   # no shitty pcspkr crap
@@ -179,15 +162,13 @@ in
                   # no sleeping monitor
                   ${pkgs.xorg.xset}/bin/xset -dpms
                   ${pkgs.xorg.xset}/bin/xset s off
-                ''
+                '');
-              );
+                always = true;
-              always = true;
+              }
-            }
+            ];
-          ];
           bars = [
-            (
+            (config.lib.stylix.i3.bar //
-              config.lib.stylix.i3.bar
+              {
-              // {
                 #mode = "hide";
                 hiddenState = "hide";
                 position = "top";
@@ -207,16 +188,6 @@ in
             in
             {
               "Print" = "exec ${pkgs.flameshot}/bin/flameshot gui -c -p /share/";
-
-              # --- Brightness controls --- #
-              "XF86MonBrightnessUp" = "exec --no-startup-id ${pkgs.brightnessctl}/bin/brightnessctl set +5%";
-              "XF86MonBrightnessDown" = "exec --no-startup-id ${pkgs.brightnessctl}/bin/brightnessctl set 5%-";
-
-              # --- Pulse/Pipewire Audio controls --- #
-              "XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
-              "XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
-              "XF86AudioMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
-
               "${modifier}+Return" = "exec ${cfg.config.terminal}";
               "${modifier}+Shift+q" = "exit";
               "${modifier}+q" = "kill";

homes/palo/packages/development.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, lib, config, ... }:
-  pkgs,
-  lib,
-  config,
-  ...
-}:
 with pkgs;
 with lib;
 {
@@ -34,18 +29,15 @@ with lib;
         jetbrains.pycharm-professional
 
         # planing
-        (
+        ((ganttproject-bin.override {
-          (ganttproject-bin.override {
+          jre = pkgs.openjdk11;
-            jre = pkgs.openjdk11;
+        }).overrideAttrs (old: {
-          }).overrideAttrs
+          version = "3.1.3100";
-          (old: {
+          src = pkgs.fetchzip {
-            version = "3.1.3100";
+            url = "https://dl.ganttproject.biz/ganttproject-3.1.3100/ganttproject-3.1.3100.zip";
-            src = pkgs.fetchzip {
+            sha256 = "sha256-hw2paak0P670/kemiuqYHIaN0uUtkVKy+AX2X7OdnJ4=";
-              url = "https://dl.ganttproject.biz/ganttproject-3.1.3100/ganttproject-3.1.3100.zip";
+          };
-              sha256 = "sha256-hw2paak0P670/kemiuqYHIaN0uUtkVKy+AX2X7OdnJ4=";
+        }))
-            };
-          })
-        )
 
         # Pkl
         # ---
@@ -109,8 +101,7 @@ with lib;
     {
       home.packages =
         let
-          pandocScript =
+          pandocScript = { inputFormat, outputFormat }:
-            { inputFormat, outputFormat }:
             pkgs.writers.writeDashBin "pandoc-from-${inputFormat}-to-${outputFormat}" ''
               ${pkgs.pandoc}/bin/pandoc \
                 --from ${inputFormat} \
@@ -144,26 +135,10 @@ with lib;
             ${pkgs.less}/bin/less
           '')
 
-        ]
+        ] ++ (map pandocScript (lib.cartesianProduct {
-        ++ (map pandocScript (
+          inputFormat = [ "man" "markdown" "mediawiki" "asciidoc" ];
-          lib.cartesianProduct {
+          outputFormat = [ "mediawiki" "docbook5" "html5" "man" "jira" "markdown" "asciidoc" ];
-            inputFormat = [
+        }));
-              "man"
-              "markdown"
-              "mediawiki"
-              "asciidoc"
-            ];
-            outputFormat = [
-              "mediawiki"
-              "docbook5"
-              "html5"
-              "man"
-              "jira"
-              "markdown"
-              "asciidoc"
-            ];
-          }
-        ));
 
     }
   ];

homes/palo/packages/graphics.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with pkgs;
 with lib;
 {
@@ -16,6 +11,7 @@ with lib;
       gimp
       inkscape
       imagemagick
+      nsxiv
       blender
       lightburn
       colorpicker
@@ -27,9 +23,6 @@ with lib;
 
       qrencode
 
-      xclicker
-      xdotool
-
     ];
 
   };

homes/palo/packages/logseq.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with pkgs;
 with lib;
 {

homes/palo/packages/media.nix

@@ -1,9 +1,5 @@
-{
+{ pkgs, lib, config, ... }:
-  pkgs,
+with pkgs;
-  lib,
-  config,
-  ...
-}:
 with lib;
 {
 
@@ -11,21 +7,25 @@ with lib;
 
     (mkIf config.gui.enable {
       home.packages = [
-        pkgs.freetube
+        freetube
-        pkgs.vlc
+        vlc
 
         # music editors
         # =============
-        pkgs.picard # musicbrainz editor
+        picard # musicbrainz editor
-        pkgs.easytag
+        #kid3-qt # id3 tag editor
-        pkgs.dconf
+        easytag
-
+        dconf
-        pkgs.jellyfin-mpv-shim
 
       ];
     })
     {
-      home.packages = [ ];
+      home.packages = [
+
+        # music editors
+        # =============
+        kid3-cli
+      ];
     }
   ];
 }

homes/palo/packages/nextcloud.nix

@@ -1,16 +1,10 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with pkgs;
 with lib;
 let
   nextcloud-client = pkgs.legacy_2311.nextcloud-client;
 
-  nextcloudSync =
+  nextcloudSync = folder:
-    folder:
     let
       password = "$( ${pkgs.pass}/bin/pass show home/nextcloud/palo/nextcloudcmd-token )";
       user = "palo";
@@ -22,18 +16,19 @@ let
         "https://${user}:${password}@nextcloud.ingolf-wagner.de"
     '';
 
-  borrow = pkgs.writers.writeDashBin "borrow" ''
+  borrow = pkgs.writers.writeDashBin "borrow"
-    ${getExe hledger-ui} \
+    ''
-      --all \
+      ${getExe hledger-ui} \
-      --theme=terminal \
+        --all \
-      --file ~/Nextcloud/Unterlagen/.hledger-borrow "$@"
+        --theme=terminal \
+        --file ~/Nextcloud/Unterlagen/.hledger-borrow "$@"
 
-    ${getExe gum} confirm \
+      ${getExe gum} confirm \
-        --affirmative="update" \
+          --affirmative="update" \
-        --negative="skip" \
+          --negative="skip" \
-        --default=false \
+          --default=false \
-        "Syncronize with Nextcloud?" && ${getExe (nextcloudSync "Unterlagen")}
+          "Syncronize with Nextcloud?" && ${getExe(nextcloudSync "Unterlagen")}
-  '';
+    '';
 in
 {
 

homes/palo/packages/packages.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with pkgs;
 with lib;
 {
@@ -13,6 +8,7 @@ with lib;
     # ¯\_(ツ)_/¯
     home.packages = [
 
+
       nixos-shell
 
       # bluetooth gui

homes/palo/packages/social.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with pkgs;
 with lib;
 {

homes/palo/ssh.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, lib, config, ... }:
-  pkgs,
-  lib,
-  config,
-  ...
-}:
 {
 
   home.packages = [ pkgs.sshuttle ];

homes/palo/taskwarrior.nix

@@ -1,131 +1,99 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 with lib;
 with types;
 let
-  mkMagicMergeOption =
+  mkMagicMergeOption = { description ? "", example ? { }, default ? { }, apply ? id, ... }:
-    {
-      description ? "",
-      example ? { },
-      default ? { },
-      apply ? id,
-      ...
-    }:
     mkOption {
-      inherit
+      inherit example description default apply;
-        example
+      type = with lib.types;
-        description
-        default
-        apply
-        ;
-      type =
-        with lib.types;
         let
-          valueType =
+          valueType = nullOr
-            nullOr (oneOf [
+            (oneOf [
               bool
               int
               float
               str
               (attrsOf valueType)
               (listOf valueType)
-            ])
+            ]) // {
-            // {
+            description = "bool, int, float or str";
-              description = "bool, int, float or str";
+            emptyValue.value = { };
-              emptyValue.value = { };
+          };
-            };
         in
         valueType;
     };
 
-  #taskwarrior-tui = pkgs.legacy_2311.taskwarrior-tui;
-  taskwarrior-tui = pkgs.taskwarrior-tui;
 
-  taskwarrior = pkgs.taskwarrior3;
+  taskwarrior-tui = pkgs.legacy_2311.taskwarrior-tui;
 
 in
 
 {
 
   # bugwarrior (a bit fiddly)
-  imports = [
+  imports = [{
-    {
 
-      options.bugwarrior.config = mkMagicMergeOption {
+    options.bugwarrior.config = mkMagicMergeOption {
-        type = attrs;
+      type = attrs;
-        default = { };
+      default = { };
-      };
+    };
 
-      config = mkIf config.gui.enable {
+    config = {
-        home.file.".config/bugwarrior/bugwarrior.toml".source =
+      home.file.".config/bugwarrior/bugwarrior.toml".source = (pkgs.formats.toml { }).generate "bugwarriorrc.toml" config.bugwarrior.config;
-          (pkgs.formats.toml { }).generate "bugwarriorrc.toml"
+      # todo : before deleting this, put it in logseq
-            (
-              {
-                general.taskrc = pkgs.writeText "taskrc" "data.location=$HOME/.bugwarrior";
-              }
-              // config.bugwarrior.config
-            );
-        home.packages = [
-          pkgs.bugwarrior
-          #export TASKRC=$HOME/.bugwarrior/${pkgs.writeText "bugwarrior.taskrc" "data.location=$HOME/.bugwarrior"}
-          (pkgs.writers.writeBashBin "bugwarrior-sync" ''
-            set -eo pipefail
 
-            mkdir -p $HOME/.bugwarrior
+      home.packages = [
-            touch $HOME/.bugwarrior/taskrc
+        (pkgs.legacy_2311.python3Packages.bugwarrior.overrideAttrs (old: {
+          version = "develop";
+          src = pkgs.fetchFromGitHub {
+            owner = "ralphbean";
+            repo = "bugwarrior";
+            rev = "6554e70c199cc766a2b5e4e4fe22e4e46d64bba1";
+            sha256 = "sha256-cKhL8FBH7wxCxXrybVRLfCHQTCxursFqtBDl3e1UUXs=";
+          };
+          propagatedBuildInputs = old.propagatedBuildInputs ++ [
+            pkgs.legacy_2311.python3Packages.pydantic
+            pkgs.legacy_2311.python3Packages.tomli
+            pkgs.legacy_2311.python3Packages.email-validator
+            pkgs.legacy_2311.python3Packages.packaging
+          ];
+        }))
+      ];
+    };
 
-            export TASKRC=$HOME/.bugwarrior/taskrc
+  }];
-            export TASKDATA=$HOME/.bugwarrior
-            echo "bugwarrior pull" | ${pkgs.boxes}/bin/boxes -d ansi
-            ${pkgs.bugwarrior}/bin/bugwarrior pull "$@"
-            echo "task export" | ${pkgs.boxes}/bin/boxes -d ansi
-            ${pkgs.taskwarrior}/bin/task export > $HOME/.bugwarrior/bugwarrior.json
-
-            unset TASKRC
-            unset TASKDATA
-            echo "task import" | ${pkgs.boxes}/bin/boxes -d ansi
-            ${taskwarrior}/bin/task import rc.hooks=0 $HOME/.bugwarrior/bugwarrior.json
-          '')
-        ];
-      };
-
-    }
-  ];
 
   config = mkIf config.gui.enable {
 
-    home.packages = [
+    home.packages = with pkgs;
+      [
 
-      pkgs.timewarrior
+        taskwarrior
+        taskwarrior-tui
 
-      taskwarrior
+        timewarrior
-      pkgs.tasksh
+        tasksh
-      pkgs.taskwarrior-hooks
+        taskwarrior-hooks
-      (pkgs.writeShellScriptBin "tsak" ''${taskwarrior}/bin/task "$@"'')
+        (pkgs.writeShellScriptBin "tsak" ''${pkgs.taskwarrior}/bin/task "$@"'')
 
-      pkgs.vit
+        vit
-      taskwarrior-tui
+        (pkgs.writers.writeBashBin "active" "${taskwarrior-tui}/bin/taskwarrior-tui -r active")
-      (pkgs.writers.writeBashBin "active" "${taskwarrior-tui}/bin/taskwarrior-tui -r active")
+        (pkgs.writers.writeBashBin "todo" "${taskwarrior-tui}/bin/taskwarrior-tui -r todo")
-      (pkgs.writers.writeBashBin "todo" "${taskwarrior-tui}/bin/taskwarrior-tui -r todo")
 
-      (pkgs.writers.writeBashBin "calendar" ''
+        (pkgs.writers.writeBashBin "calendar" ''
-        ${taskwarrior}/bin/task calendar
+          ${pkgs.taskwarrior}/bin/task calendar
-        ${taskwarrior}/bin/task calendar_report
+          ${pkgs.taskwarrior}/bin/task calendar_report
-      '')
+        '')
 
-      # todo : belongs to calendar.nix
+        # todo : belongs to calendar.nix
-      pkgs.vdirsyncer
+        vdirsyncer
-      pkgs.khal
+        khal
-      (pkgs.writers.writeBashBin "kalendar" ''
+        (pkgs.writers.writeBashBin "kalendar" ''
-        ${pkgs.vdirsyncer}/bin/vdirsyncer sync
+          ${pkgs.vdirsyncer}/bin/vdirsyncer sync
-        ${pkgs.khal}/bin/ikhal
+          ${pkgs.khal}/bin/ikhal
-      '')
+        '')
 
-    ];
+      ];
 
   };
 

homes/root/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ../common
   ];
-
   gui.enable = false;
 
   home.stateVersion = "22.11";

homes/tina/logseq.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with pkgs;
 with lib;
 {
@@ -11,17 +6,13 @@ with lib;
     home.packages = [
       logseq
     ];
-    home.file.".config/Logseq/Preferences".source =
+    home.file.".config/Logseq/Preferences".source = (pkgs.formats.json { }).generate "LogseqPreferences.json"
-      (pkgs.formats.json { }).generate "LogseqPreferences.json"
+      {
-        {
+        spellcheck = {
-          spellcheck = {
+          dictionaries = [ "en-US" "de-DE" ];
-            dictionaries = [
+          dictionary = "";
-              "en-US"
-              "de-DE"
-            ];
-            dictionary = "";
-          };
         };
+      };
   };
 
 }

homes/tina/packages.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 with pkgs;
 with lib;
 {
@@ -30,7 +25,10 @@ with lib;
       pdfarranger
       calibre
 
+
     ];
 
+
+
   };
 }

images/lib/remote-access.nix

@@ -1,16 +1,11 @@
 {
   # cat ~/.ssh/id_rsa.pub
-  publicSshKey ? "",
+  publicSshKey ? ""
-  # remote-install-get-hiddenReceiver
+, # remote-install-get-hiddenReceiver
-  hiddenReceiver ? "",
+  hiddenReceiver ? ""
+,
 }:
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
 
   imports = [
     {
@@ -18,9 +13,7 @@
       networking.hostName = "liveos";
 
       users.extraUsers = {
-        root = {
+        root = { openssh.authorizedKeys.keys = [ publicSshKey ]; };
-          openssh.authorizedKeys.keys = [ publicSshKey ];
-        };
       };
     }
     {
@@ -111,20 +104,15 @@
             client.enable = true;
             relay.onionServices.hidden-ssh = {
               version = 3;
-              map = [
+              map = [{
-                {
+                port = 22;
-                  port = 22;
+                target.port = 22;
-                  target.port = 22;
+              }];
-                }
-              ];
             };
           };
           systemd.services.hidden-ssh-announce = {
             description = "irc announce hidden ssh";
-            after = [
+            after = [ "tor.service" "network-online.target" ];
-              "tor.service"
-              "network-online.target"
-            ];
             wants = [ "tor.service" ];
             wantedBy = [ "multi-user.target" ];
             serviceConfig = {

images/machine-init-configuration.nix

@@ -1,19 +1,15 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
 
-  imports = [
+  imports =
-    # Include the results of the hardware scan.
+    [
-    ./hardware-configuration.nix
+      # Include the results of the hardware scan.
+      ./hardware-configuration.nix
 
-    "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
+      "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
-    (import ./disko-config.nix { })
+      (import ./disko-config.nix { })
-  ];
+    ];
 
   networking.hostName = "nixos";
 
@@ -46,9 +42,7 @@
 
   services.openssh.enable = true;
 
-  users.users.root.openssh.authorizedKeys.keys = [
+  users.users.root.openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6uza62+Go9sBFs3XZE2OkugBv9PJ7Yv8ebCskE5WYPcahMZIKkQw+zkGI8EGzOPJhQEv2xk+XBf2VOzj0Fto4nh8X5+Llb1nM+YxQPk1SVlwbNAlhh24L1w2vKtBtMy277MF4EP+caGceYP6gki5+DzlPUSdFSAEFFWgN1WPkiyUii15Xi3QuCMR8F18dbwVUYbT11vwNhdiAXWphrQG+yPguALBGR+21JM6fffOln3BhoDUp2poVc5Qe2EBuUbRUV3/fOU4HwWVKZ7KCFvLZBSVFutXCj5HuNWJ5T3RuuxJSmY5lYuFZx9gD+n+DAEJt30iXWcaJlmUqQB5awcB1S2d9pJ141V4vjiCMKUJHIdspFrI23rFNYD9k2ZXDA8VOnQE33BzmgF9xOVh6qr4G0oEpsNqJoKybVTUeSyl4+ifzdQANouvySgLJV/pcqaxX1srSDIUlcM2vDMWAs3ryCa0aAlmAVZIHgRhh6wa+IXW8gIYt+5biPWUuihJ4zGBEwkyVXXf2xsecMWCAGPWPDL0/fBfY9krNfC5M2sqxey2ShFIq+R/wMdaI7yVjUCF2QIUNiIdFbJL6bDrDyHnEXJJN+rAo23jUoTZZRv7Jq3DB/A5H7a73VCcblZyUmwMSlpg3wos7pdw5Ctta3zQPoxoAKGS1uZ+yTeZbPMmdbw== contact@ingolf-wagner.de" ];
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6uza62+Go9sBFs3XZE2OkugBv9PJ7Yv8ebCskE5WYPcahMZIKkQw+zkGI8EGzOPJhQEv2xk+XBf2VOzj0Fto4nh8X5+Llb1nM+YxQPk1SVlwbNAlhh24L1w2vKtBtMy277MF4EP+caGceYP6gki5+DzlPUSdFSAEFFWgN1WPkiyUii15Xi3QuCMR8F18dbwVUYbT11vwNhdiAXWphrQG+yPguALBGR+21JM6fffOln3BhoDUp2poVc5Qe2EBuUbRUV3/fOU4HwWVKZ7KCFvLZBSVFutXCj5HuNWJ5T3RuuxJSmY5lYuFZx9gD+n+DAEJt30iXWcaJlmUqQB5awcB1S2d9pJ141V4vjiCMKUJHIdspFrI23rFNYD9k2ZXDA8VOnQE33BzmgF9xOVh6qr4G0oEpsNqJoKybVTUeSyl4+ifzdQANouvySgLJV/pcqaxX1srSDIUlcM2vDMWAs3ryCa0aAlmAVZIHgRhh6wa+IXW8gIYt+5biPWUuihJ4zGBEwkyVXXf2xsecMWCAGPWPDL0/fBfY9krNfC5M2sqxey2ShFIq+R/wMdaI7yVjUCF2QIUNiIdFbJL6bDrDyHnEXJJN+rAo23jUoTZZRv7Jq3DB/A5H7a73VCcblZyUmwMSlpg3wos7pdw5Ctta3zQPoxoAKGS1uZ+yTeZbPMmdbw== contact@ingolf-wagner.de"
-  ];
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
@@ -58,4 +52,5 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "22.11"; # Did you read the comment?
 
+
 }

images/remote-install/README.md

@@ -7,8 +7,7 @@
 
 - import `./remote-service.nix` in your `/etc/nixos/configuration.nix`
 - `nixos-rebuild switch`
-- run `remote-install-get-hiddenReceiver` and enter the result in `./config.nix`
+- run `remote-install-get-hiddenReceiver` and enter the result in `./config.nix` as `hiddenReceiver`
-  as `hiddenReceiver`
 - set the public key in `./config.nix`
 - run `nixos-generate -f install-iso -c ./config.nix`
 - prepare the usb stick : `sudo if=<path of the iso> of=/dev/<device> bs=4096`

images/remote-install/config.nix

@@ -4,7 +4,8 @@ let
   remote-access = import ../lib/remote-access.nix {
 
     # cat ~/.ssh/id_rsa.pub
-    publicSshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6uza62+Go9sBFs3XZE2OkugBv9PJ7Yv8ebCskE5WYPcahMZIKkQw+zkGI8EGzOPJhQEv2xk+XBf2VOzj0Fto4nh8X5+Llb1nM+YxQPk1SVlwbNAlhh24L1w2vKtBtMy277MF4EP+caGceYP6gki5+DzlPUSdFSAEFFWgN1WPkiyUii15Xi3QuCMR8F18dbwVUYbT11vwNhdiAXWphrQG+yPguALBGR+21JM6fffOln3BhoDUp2poVc5Qe2EBuUbRUV3/fOU4HwWVKZ7KCFvLZBSVFutXCj5HuNWJ5T3RuuxJSmY5lYuFZx9gD+n+DAEJt30iXWcaJlmUqQB5awcB1S2d9pJ141V4vjiCMKUJHIdspFrI23rFNYD9k2ZXDA8VOnQE33BzmgF9xOVh6qr4G0oEpsNqJoKybVTUeSyl4+ifzdQANouvySgLJV/pcqaxX1srSDIUlcM2vDMWAs3ryCa0aAlmAVZIHgRhh6wa+IXW8gIYt+5biPWUuihJ4zGBEwkyVXXf2xsecMWCAGPWPDL0/fBfY9krNfC5M2sqxey2ShFIq+R/wMdaI7yVjUCF2QIUNiIdFbJL6bDrDyHnEXJJN+rAo23jUoTZZRv7Jq3DB/A5H7a73VCcblZyUmwMSlpg3wos7pdw5Ctta3zQPoxoAKGS1uZ+yTeZbPMmdbw==";
+    publicSshKey =
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6uza62+Go9sBFs3XZE2OkugBv9PJ7Yv8ebCskE5WYPcahMZIKkQw+zkGI8EGzOPJhQEv2xk+XBf2VOzj0Fto4nh8X5+Llb1nM+YxQPk1SVlwbNAlhh24L1w2vKtBtMy277MF4EP+caGceYP6gki5+DzlPUSdFSAEFFWgN1WPkiyUii15Xi3QuCMR8F18dbwVUYbT11vwNhdiAXWphrQG+yPguALBGR+21JM6fffOln3BhoDUp2poVc5Qe2EBuUbRUV3/fOU4HwWVKZ7KCFvLZBSVFutXCj5HuNWJ5T3RuuxJSmY5lYuFZx9gD+n+DAEJt30iXWcaJlmUqQB5awcB1S2d9pJ141V4vjiCMKUJHIdspFrI23rFNYD9k2ZXDA8VOnQE33BzmgF9xOVh6qr4G0oEpsNqJoKybVTUeSyl4+ifzdQANouvySgLJV/pcqaxX1srSDIUlcM2vDMWAs3ryCa0aAlmAVZIHgRhh6wa+IXW8gIYt+5biPWUuihJ4zGBEwkyVXXf2xsecMWCAGPWPDL0/fBfY9krNfC5M2sqxey2ShFIq+R/wMdaI7yVjUCF2QIUNiIdFbJL6bDrDyHnEXJJN+rAo23jUoTZZRv7Jq3DB/A5H7a73VCcblZyUmwMSlpg3wos7pdw5Ctta3zQPoxoAKGS1uZ+yTeZbPMmdbw==";
 
     # remote-install-get-hiddenReceiver
     hiddenReceiver = "";

images/remote-install/remote-install.nix

@@ -3,7 +3,7 @@
   services.tor = {
     enable = true;
     client.enable = true;
-    relay.onionServices.liveos.map = [ { port = 1337; } ];
+    relay.onionServices.liveos.map = [{ port = 1337; }];
   };
 
   environment.systemPackages = [

images/translate-setup/audio.nix

@@ -1,22 +1,10 @@
-{
+{ pkgs, lib, config, ... }: {
-  pkgs,
+  users.users.mainUser.extraGroups = [ "audio" "pipewire" ];
-  lib,
-  config,
-  ...
-}:
-{
-  users.users.mainUser.extraGroups = [
-    "audio"
-    "pipewire"
-  ];
 
   hardware.pulseaudio = {
     enable = true;
     package = pkgs.pulseaudioFull;
   };
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ alsaUtils pavucontrol ];
-    alsaUtils
-    pavucontrol
-  ];
 }

images/translate-setup/config.nix

@@ -1,15 +1,6 @@
-{
+{ pkgs, lib, config, ... }: {
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-{
 
-  imports = [
+  imports = [ ./x11.nix ./audio.nix ];
-    ./x11.nix
-    ./audio.nix
-  ];
 
   #networking.networkmanager.enable = true;
   #networking.wireless.enable = false;

images/translate-setup/x11.nix

@@ -1,10 +1,4 @@
-{
+{ pkgs, config, lib, ... }: {
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-{
 
   services.xserver = {
     enable = true;
@@ -50,11 +44,6 @@
 
   # Packages
   # --------
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ flameshot pavucontrol mumble vlc ];
-    flameshot
-    pavucontrol
-    mumble
-    vlc
-  ];
 
 }

images/usb-init-configuration.nix

@@ -1,19 +1,17 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
 
-  imports = [
+
-    # Include the results of the hardware scan.
+  imports =
-    ./hardware-configuration.nix
+    [
-  ];
+      # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
 
   networking.hostName = "nixos";
 
+
   # grub configuraton
   # -----------------
   boot.loader.grub.enable = true;
@@ -43,9 +41,7 @@
 
   services.openssh.enable = true;
 
-  users.users.root.openssh.authorizedKeys.keys = [
+  users.users.root.openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6uza62+Go9sBFs3XZE2OkugBv9PJ7Yv8ebCskE5WYPcahMZIKkQw+zkGI8EGzOPJhQEv2xk+XBf2VOzj0Fto4nh8X5+Llb1nM+YxQPk1SVlwbNAlhh24L1w2vKtBtMy277MF4EP+caGceYP6gki5+DzlPUSdFSAEFFWgN1WPkiyUii15Xi3QuCMR8F18dbwVUYbT11vwNhdiAXWphrQG+yPguALBGR+21JM6fffOln3BhoDUp2poVc5Qe2EBuUbRUV3/fOU4HwWVKZ7KCFvLZBSVFutXCj5HuNWJ5T3RuuxJSmY5lYuFZx9gD+n+DAEJt30iXWcaJlmUqQB5awcB1S2d9pJ141V4vjiCMKUJHIdspFrI23rFNYD9k2ZXDA8VOnQE33BzmgF9xOVh6qr4G0oEpsNqJoKybVTUeSyl4+ifzdQANouvySgLJV/pcqaxX1srSDIUlcM2vDMWAs3ryCa0aAlmAVZIHgRhh6wa+IXW8gIYt+5biPWUuihJ4zGBEwkyVXXf2xsecMWCAGPWPDL0/fBfY9krNfC5M2sqxey2ShFIq+R/wMdaI7yVjUCF2QIUNiIdFbJL6bDrDyHnEXJJN+rAo23jUoTZZRv7Jq3DB/A5H7a73VCcblZyUmwMSlpg3wos7pdw5Ctta3zQPoxoAKGS1uZ+yTeZbPMmdbw== contact@ingolf-wagner.de" ];
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6uza62+Go9sBFs3XZE2OkugBv9PJ7Yv8ebCskE5WYPcahMZIKkQw+zkGI8EGzOPJhQEv2xk+XBf2VOzj0Fto4nh8X5+Llb1nM+YxQPk1SVlwbNAlhh24L1w2vKtBtMy277MF4EP+caGceYP6gki5+DzlPUSdFSAEFFWgN1WPkiyUii15Xi3QuCMR8F18dbwVUYbT11vwNhdiAXWphrQG+yPguALBGR+21JM6fffOln3BhoDUp2poVc5Qe2EBuUbRUV3/fOU4HwWVKZ7KCFvLZBSVFutXCj5HuNWJ5T3RuuxJSmY5lYuFZx9gD+n+DAEJt30iXWcaJlmUqQB5awcB1S2d9pJ141V4vjiCMKUJHIdspFrI23rFNYD9k2ZXDA8VOnQE33BzmgF9xOVh6qr4G0oEpsNqJoKybVTUeSyl4+ifzdQANouvySgLJV/pcqaxX1srSDIUlcM2vDMWAs3ryCa0aAlmAVZIHgRhh6wa+IXW8gIYt+5biPWUuihJ4zGBEwkyVXXf2xsecMWCAGPWPDL0/fBfY9krNfC5M2sqxey2ShFIq+R/wMdaI7yVjUCF2QIUNiIdFbJL6bDrDyHnEXJJN+rAo23jUoTZZRv7Jq3DB/A5H7a73VCcblZyUmwMSlpg3wos7pdw5Ctta3zQPoxoAKGS1uZ+yTeZbPMmdbw== contact@ingolf-wagner.de"
-  ];
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
@@ -55,4 +51,5 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "22.11"; # Did you read the comment?
 
+
 }

images/windows-rescue/README.md

@@ -10,5 +10,4 @@
 - edit SAM database `chntpw -i SAM`
 - reboot
 
-more details
+more details [here](https://opensource.com/article/18/3/how-reset-windows-password-linux).
-[here](https://opensource.com/article/18/3/how-reset-windows-password-linux).