feat: enable filtering in adguard

home/desktop/default.nix

@@ -17,9 +17,12 @@ let
   };
 in
 {
-  xdg.desktopEntries = builtins.listToAttrs [
+  xdg = {
-    (mkURLEntry "Paperless" "https://paperless.ccnlc.eu" "${self}/assets/favicon-paperless.png")
+    userDirs.enable = true;
-    (mkURLEntry "KitchenOwl" "https://kitchenowl.ccnlc.eu" "${self}/assets/favicon-kitchenowl.png")
+    desktopEntries = builtins.listToAttrs [
-    (mkURLEntry "Discord" "https://discord.com/app" "${self}/assets/favicon-discord.png")
+      (mkURLEntry "Paperless" "https://paperless.ccnlc.eu" "${self}/assets/favicon-paperless.png")
-  ];
+      (mkURLEntry "KitchenOwl" "https://kitchenowl.ccnlc.eu" "${self}/assets/favicon-kitchenowl.png")
+      (mkURLEntry "Discord" "https://discord.com/app" "${self}/assets/favicon-discord.png")
+    ];
+  };
 }

home/hyprland/default.nix

@@ -5,7 +5,10 @@
   config,
   ...
 }:
-lib.mkIf osConfig.programs.hyprland.enable {
+let
+  inherit (lib) mapAttrsToList mkIf hasAttr;
+in
+mkIf osConfig.programs.hyprland.enable {
   home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto";
 
   wayland.windowManager.hyprland = {
@@ -14,10 +17,15 @@ lib.mkIf osConfig.programs.hyprland.enable {
     settings = {
       "$mod" = "SUPER";
 
-      monitor = [
+      monitor = mapAttrsToList (
-        "DP-2,1920x1080@144, 0x0, 1"
+        name: value:
-        "HDMI-A-1,1920x1080@60, 1920x0, 1"
+        let
-      ];
+          inherit (value) resX resY scale;
+          posFinal = "${toString value.posX}x${toString value.posY}";
+          rrFinal = if hasAttr "rr" value then "@${toString value.rr}" else "";
+        in
+        "${name}, ${toString resX}x${toString resY}${rrFinal}, ${posFinal}, ${toString scale}"
+      ) osConfig.modules.system.outputs;
 
       exec-once = [
         "${config.services.kdeconnect.package}/bin/kdeconnect-indicator"
@@ -51,6 +59,7 @@ lib.mkIf osConfig.programs.hyprland.enable {
       input = {
         numlock_by_default = true;
         kb_options = "compose:caps";
+        kb_layout = osConfig.console.keyMap;
       };
 
       decoration = {
@@ -60,10 +69,12 @@ lib.mkIf osConfig.programs.hyprland.enable {
         active_opacity = 1.0;
         inactive_opacity = 1.0;
 
-        drop_shadow = true;
+        shadow = {
-        shadow_range = 4;
+          enabled = true;
-        shadow_render_power = 3;
+          range = 4;
-        "col.shadow" = "rgba(1a1a1aee)";
+          render_power = 3;
+          color = "rgba(1a1a1aee)";
+        };
 
         # https://wiki.hyprland.org/Configuring/Variables/#blur
         blur = {

home/sway/default.nix

@@ -6,6 +6,9 @@
   osConfig,
   ...
 }:
+let
+  inherit (lib) mapAttrs;
+in
 lib.mkIf osConfig.programs.sway.enable {
 
   services.swayidle.enable = true;
@@ -199,14 +202,12 @@ lib.mkIf osConfig.programs.sway.enable {
         };
         #: }}}
         #: Output {{{
-        output = {
+        output = mapAttrs (name: value: {
-          eDP-1 = {
+          scale = toString value.scale;
-            scale = "2";
+          pos = "${toString value.posX} ${toString value.posY}";
-            pos = "0 0";
+          res = "${toString value.resX}x${toString value.resY}";
-            res = "3840x2400";
+          adaptive_sync = "on";
-            adaptive_sync = "on";
+        }) osConfig.modules.system.outputs;
-          };
-        };
         #: }}}
       };
     };

hosts/brontes/default.nix

@@ -32,9 +32,25 @@
   };
 
   modules = {
-    system.networking = {
+    system = {
-      wifi.enable = true;
+      roles.desktop.enable = true;
-      bluetooth.enable = true;
+
+      outputs = {
+        "DP-2" = {
+          resX = 1920;
+          resY = 1080;
+        };
+        "HDMI-A-1" = {
+          posX = 1920;
+          resX = 1920;
+          resY = 1080;
+        };
+      };
+
+      networking = {
+        wifi.enable = true;
+        bluetooth.enable = true;
+      };
     };
 
     services = {
@@ -61,10 +77,7 @@
     };
     media.enableAll = true;
   };
-  documentation = {
+
-    doc.enable = false;
-    man.generateCaches = false;
-  };
   services = {
     displayManager.sddm.enable = true;
     dbus.enable = true;
@@ -81,6 +94,7 @@
     firefox.enable = true;
     thunderbird.enable = true;
     sway.enable = true;
+    hyprland.enable = true;
   };
 
   security.polkit.enable = true;

hosts/marr/default.nix

@@ -17,6 +17,15 @@
     media.enableAll = true;
 
     system = {
+      roles.desktop.enable = true;
+
+      outputs = {
+        eDP-1 = {
+          resX = 3840;
+          resY = 2400;
+          scale = 2.0;
+        };
+      };
       networking = {
         bluetooth.enable = true;
         wifi.enable = true;

hosts/nihilus/default.nix

@@ -47,7 +47,17 @@
           }
           {
             name = "movies";
-            comment = "backup location for movies shows";
+            comment = "backup location for movies and shows";
+            mode = "write";
+          }
+          {
+            name = "books";
+            comment = "backup location for books";
+            mode = "write";
+          }
+          {
+            name = "games";
+            comment = "backup location for games";
             mode = "write";
           }
         ];

hosts/shan/adguard.nix

@@ -28,6 +28,9 @@ in
           upstream_dns_file = config.age.secrets.adguard-dns-list.path;
           fallback_dns = [ "9.9.9.9" ];
         };
+        filtering = {
+          filtering_enabled = true;
+        };
         clients = {
           persistent = [
             {

modules/commons/default.nix

@@ -1,3 +1,6 @@
 {
-  imports = [ ./system.nix ];
+  imports = [
+    ./system.nix
+    ./documentation.nix
+  ];
 }

modules/commons/documentation.nix

@@ -0,0 +1,6 @@
+{
+  documentation = {
+    doc.enable = false;
+    man.generateCaches = false;
+  };
+}

modules/themes/default.nix

@@ -1,16 +1,23 @@
-{ pkgs, ... }:
 {
-  qt = {
+  pkgs,
-    enable = true;
+  lib,
-    platformTheme = "gtk2";
+  config,
-    #platformTheme = "qt5ct";
+  ...
-    #style = "kvantum";
+}:
-  };
+{
+  config = lib.mkIf config.modules.system.roles.desktop.enable {
+    qt = {
+      enable = true;
+      platformTheme = "gtk2";
+      #platformTheme = "qt5ct";
+      #style = "kvantum";
+    };
 
-  environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs; [
-    #vimix-icon-theme
+      #vimix-icon-theme
-    #pop-icon-theme
+      #pop-icon-theme
-    catppuccin-papirus-folders
+      catppuccin-papirus-folders
-    #catppuccin-kvantum
+      #catppuccin-kvantum
-  ];
+    ];
+  };
 }

options/fixes/rsyncd.nix

@@ -82,7 +82,8 @@ in
 
           serviceConfig = serviceConfigSecurity // {
             ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}";
-            RestartSec = 1;
+            RestartSec = 15;
+            Restart = "always";
           };
 
           wantedBy = [ "multi-user.target" ];

options/system/default.nix

@@ -2,5 +2,6 @@
   imports = [
     ./networking
     ./roles
+    ./outputs.nix
   ];
 }

options/system/outputs.nix

@@ -0,0 +1,43 @@
+{ lib, ... }:
+let
+  inherit (lib) mkOption;
+  inherit (lib.types)
+    attrsOf
+    submodule
+    int
+    float
+    str
+    ;
+in
+{
+  options.modules.system.outputs = mkOption {
+    type = attrsOf (
+      submodule (
+        { name, config, ... }:
+        {
+          options = {
+            name = mkOption {
+              type = str;
+              default = name;
+            };
+            scale = mkOption {
+              type = float;
+              default = 1.0;
+            };
+            posX = mkOption {
+              type = int;
+              default = 0;
+            };
+            posY = mkOption {
+              type = int;
+              default = 0;
+            };
+            resX = mkOption { type = int; };
+            resY = mkOption { type = int; };
+          };
+        }
+      )
+    );
+    default = { };
+  };
+}

options/system/roles/default.nix

@@ -1 +1,6 @@
-{ imports = [ ./terminal.nix ]; }
+{
+  imports = [
+    ./terminal.nix
+    ./desktop.nix
+  ];
+}

options/system/roles/desktop.nix

@@ -0,0 +1,9 @@
+{ lib, ... }:
+let
+  inherit (lib) mkEnableOption;
+in
+{
+  options.modules.system.roles.desktop = {
+    enable = mkEnableOption "desktop usage features";
+  };
+}