removing obsolete stuff

6 files changed, 38 insertions, 21 deletions

diff --git a/hm/editors/nixvim/nixvim.nix b/hm/editors/nixvim/nixvim.nix
index 068012f..835556a 100644
--- a/hm/editors/nixvim/nixvim.nix
+++ b/hm/editors/nixvim/nixvim.nix
@@ -260,7 +260,7 @@ in
         lsp = {
           enable = true;
           servers = {
-            # zls.enable = true;
+            zls.enable = true;
             nil_ls.enable = true;
             clangd.enable = true;
           };
diff --git a/hm/env/env.nix b/hm/env/env.nix
index 80e19f8..a5caec2 100644
--- a/hm/env/env.nix
+++ b/hm/env/env.nix
@@ -11,5 +11,6 @@
     ./swaylock.nix
     ./theme.nix
     ./waybar.nix
+    ./mako.nix
   ];
 }
diff --git a/hm/env/mako.nix b/hm/env/mako.nix
new file mode 100644
index 0000000..3f9e3ef
--- /dev/null
+++ b/hm/env/mako.nix
@@ -0,0 +1,15 @@
+{ config, lib, ... }:
+let
+  cfg = config.hm.env.mako;
+in
+{
+  options.hm.env.mako.enable = lib.mkEnableOption "enables mako notifications";
+  config = lib.mkIf cfg.enable {
+    services.mako = {
+      enable = true;
+      settings = {
+
+      };
+    };
+  };
+}
diff --git a/hm/env/niri/binds.nix b/hm/env/niri/binds.nix
index c071d2e..ff8353e 100644
--- a/hm/env/niri/binds.nix
+++ b/hm/env/niri/binds.nix
@@ -9,7 +9,7 @@ with config.lib.niri.actions;
 let
   playerctl = spawn "${pkgs.playerctl}/bin/playerctl";
   ssPath = "${toString config.hm.conf.xdg-dirs.storagePath}/pics/ss/$(date +%Y-%m-%d_%H-%M-%S)";
-  # obsPass = osConfig.sops.secrets."obs/websocket_password".path;
+  obsPass = osConfig.sops.secrets."obs/websocket_password".path;
 in
 {
   # --- System & Media ---
@@ -21,7 +21,7 @@ in
   XF86AudioLowerVolume.action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "3%-";
   XF86AudioMute.action =
     spawn "sh" "-c"
-      "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
+      "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle && toggle-mute-notify";
 
   # Media Control
   XF86AudioPlay.action = playerctl "play-pause";
@@ -29,14 +29,14 @@ in
   XF86AudioNext.action = playerctl "next";
 
   # Brightness
-  XF86MonBrightnessUp.action = spawn "light" "-A" "10";
-  XF86MonBrightnessDown.action = spawn "light" "-U" "10";
+  XF86MonBrightnessUp.action = spawn "brightnessctl" "set" "5%+";
+  XF86MonBrightnessDown.action = spawn "brightnessctl" "set" "5%-";
 
   # --- Applications ---
   "Mod+Return".action = spawn "footclient";
   "Mod+D".action = spawn "fuzzel";
   "Mod+Shift+D".action = spawn "sh" "-c" "cliphist list | fuzzel --dmenu | cliphist decode | wl-copy";
-  # "Super+Return".action = spawn "sh" "-c" "OBS_WEBSOCKET_URL=$(cat ${obsPass}) obs-cmd replay save";
+  "Super+Return".action = spawn "sh" "-c" "OBS_WEBSOCKET_URL=$(cat ${obsPass}) obs-cmd replay save";
 
   "Super+C".action = spawn "qalculate-gtk";
   "Super+D".action = spawn "equibop";
@@ -68,6 +68,10 @@ in
   };
 
   XF86Tools = {
+    action = spawn "sh" "-c" "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle && toggle-mute-notify";
+    repeat = false;
+  };
+  "Mod+XF86Tools" = {
     action =
       spawn "sh" "-c"
         "niri msg action set-dynamic-cast-window --id $(niri msg --json pick-window | ${pkgs.jq}/bin/jq .id)";
diff --git a/hm/shell/foot.nix b/hm/shell/foot.nix
index 91dbfa0..1a86474 100644
--- a/hm/shell/foot.nix
+++ b/hm/shell/foot.nix
@@ -8,14 +8,10 @@
 let
   cfg = config.hm.shell.foot;
 
-  footTheme = pkgs.runCommand "gruvbox-dark" { } ''
-    sed -e 's/\[colors-dark\]/\[colors\]/g' ${
-      pkgs.fetchurl {
-        url = "https://codeberg.org/dnkl/foot/raw/branch/master/themes/gruvbox-dark";
-        sha256 = "sha256-hlmLklG/vAEDy8I+k13+o4ZR6Cq6lTxOconjf9M75eo=";
-      }
-    } > $out
-  '';
+  footTheme = pkgs.fetchurl {
+    url = "https://codeberg.org/dnkl/foot/raw/branch/master/themes/gruvbox-dark";
+    sha256 = "sha256-hlmLklG/vAEDy8I+k13+o4ZR6Cq6lTxOconjf9M75eo=";
+  };
 in
 {
   options.hm.shell.foot = {
diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix
index 8e5ae12..a929b2e 100644
--- a/hm/soft/nixcord.nix
+++ b/hm/soft/nixcord.nix
@@ -16,6 +16,7 @@ in
     home.packages = with pkgs; [
       stoat-desktop
       element-desktop
+      gajim
     ];
     programs.nixcord = {
       enable = true;
@@ -51,7 +52,7 @@ in
             enable = true;
             domain = false;
           };
-          anammox.enable = true;
+          # anammox.enable = true;
           betterGifAltText.enable = true;
           # betterGifPicker = {
           #   enable = true;
@@ -108,14 +109,14 @@ in
             preventDuplicates = true;
             showCopyImageLink = true;
           };
-          gifRoulette = {
-            enable = true;
-            pingOwnerChance = false;
-          };
+          # gifRoulette = {
+          #   enable = true;
+          #   pingOwnerChance = false;
+          # };
           guildTagSettings.enable = true;
           homeTyping.enable = true;
           iLoveSpam.enable = true;
-          ignoreTerms.enable = true;
+          # ignoreTerms.enable = true;
           imageFilename = {
             enable = true;
             showFullUrl = true;
@@ -157,7 +158,7 @@ in
           };
           noF1.enable = true;
           noMaskedUrlPaste.enable = true;
-          noModalAnimation.enable = true;
+          # noModalAnimation.enable = true;
           noMosaic.enable = true;
           noNitroUpsell.enable = true;
           noOnboardingDelay.enable = true;