noctalia is kinda cool...

5 files changed, 25 insertions, 38 deletions

diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index b9882f6..a1faded 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -1,6 +1,6 @@
 {config, ...}: {
   collinux = {
-    theme = "adwaita";
+    theme = "catppuccin";
 
     secrets = {};
 
@@ -9,7 +9,7 @@
     desktop = {
       wallpaper =
         if (config.collinux.theme == "catppuccin")
-        then ./wallpapers/abstract-swirls.jpg
+        then ./wallpapers/astronaut.jpg
         else ./wallpapers/hintergrund2.png;
       gtk.enable = true;
       qt.enable = true;
@@ -20,12 +20,12 @@
       };
 
       wm = {
-        sway.enable = true;
+        niri.enable = true;
+        # sway.enable = true;
         kdeDesktopPortal.enable = true;
 
         components = {
           fuzzel.enable = true;
-          dunst.enable = true;
         };
       };
 
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index 3625e7b..b1ca4d9 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -5,8 +5,7 @@
     musescore
     (pkgs.callPackage ../../pkgs/obsidian.nix {})
 
-    lmms # (?)
-    eq10q
+    noctalia-shell
 
     prismlauncher
     mpv
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 25b5a91..764f6f5 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -14,6 +14,7 @@
   facter.reportPath = ./facter.json;
 
   services.dbus.implementation = "broker";
+  services.upower.enable = true;
 
   environment.defaultPackages = lib.mkForce []; # im not a noob
 
diff --git a/modules/desktop/hjem/programs/foot.nix b/modules/desktop/hjem/programs/foot.nix
index a28a269..74bb8a6 100644
--- a/modules/desktop/hjem/programs/foot.nix
+++ b/modules/desktop/hjem/programs/foot.nix
@@ -15,7 +15,7 @@
     # key-bindings.spawn-terminal = "Control+Return";
 
     colors-dark = with config.collinux.palette; {
-      alpha = "0.6";
+      alpha = "0.85";
 
       foreground = base05;
       background = base00;
diff --git a/modules/desktop/hjem/wm/niri.nix b/modules/desktop/hjem/wm/niri.nix
index c6826af..ba17037 100644
--- a/modules/desktop/hjem/wm/niri.nix
+++ b/modules/desktop/hjem/wm/niri.nix
@@ -9,8 +9,7 @@ in
   lib.mkIf cfg.enable {
     files.".config/niri/config.kdl".text = ''
       spawn-sh-at-startup "${config.collinux.desktop.wallpaper_cmd}"
-      spawn-at-startup "${pkgs.playerctl}/bin/playerctld daemon"
-      spawn-at-startup "dunst"
+      spawn-at-startup "noctalia-shell"
 
       prefer-no-csd
       environment {
@@ -45,10 +44,10 @@ in
         Mod+S repeat=false { screenshot; }
         Mod+M repeat=false { maximize-column; }
 
-        XF86MonBrightnessUp { spawn "~/.config/util.lua" "brightness" "5%+"; }
-        XF86MonBrightnessDown { spawn "~/.config/util.lua" "brightness" "5%-"; }
-        XF86AudioRaiseVolume { spawn "~/.config/util.lua" "vol" "5%+"; }
-        XF86AudioLowerVolume { spawn "~/.config/util.lua" "vol" "5%-"; }
+        XF86MonBrightnessUp { spawn-sh "noctalia-shell ipc call brightness increase"; }
+        XF86MonBrightnessDown { spawn-sh "noctalia-shell ipc call brightness decrease"; }
+        XF86AudioRaiseVolume { spawn-sh "noctalia-shell ipc call volume increase"; }
+        XF86AudioLowerVolume { spawn-sh "noctalia-shell ipc call volume decrease"; }
       }
 
       gestures {
@@ -71,13 +70,6 @@ in
           off
         }
 
-        border {
-          width 3
-          active-color "#ffffff00"
-          inactive-color "#ffffff00"
-          urgent-color "#ffffff00"
-        }
-
         struts {
           left 0
           right 0
@@ -85,26 +77,22 @@ in
           bottom 0
         }
 
-        background-color "transparent"
-      }
+        border {
+          width 2
+          active-color "#89b4faff"
+          inactive-color "#ffffff00"
+        }
 
-      layer-rule {
-          match namespace="^wallpaper$"
-          place-within-backdrop true
+        background-color "transparent"
       }
 
-      layer-rule {
-        match namespace="^launcher$"
-        shadow {
-          on
-        }
+      blur {
+        on
       }
 
       layer-rule {
-        match namespace="^notifications$"
-        shadow {
-          on
-        }
+          match namespace="^wallpaper$"
+          place-within-backdrop true
       }
 
       window-rule {
@@ -113,12 +101,11 @@ in
       }
 
       window-rule {
-        match is-focused=true
-        shadow {
-          on
+        match app-id="foot"
+        background-effect {
+          blur true
         }
       }
-
     '';
 
     packages = [pkgs.niri pkgs.xwayland-satellite];