working version before flake update

5 files changed, 32 insertions, 15 deletions

diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix
index e87f406..749d725 100644
--- a/nix/modules/configuration.nix
+++ b/nix/modules/configuration.nix
@@ -22,7 +22,6 @@
     ./znc.nix
     ./docker.nix
     ./impermanence.nix
-    ./firejail.nix
   ];
 
   documentation = {
@@ -87,7 +86,7 @@
     };
 
     loader = {
-  	  systemd-boot.enable = lib.mkForce ((! config.monorepo.profiles.grub.enable) || (! config.monorepo.profiles.secureBoot.enable));
+  	  systemd-boot.enable = lib.mkForce ((! config.monorepo.profiles.grub.enable) && (! config.monorepo.profiles.secureBoot.enable));
   	  efi.canTouchEfiVariables = lib.mkForce (! config.monorepo.profiles.grub.enable);
     };
 
@@ -189,12 +188,8 @@
   };
 
   networking = {
-    useDHCP = false;
-    dhcpcd.enable = false;
-    nameservers = [
-      "1.1.1.1"
-      "8.8.8.8"
-    ];
+    nameservers = [ "8.8.8.8" "1.1.1.1"];
+    dhcpcd.enable = (! config.monorepo.profiles.server.enable);
     networkmanager = {
   	  enable = true;
       wifi.powersave = false;
diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix
index f5f8d34..c3bcfbf 100644
--- a/nix/modules/home/default.nix
+++ b/nix/modules/home/default.nix
@@ -21,6 +21,7 @@
     ./mpd.nix
     ./mako.nix
     ./user.nix
+    ./gtk.nix
   ];
 
   options = {
diff --git a/nix/modules/home/gtk.nix b/nix/modules/home/gtk.nix
new file mode 100644
index 0000000..4e85b9d
--- /dev/null
+++ b/nix/modules/home/gtk.nix
@@ -0,0 +1,8 @@
+{ lib, config, pkgs, ... }:
+{
+  gtk = {
+    theme = {
+      package = pkgs.catppuccin-gtk;
+    };
+  };
+}
diff --git a/nix/modules/home/hyprland.nix b/nix/modules/home/hyprland.nix
index dbe0b39..6561211 100644
--- a/nix/modules/home/hyprland.nix
+++ b/nix/modules/home/hyprland.nix
@@ -16,7 +16,7 @@
       exec-once = [
         "waybar"
         "swww-daemon --format xrgb"
-        "swww img ${wallpapers}/imagination.png"
+        "sh -c 'swww img \"$(find ${wallpapers} -type f \\( -iname \"*.jpg\" -o -iname \"*.png\" \\) | shuf -n1)\"'"
         "fcitx5-remote -r"
         "fcitx5 -d --replace"
         "fcitx5-remote -r"
@@ -30,8 +30,8 @@
         "__GLX_VENDOR_LIBRARY_NAME,nvidia"
         "ELECTRON_OZONE_PLATFORM_HINT,auto"
       ];
-      blurls = [
-        "waybar"
+      layerrule = [
+        "blur,waybar"
       ];
       monitor = [
         "Unknown-1,disable"
@@ -47,6 +47,7 @@
         "workspace 3, title:^(.*fluffychat.*)$"
         "workspace 3, class:^(.*element-desktop.*)$"
         "workspace 4, class:^(.*qpwgraph.*)$"
+        "workspace 4, class:^(.*pavucontrol.*)$"
         "workspace 4, class:^(.*mpv.*)$"
         "workspace 5, title:^(.*Monero.*)$"
         "workspace 5, title:^(.*org\.bitcoin\..*)$"
@@ -58,10 +59,10 @@
       ];
       bind = [
         "$mod, F, exec, firefox"
-        "$mod, T, exec, tor-browser"
         "$mod, Return, exec, kitty"
         "$mod, E, exec, emacs"
         "$mod, B, exec, bitcoin-qt"
+        "$mod, S, exec, pavucontrol"
         "$mod, M, exec, monero-wallet-gui"
         "$mod, V, exec, vesktop"
         "$mod, C, exec, fluffychat"
@@ -72,12 +73,18 @@
         "$mod SHIFT, L, movewindow, r"
         "$mod SHIFT, K, movewindow, u"
         "$mod SHIFT, J, movewindow, d"
+        "$mod, T, togglefloating"
         "$mod, H, movefocus, l"
         "$mod, L, movefocus, r"
         "$mod, K, movefocus, u"
         "$mod, J, movefocus, d"
         ", XF86AudioPlay, exec, mpc toggle"
         ", Print, exec, grim"
+
+        "$mod, right, resizeactive, 30 0"
+        "$mod, left, resizeactive, -30 0"
+        "$mod, up, resizeactive, 0 -30"
+        "$mod, down, resizeactive, 0 30"
       ]
       ++ (
         builtins.concatLists (builtins.genList
@@ -113,8 +120,14 @@
       decoration = {
         blur = {
           enabled = true;
-          size = 5;
-          passes = 2;
+          size = 9;
+          passes = 4;
+          contrast = 0.8;
+          brightness = 1.1;
+          noise = 0.02;
+          new_optimizations = true;
+          ignore_opacity = true;
+          xray = false;
         };
         rounding = 5;
       };
diff --git a/nix/modules/home/kitty.nix b/nix/modules/home/kitty.nix
index b99736e..b3e6e33 100644
--- a/nix/modules/home/kitty.nix
+++ b/nix/modules/home/kitty.nix
@@ -7,7 +7,7 @@
       font_family = "Iosevka Nerd Font";
       font_size = 14;
       confirm_os_window_close = 0;
-      background_opacity = "0.9";
+      background_opacity = "0.7";
       # Catppuccin theme
       foreground = "#cdd6f4";
       background = "#1e1e2e";