futher nixos config

Author: Vanderscycle

nix-darwin/home-modules/languages/jsts.nix

@@ -39,7 +39,15 @@
         emacsPackages.import-js
         svelte-language-server # npm install -g svelte-language-server
       ]
-      ++ (if config.jsts.vue.enable then [ vue-language-server ] else [ ])
+      ++ (
+        if config.jsts.vue.enable then
+          [
+            vue-language-server
+            vscode-extensions.vue.volar
+          ]
+        else
+          [ ]
+      )
       ++ (if config.jsts.svelte.enable then [ svelte-language-server ] else [ ]);
   };
 }

nix-darwin/home-modules/programs/kubernetes.nix

@@ -31,6 +31,7 @@
         tilt
         ctlptl
         argocd
+        kubectx # easy contect changing
       ];
       sessionVariables = config.kubernetes.kubeconfig;
     };

nix-darwin/home-modules/services/ssh.nix

@@ -19,11 +19,49 @@
       description = "ssh key authorized to log with";
       default = null;
     };
+    ssh.hosts = lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.submodule {
+          options = {
+            hostname = lib.mkOption {
+              type = lib.types.str;
+              description = "The hostname or IP address of the server";
+            };
+            user = lib.mkOption {
+              type = lib.types.str;
+              description = "The username to use for the SSH connection";
+              default = username; # Default to the current user
+            };
+            port = lib.mkOption {
+              type = lib.types.nullOr lib.types.int;
+              description = "The port to use for the SSH connection";
+              default = null;
+            };
+            identityFile = lib.mkOption {
+              type = lib.types.nullOr lib.types.path;
+              description = "The path to the SSH private key file";
+              default = null;
+            };
+          };
+        }
+      );
+      description = "A set of SSH hosts to configure";
+      default = { };
+    };
   };
 
   config = lib.mkIf config.ssh.enable {
     programs.ssh = {
       enable = true;
+      matchBlocks = lib.mapAttrs (name: host: {
+        inherit (host)
+          hostname
+          user
+          port
+          identityFile
+          ;
+      }) config.ssh.hosts;
+
     };
     home = {
       packages = with pkgs; [

nix-darwin/home-modules/window-managers/hyprland/default.nix

@@ -18,7 +18,9 @@
       inputs.rose-pine-hyprcursor.packages.${pkgs.system}.default
       wl-clipboard
       hyprcursor
-      flameshot
+      (pkgs.flameshot.overrideAttrs (oldAttrs: {
+        cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [ "-DUSE_WAYLAND_GRIM=ON" ];
+      }))
       wf-recorder # video recorder for wayland
       waypaper
       # screenshot since flameshot isn't working

nix-darwin/home-modules/window-managers/hyprland/hyprland.nix

@@ -144,8 +144,8 @@
             # launch program menu
             "SHIFTSUPER, P, exec, $menu"
             "SHIFTSUPER, O, exec, grim -g '$(slurp)' ~/Pictures/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png"
-            # "SHIFTSUPER, O, exec, flameshot gui --clipboard"
-            "SHIFTSUPER, Q, exec, $emacs --eval '(vterm)'"
+            "SHIFTSUPER, O, exec, flameshot gui --clipboard"
+            # "SHIFTSUPER, Q, exec, $emacs --eval '(vterm)'"
 
             # scripts
             # "$mainMod, f, exec, ${lib.getExe myScript}"
@@ -196,6 +196,7 @@
           ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
           ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
         ];
+        # hyprctl clients
         windowrule = [
           "workspace 1, Emacs"
           "workspace 2, firefox"
@@ -215,9 +216,9 @@
         windowrulev2 = [
           # Steam rules
           "stayfocused, title:^()$,class:^(steam)$" # otherwise it closes post launching a game
-          # "float, class:^([Ss]team)$, title:^((?![Ss]team).*)$" # Float non-Steam windows (e.g., game launchers)
-          # "workspace 4 silent, class:^([Ss]team)$, title:^([Ss]team)$" # Move Steam to workspace 4
-          # "tile, class:^([Ss]team)$, title:^([Ss]team)$" # Tile the main Steam window
+          "float, class:^([Ss]team)$, title:^((?![Ss]team).*)$" # Float non-Steam windows (e.g., game launchers)
+          "workspace 4 silent, class:^([Ss]team)$, title:^([Ss]team)$" # Move Steam to workspace 4
+          "tile, class:^([Ss]team)$, title:^([Ss]team)$" # Tile the main Steam window
           # "workspace 4 silent, class:^([Ss]team)$, title:^(notificationtoasts_.*)$" # Move Steam notifications to workspace 4
           "nofocus, class:^([Ss]team)$, title:^((?![Ss]team).*)$" # Prevent non-Steam windows from stealing focus
           "noblur, class:^([Ss]team)$" # Ensure Steam window remains visible
@@ -239,14 +240,15 @@
         exec-once = [
           "sleep 1 && waybar"
           "hyprpaper"
+          "Emacs"
           "blueman-applet"
-          "/etc/profiles/per-user/henri/bin/emacs --daemon &"
+          # "/etc/profiles/per-user/henri/bin/emacs --daemon &"
           "swaync"
           "discord --enable-wayland-ime"
           "spotify"
-          "Brave"
+          "Brave --enable-wayland-ime"
           "kitty"
-          "flameshot &"
+          "flameshot"
           "fcitx5"
           # "emacs" # TODO: make it spawn out of a shell
         ];

nix-darwin/users/henri/home.nix

@@ -26,7 +26,30 @@
   dunst.enable = lib.mkForce false;
   fcitx.enable = true; # chinese fonts are super pixels
   gnome.enable = true;
-  ssh.enable = true;
+  ssh = {
+    enable = true;
+    hosts = {
+      factorio = {
+        # ssh factorio
+        hostname = "192.168.4.250";
+        user = "root";
+      };
+      knode1 = {
+        # ssh knode1
+        hostname = "192.168.2.10";
+        user = "proxmox";
+      };
+
+      knode2 = {
+        hostname = "192.168.2.11";
+        user = "proxmox";
+      };
+      knode3 = {
+        hostname = "192.168.2.12";
+        user = "proxmox";
+      };
+    };
+  };
   # ssh.authorizedSshKeys = /home/henri/.ssh/endeavourGit; # TODO: move to nix-modules
   # languages
   go.lsp.enable = true;
@@ -40,7 +63,7 @@
   json.lsp.enable = true;
 
   # programs
-  flameshot.enable = true;
+  flameshot.enable = false; # enabled by hyprland
   brave.enable = true;
   firefox.enable = true; # lib.mkForce false;
 

nix-k8s-homelab/charts/servers/factorioVanilla/base/values.yaml

@@ -11,6 +11,21 @@ resources:
   #   memory: 1024Mi
   #   cpu: 1000m
 
+#### Service Configuration ####
+## @section Service Parameters
+## @param service.type Factorio service type
+## @param service.port Factorio service port
+## @extra service.externalIPs [array] If you are able to map an external IP, set it here
+## @extra service.nodePort If you use "type: NodePort" set the port to a value you like in the range of 30000-32767. Leave it blank for a random port
+## @param service.annotations Additional custom annotations for Factorio service
+## The service is a kind tricky, so factorio uses UDP, but not every cloud provider is able to route UDP traffic.
+## I.e. your cloud provider has LoadBalancers without the ability for UDP protocol. Furthermore kubectl ist not able to route UDP Traffic
+## ref: https://github.com/kubernetes/kubernetes/issues/47862
+## You have to expose factorio on a NodePort and map a port between 30000 and 32767, but the native port is 34197. So you have always to specify the port in factorio.
+## The best way ist to define a ClusterIP service and define one or more externalIPs. Of course this IPs must be available on the node the factorio pod runs on!
+service:
+  type: LoadBalancer
+
 ## @section Port-Fixer Parameters
 ## @param port_fixer.enabled Enable the Factorio Port Fixer
 ## @param image.repository Factorio port-fixer image repository