From eb0d6a1274f98de0448a9ddb466e2e30d1721895 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 20 Oct 2024 21:11:51 +0200
Subject: ...

---
 hosts/sif/default.nix               | 13 -------------
 hosts/surtr/prometheus/default.nix  |  2 +-
 hosts/surtr/vpn/default.nix         |  1 -
 hosts/vidhar/default.nix            |  2 +-
 hosts/vidhar/prometheus/default.nix |  2 +-
 hosts/vidhar/samba.nix              | 32 ++++++++++++++++----------------
 6 files changed, 19 insertions(+), 33 deletions(-)

(limited to 'hosts')

diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index e81205b3..e71ee4ec 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -646,19 +646,6 @@ in {
     environment.sessionVariables."GTK_USE_PORTAL" = "1";
     xdg.portal = {
       enable = true;
-      # gtkUsePortal = true;
-      config.preferred.default = "gtk";
-      extraPortals = let
-        gtk-portal = pkgs.xdg-desktop-portal-gtk.overrideAttrs (oldAttrs: {
-          postFixup = ''
-            ${oldAttrs.postFixup or ""}
-
-            ${pkgs.gnused}/bin/sed -ri \
-              's|UseIn=gnome|UseIn=gnome;none+xmonad|' \
-              $out/share/xdg-desktop-portal/portals/gtk.portal
-          '';
-        });
-      in [ gtk-portal ];
     };
 
     environment.persistence."/.bcachefs" = {
diff --git a/hosts/surtr/prometheus/default.nix b/hosts/surtr/prometheus/default.nix
index 0f0cf586..5a58aa92 100644
--- a/hosts/surtr/prometheus/default.nix
+++ b/hosts/surtr/prometheus/default.nix
@@ -22,7 +22,7 @@ in {
         };
         unbound = {
           enable = true;
-          controlInterface = "/run/unbound/unbound.ctl";
+          unbound.host = "unix:///run/unbound/unbound.ctl";
           group = config.services.unbound.group;
         };
         wireguard = {
diff --git a/hosts/surtr/vpn/default.nix b/hosts/surtr/vpn/default.nix
index 3f7483bd..1bdcf74e 100644
--- a/hosts/surtr/vpn/default.nix
+++ b/hosts/surtr/vpn/default.nix
@@ -34,7 +34,6 @@ in {
         };
 
         environment = {
-          noXlibs = true;
           systemPackages = with pkgs; [ wireguard-tools ];
         };
 
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index 78f305f8..42a9e80d 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -136,7 +136,7 @@ with lib;
       wantedBy = ["basic.target"];
       serviceConfig = {
         ExecStart = pkgs.writeShellScript "limit-pstate-start" ''
-          echo 80 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
+          echo 60 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
         '';
         RemainAfterExit = true;
         ExecStop = pkgs.writeShellScript "limit-pstate-stop" ''
diff --git a/hosts/vidhar/prometheus/default.nix b/hosts/vidhar/prometheus/default.nix
index 3e938933..d368ad52 100644
--- a/hosts/vidhar/prometheus/default.nix
+++ b/hosts/vidhar/prometheus/default.nix
@@ -40,7 +40,7 @@ in {
         };
         unbound = {
           enable = true;
-          controlInterface = "/run/unbound/unbound.ctl";
+          unbound.host = "unix:///run/unbound/unbound.ctl";
           group = config.services.unbound.group;
         };
         wireguard = {
diff --git a/hosts/vidhar/samba.nix b/hosts/vidhar/samba.nix
index 89d9f12e..58fd435c 100644
--- a/hosts/vidhar/samba.nix
+++ b/hosts/vidhar/samba.nix
@@ -3,22 +3,22 @@
   config = {
     services.samba = {
       enable = true;
-      securityType = "user";
-      extraConfig = ''
-        domain master = yes
-        workgroup = WORKGROUP
-        load printers = no
-        printing = bsd
-        printcap name = /dev/null
-        disable spoolss = yes
-        guest account = nobody
-        bind interfaces only = yes
-        interfaces = lo lan
-        server signing = mandatory
-        server min protocol = SMB3
-        server smb encrypt = required
-      '';
-      shares = {
+      settings = {
+        global = {
+          security = "user";
+          "domain master" = true;
+          workgroup = "WORKGROUP";
+          "load printers" = false;
+          printing = "bsd";
+          "printcap name" = "/dev/null";
+          "disable spoolss" = true;
+          "guest account" = "nobody";
+          "bind interfaces only" = true;
+          interfaces = ["lo" "lan"];
+          "server signing" = "mandatory";
+          "server min protocol" = "SMB3";
+          "server smb encrypt" = "required";
+        };
         homes = {
           comment = "Home directory for %S";
           path = "/home/%S";
-- 
cgit v1.2.3