From 5593f2de92e617a4d38fe836b589bd9a357349be Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 1 Apr 2024 03:28:49 +0300
Subject: [PATCH] add work zabbix + vscode/kitty fonts upd

---
 apps/apps.nix              | 11 +++++++++++
 apps/work.nix              |  3 ++-
 home/home.nix              |  5 +++++
 home/theme.nix             |  2 +-
 hosts/dlaptop/hardware.nix | 13 +++++++++++++
 hosts/intelnuc/system.nix  | 10 ++++++++++
 6 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/apps/apps.nix b/apps/apps.nix
index 877edb3..6b5ce84 100644
--- a/apps/apps.nix
+++ b/apps/apps.nix
@@ -35,6 +35,11 @@ let
     hide_window_decorations yes
     remember_window_size yes
     remote_control_password kitty-notification-password-fish ls
+
+    font_family      FiraCode Nerd Font
+    bold_font        auto
+    italic_font      auto
+    bold_italic_font auto
   '';
 in {
   imports = [
@@ -94,9 +99,15 @@ in {
     ripgrep gh # for nvim
     lunarvim # text edit
     lexend # font from google (non-mono)
+    #fira-code-nerdfont # mono font
+    iosevka-comfy.comfy
+    iosevka-comfy.comfy-duo
+    iosevka-comfy.comfy-wide
+    iosevka-comfy.comfy-wide-duo
     jamesdsp easyeffects
     nmap
     wget
+    doggo #dig for dns-over-*
   ]);
 
   programs.firefox = {
diff --git a/apps/work.nix b/apps/work.nix
index fef84e7..afb11fa 100644
--- a/apps/work.nix
+++ b/apps/work.nix
@@ -268,10 +268,11 @@ let
 
   hostsNoRemote = pkgs.writeText "hosts_no_remote" ''
     127.0.0.1 graf1.local graf2.local kibana.local
+    ${inputs.secrets.work.zabbix} ${inputs.secrets.work.zabbix-url} 
   '';
   
   hostsRemote = pkgs.writeText "host_remote" ''
-    100.92.15.128 graf1.local graf2.local kibana.local
+    100.92.15.128 graf1.local graf2.local kibana.local zabbix.local ${inputs.secrets.work.zabbix-url}
   '';
 
   kittyWork = pkgs.writeScriptBin "kittywork" ''
diff --git a/home/home.nix b/home/home.nix
index 912b06c..aa37ffe 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -48,6 +48,9 @@
         "terminal.external.linuxExec" = "kitty";
         "editor.guides.bracketPairs" = "active";
         "editor.bracketPairColorization.independentColorPoolPerBracketType" = true;
+        "editor.fontFamily" = "'FiraCode Nerd Font'";
+        "editor.fontLigatures" = "'ss01', 'ss02', 'ss06', 'ss08',  'cv14', 'cv04' , 'tnum'";
+        "editor.fontWeight" = "450";
         "nix.enableLanguageServer"= true;
         #"nix.serverPath" = "${pkgs.nil}/bin/nil";
         "nix.serverPath" = "${pkgs.nixd}/bin/nixd";
@@ -119,6 +122,8 @@
       hide_window_decorations = "yes";
       remote_control_password = "kitty-notification-password-fish ls";
       allow_remote_control = "password";
+      font_family= "FiraCode Nerd Font"; #FiraCode Nerd Font Ret
+      font_features = "FiraCodeNF-Reg +ss01 +ss02 +ss06 +ss08 +cv14 +cv03 +tnum";
 
       color0 = "#3F3F3F";
       color1 = "#705050";
diff --git a/home/theme.nix b/home/theme.nix
index 15f12c9..1c83dfe 100644
--- a/home/theme.nix
+++ b/home/theme.nix
@@ -10,7 +10,7 @@ let
       #"UbuntuMono"
       #"CascadiaCode"
       #"FantasqueSansMono"
-      #"FiraCode"
+      "FiraCode"
       #"Mononoki"
       "Iosevka"
     ];
diff --git a/hosts/dlaptop/hardware.nix b/hosts/dlaptop/hardware.nix
index cce5b55..97aab9b 100644
--- a/hosts/dlaptop/hardware.nix
+++ b/hosts/dlaptop/hardware.nix
@@ -34,6 +34,19 @@
     options cfg80211 ieee80211_regdom="RU"
   '';
 
+
+  services.fstrim = {
+    enable = true;
+    interval = "weekly";
+  };
+
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 7d";
+    # randomizedDelaySec = "30m";
+  };
+
   boot.loader.systemd-boot.enable = true;
 
   boot.kernelParams = [
diff --git a/hosts/intelnuc/system.nix b/hosts/intelnuc/system.nix
index ad1e901..4dede5c 100644
--- a/hosts/intelnuc/system.nix
+++ b/hosts/intelnuc/system.nix
@@ -121,6 +121,16 @@
       proxy_pass ${inputs.secrets.work.kibana};
     '';
   };
+  services.nginx.virtualHosts."zabbix" = {
+    forceSSL = false;
+    listen = [{port = 80;  addr="0.0.0.0"; ssl=false;}];
+    serverName = "zabbix.local";
+    locations."/".extraConfig = ''
+      proxy_set_header        Host $host;
+      proxy_set_header        X-Real-IP $remote_addr;
+      proxy_pass ${inputs.secrets.work.zabbix};
+    '';
+  };
 
   services.forgejo = {
     enable = true;