diff --git a/flake.lock b/flake.lock index 047ace7..4302a3c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1745555634, - "narHash": "sha256-lhVyVn1utb2UVTbyKJ6mfKB7wLTjrj14OlebvO0WU2s=", + "lastModified": 1745627989, + "narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=", "owner": "nix-community", "repo": "home-manager", - "rev": "98f4fef7fd7b4a77245db12e33616023162bc6d9", + "rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { diff --git a/modules/hardware/audio.nix b/modules/hardware/audio.nix index 78d30be..a5b126f 100644 --- a/modules/hardware/audio.nix +++ b/modules/hardware/audio.nix @@ -16,7 +16,7 @@ in { }; config = mkIf cfg.enable { - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; services.jack = { jackd.enable = false; alsa.enable = true; diff --git a/modules/wm/hyprland/config/eww/scripts/close.sh b/modules/wm/hyprland/config/eww/scripts/close.sh deleted file mode 100755 index c03d1b6..0000000 --- a/modules/wm/hyprland/config/eww/scripts/close.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -eww close-all diff --git a/modules/wm/hyprland/config/eww/scripts/confirm.sh b/modules/wm/hyprland/config/eww/scripts/confirm.sh deleted file mode 100755 index 5c9b8f0..0000000 --- a/modules/wm/hyprland/config/eww/scripts/confirm.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -read -t 10 -p "Are you sure? Doing it anyway in 10 seconds" input - -if [ $(($?)) = 0 ]; then - $1 -fi diff --git a/modules/wm/hyprland/config/hypr/keybinds.conf b/modules/wm/hyprland/config/hypr/keybinds.conf index efe6190..19714d6 100644 --- a/modules/wm/hyprland/config/hypr/keybinds.conf +++ b/modules/wm/hyprland/config/hypr/keybinds.conf @@ -1,6 +1,6 @@ $mainMod = SUPER $terminal = kitty -$launcher = ~/.config/hypr/open.sh +$launcher = (eww close-all && pkill wofi) || (./.config/eww/scripts/open.sh; wofi --show drun; eww close-all) bind = SUPER, SPACE, exec, $launcher diff --git a/modules/wm/hyprland/config/hypr/open.sh b/modules/wm/hyprland/config/hypr/open.sh deleted file mode 100755 index 007b270..0000000 --- a/modules/wm/hyprland/config/hypr/open.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -(pkill wofi && ~/.config/eww/scripts/close.sh) || - (wofi --show drun & - ~/.config/eww/scripts/open.sh)