Merge branch 'master' of https://github.com/x0ba/dotfiles

x0ba · Feb 14, 2025 · 4f74f7c · 4f74f7c
2 parents d09fcfb + f083ca3
commit 4f74f7c
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 5 deletions.
diff --git a/modules/home/desktop/gtk/default.nix b/modules/home/desktop/gtk/default.nix
@@ -6,7 +6,12 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-
+  sharedGtkSettings = {
+    gtk-decoration-layout = ":menu";
+    gtk-enable-event-sounds = true;
+    gtk-enable-input-feedback-sounds = true;
+    gtk-sound-theme-name = "Yaru";
+  };
   cfg = config.${namespace}.desktop.gtk;
 in {
   options.${namespace}.desktop.gtk = {
@@ -40,6 +45,24 @@ in {
         name = "Yaru-dark";
         package = pkgs.yaru-theme;
       };
+      gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+      gtk3.extraConfig = sharedGtkSettings;
+      gtk4.extraConfig = sharedGtkSettings;
+    };
+    dconf.settings = {
+      "org/gnome/desktop/sound" = {
+        event-sounds = true;
+        input-feedback-sounds = true;
+        theme-name = "Yaru";
+      };
+      "org/gnome/desktop/wm/preferences" = {
+        button-layout = ":appmenu";
+      };
+    };
+    # don't want stuff that doesn't use XDG specs
+    home.file = {
+      ".icons/default/index.theme".enable = false;
+      ".icons/${config.gtk.iconTheme.name}".enable = false;
     };
   };
 }
diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix
@@ -140,7 +140,7 @@ in {
         }
 
         spawn-at-startup "${lib.getExe pkgs.xwayland-satellite}"
-        spawn-at-startup "${lib.getExe pkgs.swaybg}" "-i" "${../wallpapers/man.jpg}"
+        spawn-at-startup "${lib.getExe pkgs.swaybg}" "-i" "${../wallpapers/space.png}"
         spawn-at-startup "${lib.getExe pkgs.waybar}"
         spawn-at-startup "${swayosd-server}"
         spawn-at-startup "sh" "-c" "${lib.getExe pkgs.swayidle} -w timeout 300 'niri msg action power-off-monitors' resume 'niri msg action power-on-monitors' before-sleep '${lib.getExe config.programs.swaylock.package} -f'"

diff --git a/modules/nixos/desktop/niri/default.nix b/modules/nixos/desktop/niri/default.nix
@@ -68,13 +68,10 @@ in {
       # mounting
       gvfs.enable = true;
       udisks2.enable = true;
-      devmon.enable = true;
       # previews
       gnome.sushi.enable = true;
       # search metadata
       gnome.localsearch.enable = true;
-      # thumbnails
-      tumbler.enable = true;
     };
   };
 }
diff --git a/modules/nixos/hardware/networking/default.nix b/modules/nixos/hardware/networking/default.nix
@@ -1,6 +1,7 @@
 {
   options,
   config,
+  pkgs,
   lib,
   namespace,
   ...
@@ -14,6 +15,64 @@ in {
   };
 
   config = mkIf cfg.enable {
+    # to make `dig` & other utils available
+    environment.systemPackages = [pkgs.bind];
+
+    services.avahi = {
+      enable = true;
+      # publish the local machines IP
+      publish = {
+        enable = true;
+        addresses = true;
+      };
+      # resolve .local domains via avahi discovery
+      nssmdns4 = true;
+      nssmdns6 = true;
+    };
+
+    services.unbound = {
+      enable = true;
+      settings = {
+        server = {
+          interface = ["127.0.0.1"];
+          port = 53;
+          access-control = ["127.0.0.1 allow"];
+
+          hide-identity = true;
+          hide-version = true;
+
+          # Based on recommended settings in
+          # https://docs.pi-hole.net/guides/dns/unbound/#configure-unbound
+          harden-glue = true;
+          harden-dnssec-stripped = true;
+          use-caps-for-id = false;
+          edns-buffer-size = 1232;
+          prefetch = true;
+          so-rcvbuf = "1m";
+          private-address = [
+            "192.168.0.0/16"
+            "169.254.0.0/16"
+            "172.16.0.0/12"
+            "10.0.0.0/8"
+            "fd00::/8"
+            "fe80::/10"
+          ];
+        };
+        forward-zone = [
+          {
+            name = ".";
+            forward-addr = [
+              "45.90.28.0#257835.dns.nextdns.io"
+              "2a07:a8c0::#257835.dns.nextdns.io"
+              "45.90.30.0#257835.dns.nextdns.io"
+              "2a07:a8c1::#257835.dns.nextdns.io"
+            ];
+            forward-tls-upstream = true;
+          }
+        ];
+      };
+    };
+
     networking = {
       networkmanager.enable = true;
       firewall.enable = true;

diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix
@@ -17,6 +17,7 @@ in {
   };
 
   config = mkIf cfg.enable {
+    system.rebuild.enableNg = true;
     nixpkgs = {
       config.allowUnfree = true;
     };

diff --git a/modules/nixos/system/hardware_acceleration/default.nix b/modules/nixos/system/hardware_acceleration/default.nix
@@ -19,9 +19,13 @@ in {
       enable = true;
       enable32Bit = true;
       extraPackages = with pkgs; [
+        intel-compute-runtime
+        libvdpau-va-gl
+        vpl-gpu-rt
         intel-media-driver
       ];
     };
+    hardware.intel-gpu-tools.enable = true;
     hardware.opengl = {
       enable = true;
       driSupport = true;