hosts/tempest/default.nix

@@ -112,7 +112,6 @@ inputs.nixpkgs.lib.nixosSystem {
       mullvad.enable = false;
       rust.enable = true;
       terraform.enable = true;
-      wezterm.enable = true;
       yt-dlp.enable = true;
       gaming = {
         dwarf-fortress.enable = true;

modules/common/applications/kitty.nix

@@ -22,7 +22,7 @@
     environment =
       { }
       // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
-        sessionVariables.ROFI_SYSTEMD_TERM = lib.mkDefault "${pkgs.kitty}/bin/kitty";
+        sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
       };
 
     home-manager.users.${config.user} = {
@@ -31,7 +31,7 @@
       xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "kitty";
 
       # Set the Rofi terminal for running programs
-      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
+      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
 
       # Display images in the terminal
       programs.fish.shellAliases = {

modules/common/applications/wezterm.nix

@@ -15,11 +15,7 @@
     };
   };
 
-  config =
+  config = lib.mkIf (config.gui.enable && config.wezterm.enable) {
-    let
-      font = config.home-manager.users.${config.user}.programs.kitty.font.name;
-    in
-    lib.mkIf (config.gui.enable && config.wezterm.enable) {
 
     # Set the Rofi-Systemd terminal for viewing logs
     # Using optionalAttrs because only available in NixOS
@@ -110,20 +106,19 @@
 
               -- Window
               window_padding = {
-                  left = 10,
+                left = 6,
-                  right = 10,
+                right = 6,
-                  top = 10,
+                top = 0,
-                  bottom = 10,
+                bottom = 0,
               },
 
-                font = wezterm.font('${font}', { weight = 'Bold'}),
+              font = wezterm.font 'VictorMono Nerd Font',
-                font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"},
+              font_size = 18.0,
 
               -- Tab Bar
-                hide_tab_bar_if_only_one_tab = true,
               window_frame = {
-                  font = wezterm.font('${font}', { weight = 'Bold'}),
+                font = wezterm.font 'VictorMono Nerd Font',
-                  font_size = ${if pkgs.stdenv.isLinux then "12.0" else "16.0"},
+                font_size = 16.0,
               },
 
               colors = {

modules/nixos/gaming/default.nix

@@ -19,9 +19,10 @@
   options.gaming.enable = lib.mkEnableOption "Enable gaming features.";
 
   config = lib.mkIf (config.gaming.enable && pkgs.stdenv.isLinux) {
-    hardware.graphics = {
+    hardware.opengl = {
       enable = true;
-      enable32Bit = true;
+      driSupport = true;
+      driSupport32Bit = true;
     };
     programs.gamemode.enable = true;
   };

modules/nixos/graphical/i3.nix

@@ -9,7 +9,6 @@ let
 
   lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
   lockUpdate = "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.wallpaper} --display 1 --span";
-  terminal = "wezterm";
 in
 {
 
@@ -48,10 +47,9 @@ in
             assigns = {
               "${ws1}" = [ { class = "Firefox"; } ];
               "${ws2}" = [
-                { class = "aerc"; }
                 { class = "kitty"; }
+                { class = "aerc"; }
                 { class = "obsidian"; }
-                { class = "wezterm"; }
               ];
               "${ws3}" = [ { class = "discord"; } ];
               "${ws4}" = [
@@ -128,9 +126,7 @@ in
               "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
 
               # Launchers
-              "${modifier}+Return" = "exec --no-startup-id ${
+              "${modifier}+Return" = "exec --no-startup-id kitty; workspace ${ws2}; layout tabbed";
-                config.home-manager.users.${config.user}.programs.rofi.terminal
-              }; workspace ${ws2}; layout tabbed";
               "${modifier}+space" = "exec --no-startup-id ${config.launcherCommand}";
               "${modifier}+Shift+s" = "exec --no-startup-id ${config.systemdSearch}";
               "${modifier}+Shift+a" = "exec --no-startup-id ${config.audioSwitchCommand}";
@@ -142,12 +138,8 @@ in
               "${modifier}+Shift+r" = "restart";
               "${modifier}+Shift+q" = ''exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
               "${modifier}+Shift+x" = "exec ${lockCmd}";
-              "${modifier}+Mod1+h" = "exec --no-startup-id ${
+              "${modifier}+Mod1+h" = "exec --no-startup-id kitty sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-                config.home-manager.users.${config.user}.programs.rofi.terminal
+              "${modifier}+Mod1+r" = "exec --no-startup-id kitty sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-              } -e sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-              "${modifier}+Mod1+r" = "exec --no-startup-id ${
-                config.home-manager.users.${config.user}.programs.rofi.terminal
-              } -e sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
 
               # Window options
               "${modifier}+q" = "kill";

modules/nixos/graphical/rofi.nix

@@ -18,6 +18,9 @@ in
 
   config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
 
+    # Set the Rofi-Systemd terminal for viewing logs
+    environment.sessionVariables.ROFI_SYSTEMD_TERM = lib.mkIf config.kitty.enable "${pkgs.kitty}/bin/kitty";
+
     home-manager.users.${config.user} = {
 
       home.packages = with pkgs; [

modules/nixos/services/victoriametrics.nix

@@ -12,7 +12,7 @@ let
 
   username = "prometheus";
 
-  prometheusConfig = {
+  prometheusConfig = (pkgs.formats.yaml { }).generate "prometheus.yml" {
     scrape_configs = [
       {
         job_name = config.networking.hostName;
@@ -38,6 +38,8 @@ in
 
   config = {
 
+    services.victoriametrics.extraOptions = [ "-promscrape.config=${prometheusConfig}" ];
+
     systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
       description = "VictoriaMetrics basic auth proxy";
       after = [ "network.target" ];
@@ -83,18 +85,21 @@ in
 
     # VMAgent
 
-    services.vmagent = {
+    services.vmagent.prometheusConfig = prometheusConfig; # Overwritten below
-      prometheusConfig = prometheusConfig;
+    systemd.services.vmagent.serviceConfig = lib.mkIf config.services.vmagent.enable {
-      remoteWrite = {
+      ExecStart = lib.mkForce ''
-        url = "https://${config.hostnames.prometheus}/api/v1/write";
+        ${pkgs.victoriametrics}/bin/vmagent \
-        basicAuthUsername = username;
+                -promscrape.config=${prometheusConfig} \
-        basicAuthPasswordFile = config.secrets.vmagent.dest;
+                -remoteWrite.url="https://${config.hostnames.prometheus}/api/v1/write" \
-      };
+                -remoteWrite.basicAuth.username=${username} \
+                -remoteWrite.basicAuth.passwordFile=${config.secrets.vmagent.dest}'';
     };
 
     secrets.vmagent = lib.mkIf config.services.vmagent.enable {
       source = ../../../private/prometheus.age;
       dest = "${config.secretsDirectory}/vmagent";
+      owner = "vmagent";
+      group = "vmagent";
     };
     systemd.services.vmagent-secret = lib.mkIf config.services.vmagent.enable {
       requiredBy = [ "vmagent.service" ];