add vps again

5 files changed, 21 insertions, 16 deletions

diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index 3788da7..9434fc5 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -5,8 +5,9 @@
   pkgs,
   ...
 }: with lib; {
-  programs.tmux = let
-    cfg = ''
+  programs.tmux = {
+    enable = true;
+    extraConfig = ''
         set-option -g default-shell ${config.ivi.shell}/bin/zsh
         set -g status off
         set -s set-clipboard on
@@ -38,13 +39,7 @@
         bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
         bind-key -T copy-mode-vi : command-prompt
       '';
-  in {
-    enable = true;
-  } // (if machine.isDarwin then {
-    tmuxConfig = cfg;
-  } else {
-    extraConfig = cfg;
-  });
+  };
 
   hm = {
     fonts.fontconfig.enable = true;
@@ -119,6 +114,8 @@
     '';
     };
 
+    programs.alacritty.enable = true;
+
     programs = {
       zsh = {
         enable = true;
@@ -306,6 +303,7 @@
       enableSshSupport = false;
       defaultCacheTtl = 34550000;
       maxCacheTtl = 34550000;
+      pinentryPackage = pkgs.pinentry-gtk2;
       # pinentryFlavor = "gtk2";
     };
   };
diff --git a/profiles/core/syncthing.nix b/profiles/core/syncthing.nix
index e076d8d..b736379 100644
--- a/profiles/core/syncthing.nix
+++ b/profiles/core/syncthing.nix
@@ -6,7 +6,7 @@ in {
   ];
 
   services.syncthing = {
-    enable = true;
+    enable = mkDefault true;
     user = ivi.username;
     inherit group;
     dataDir = config.ivi.home;
diff --git a/profiles/homeserver/acme.nix b/profiles/homeserver/acme.nix
index 5092d63..1880db2 100644
--- a/profiles/homeserver/acme.nix
+++ b/profiles/homeserver/acme.nix
@@ -2,6 +2,7 @@
   security.acme = {
     acceptTerms = true;
     defaults = {
+      extraLegoFlags = [ "--dns.disable-cp" ];
       extraLegoRunFlags = ["--preferred-chain" "ISRG Root X1"];
       email = ivi.email;
       dnsProvider = "porkbun";
diff --git a/profiles/homeserver/dns.nix b/profiles/homeserver/dns.nix
index a93425d..917c8bb 100644
--- a/profiles/homeserver/dns.nix
+++ b/profiles/homeserver/dns.nix
@@ -23,7 +23,13 @@
         name = ivi.domain;
         stub-addr = "127.0.0.1@10053";
       } ];
-      forward-zone = [ {
+      forward-zone = [
+      {
+        name = "_acme-challenge.${ivi.domain}";
+        forward-addr = config.services.resolved.fallbackDns;
+        forward-tls-upstream = true;
+      }
+      {
         name = ".";
         forward-addr = config.services.resolved.fallbackDns;
         forward-tls-upstream = true;
diff --git a/profiles/station/suckless.nix b/profiles/station/suckless.nix
index 2814b8c..cbbf7df 100644
--- a/profiles/station/suckless.nix
+++ b/profiles/station/suckless.nix
@@ -11,11 +11,11 @@
     xsession = {
       enable = true;
       initExtra = ''
-      ${pkgs.xorg.setxkbmap}/bin/setxkbmap -option "ctrl:swapcaps"
-      ${pkgs.xorg.xset}/bin/xset r rate 220 30
-      wal -R
-      dwm
-      dwmblocks &
+        ${pkgs.xorg.xset}/bin/xset r rate 230 30
+        [ -z "$(lsusb | grep microdox)" ] && ${pkgs.xorg.setxkbmap}/bin/setxkbmap -option "ctrl:swapcaps"
+        wal -R
+        dwm
+        dwmblocks &
     '';
     };
     services.picom = {