fixed notification volume/brightness removed some gnome applications and updated system + .gitignore

.gitignore

@@ -1,4 +1,2 @@
 .direnv
 .pre-commit-config.yaml
-secrets/id_ed25519
-secrets/id_ed25519.pub

flake.lock

@@ -110,11 +110,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1776184213,
+        "lastModified": 1777607620,
-        "narHash": "sha256-0F+Snir+cD8HRGlf0vpvkhyjUT9HI6Qr+Z3JmUlEtSU=",
+        "narHash": "sha256-GGMDVvqo1PwAB6/7yZg651VzexqECdliZCKXlM0UDwI=",
         "owner": "schembriaiden",
         "repo": "helium-browser-nix-flake",
-        "rev": "6ae2aaea1a019b8f52886041e6779919d1c1cc60",
+        "rev": "10105224eea589de8f0b3292f4e4bca3d52f1ee2",
         "type": "github"
       },
       "original": {
@@ -166,11 +166,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775970782,
+        "lastModified": 1777181277,
-        "narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=",
+        "narHash": "sha256-yVJbd07ortDRAttDFmDV5p220aOLTHgVAx//0nW/xW8=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "bedba5989b04614fc598af9633033b95a937933f",
+        "rev": "b8eb7acee0f7604fe1bf6a5b3dcf5254369180fa",
         "type": "github"
       },
       "original": {
@@ -181,11 +181,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775710090,
+        "lastModified": 1777268161,
-        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
         "type": "github"
       },
       "original": {
@@ -264,11 +264,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775710180,
+        "lastModified": 1777612697,
-        "narHash": "sha256-sCokvdNvl8zIzsnjgG0TN5h3RUI7GJyWW9ErfmEj0rM=",
+        "narHash": "sha256-h+tXBNMDrsKbD1UnYw0IeSIT4RalHtIJ1GLOviib7/8=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "2c138beb648d1cbbfae76695a8230ee04e4db25a",
+        "rev": "f9f70d14f9a57c7962c5cfe589461c1391044448",
         "type": "github"
       },
       "original": {

home/packages/packages.nix

@@ -36,12 +36,7 @@
     weathr
     # gnome
     dconf-editor
-    file-roller
-    gnome-control-center
-    gnome-text-editor
-    nautilus
     (papers.override {supportNautilus = true;})
-    inkscape
     scrcpy
     android-tools
     awww

home/packages/wayland/niri/_binds.nix

@@ -17,7 +17,7 @@
   };
   "XF86AudioMute" = {
     _props.allow-when-locked = true;
-    spawn._args = ["wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"];
+    spawn._args = ["sh" "-c" "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && /etc/nixos/scripts/volume-notify.sh"];
   };
   "XF86AudioMicMute" = {
     _props.allow-when-locked = true;
@@ -25,19 +25,19 @@
   };
   "XF86AudioRaiseVolume" = {
     _props.allow-when-locked = true;
-    spawn._args = ["wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%+"];
+    spawn._args = ["sh" "-c" "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && /etc/nixos/scripts/volume-notify.sh"];
   };
   "XF86AudioLowerVolume" = {
     _props.allow-when-locked = true;
-    spawn._args = ["wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%-"];
+    spawn._args = ["sh" "-c" "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && /etc/nixos/scripts/volume-notify.sh"];
   };
   "XF86MonBrightnessUp" = {
     _props.allow-when-locked = true;
-    spawn._args = ["brightnessctl" "set" "10%+"];
+    spawn._args = ["sh" "-c" "brightnessctl set 10%+ && /etc/nixos/scripts/brightness-notify.sh"];
   };
   "XF86MonBrightnessDown" = {
     _props.allow-when-locked = true;
-    spawn._args = ["brightnessctl" "set" "10%-"];
+    spawn._args = ["sh" "-c" "brightnessctl set 10%- && /etc/nixos/scripts/brightness-notify.sh"];
   };
   "Print".spawn._args = ["sh" "-c" "grim -g \"$(slurp)\" - | satty --filename - --output-filename ~/Pictures/Screenshots/satty-$(date +%Y%m%d-%H%M%S).png"];
   "Mod+B".spawn._args = ["zen"];

home/packages/wayland/niri/_settings.nix

@@ -20,7 +20,7 @@ in {
   spawn-at-startup = [
     ["wl-paste" "--watch" "cliphist" "store"]
     ["wl-paste" "--type" "text" "--watch" "cliphist" "store"]
-    ["dunst"]
+    ["mako"]
     ["ashell"]
     ["elephant"]
     ["copyq"]

home/services/wayland/dunst.nix

@@ -1,54 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  users.users.someone.packages = [pkgs.dunst];
-
-  xdg.configFile."dunst/dunstrc".text = ''
-    [global]
-    width = 300
-    height = 100
-    offset = 10x10
-    origin = top-right
-    frame_width = 0
-    frame_color = "#1f1d2e"
-    separator_color = "#313244"
-    font = "Source Code Pro 10"
-    line_height = 4
-    icon_position = left
-    max_icon_size = 48
-    min_icon_size = 24
-    show_age_threshold = 60
-    word_wrap = yes
-    ellipsize = middle
-    ignore_newline = no
-    stack_duplicates = true
-    hide_duplicate_count = false
-    show_indicators = yes
-    enable_recursive_icon_lookup = true
-    always_merge_stack_duplicates = false
-    icon_theme = "Papirus-Dark"
-    corner_radius = 8
-    scale = 1
-    monitor = 0
-    sort = yes
-    notification_limit = 0
-
-    [urgency_low]
-    background = "#1f1d2e"
-    foreground = "#cdd6f4"
-    frame_color = "#89b4fa"
-
-    [urgency_normal]
-    background = "#1f1d2e"
-    foreground = "#cdd6f4"
-    frame_color = "#89b4fa"
-
-    [urgency_critical]
-    background = "#1f1d2e"
-    foreground = "#f38ba8"
-    frame_color = "#f38ba8"
-  '';
-}

home/services/wayland/mako.nix

@@ -0,0 +1,47 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  users.users.someone.packages = [pkgs.mako];
+
+  xdg.configFile."mako/config".text = ''
+    background-color=#282828
+    text-color=#FAB387
+    border-color=#ebdbb2
+    progress-color=#FAB387
+    
+    font=SauceCodePro Nerd Font 10
+    width=300
+    height=100
+    margin=20
+    padding=15
+    border-size=2
+    border-radius=2
+    icons=1
+    max-icon-size=48
+    default-timeout=5000
+    group-by=category
+    
+    [urgency=low]
+    border-color=#928374
+    
+    [urgency=normal]
+    border-color=#b8bb26
+    
+    [urgency=critical]
+    border-color=#fb4934
+    default-timeout=0
+
+    [category=osd]
+    anchor=bottom-center
+    width=200
+    height=60
+    margin=0,0,100,0
+    padding=10
+    default-timeout=2000
+    text-alignment=center
+    border-color=#b8bb26
+  '';
+}

home/terminal/software/tui.nix

@@ -13,6 +13,7 @@
 
       # misc
       mako
+      libnotify
       fontconfig
 
       # utils

nixpkgs/bitwig.nix

@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      bitwig-studio = prev.bitwig-studio.overrideAttrs (oldAttrs: {
-        version = "6.0";
-        src = pkgs.fetchurl {
-          url = "https://www.bitwig.com/dl/Bitwig%20Studio/6.0/installer_linux/";
-          hash = "8eb09381ac5f79685f2b02de28b9aa4d0592ed155b5671ea2742270a2a669bc9";
-        };
-        # Inherit the original package's meta information
-        meta = oldAttrs.meta;
-      });
-    })
-  ];
-}

scripts/brightness-notify.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+BRIGHTNESS=$(brightnessctl -m | cut -d, -f4 | tr -d '%')
+
+notify-send -h string:x-canonical-private-synchronous:brightness \
+            -h "int:value:$BRIGHTNESS" \
+            -c "osd" \
+            "Brightness: ${BRIGHTNESS}%" -i display-brightness

scripts/volume-notify.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+VOLUME=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk '{print $2 * 100}')
+MUTE=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | grep -c "MUTED")
+
+if [ "$MUTE" -ne 0 ]; then
+    notify-send -h string:x-canonical-private-synchronous:volume \
+                -h "int:value:0" \
+                -c "osd" \
+                "Muted" -i audio-volume-muted
+else
+    notify-send -h string:x-canonical-private-synchronous:volume \
+                -h "int:value:$VOLUME" \
+                -c "osd" \
+                "Volume: ${VOLUME}%" -i audio-volume-high
+fi