diff --git a/flake.lock b/flake.lock index a58b2b3..214d117 100644 --- a/flake.lock +++ b/flake.lock @@ -679,24 +679,6 @@ "type": "github" } }, - "musnix": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1777848538, - "narHash": "sha256-Dj51C0NWsglqRrCpdmMr2nFiYacFOid1Tor4H9yG2HY=", - "owner": "musnix", - "repo": "musnix", - "rev": "8548782f0d1d0928daa3fffde8a008f72219a3f3", - "type": "github" - }, - "original": { - "owner": "musnix", - "repo": "musnix", - "type": "github" - } - }, "nix-flatpak": { "locked": { "lastModified": 1767983141, @@ -804,22 +786,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1786820742, "narHash": "sha256-NqFjXL1rR+G++M7tsEaJynI9MqpQpMGazpI/4VAHe9I=", @@ -834,7 +800,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1786348146, "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=", @@ -850,7 +816,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1767026758, "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", @@ -866,7 +832,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1786599213, "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", @@ -885,7 +851,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "systems": "systems_3" }, "locked": { @@ -934,9 +900,8 @@ "home-manager": "home-manager", "hyprsplit": "hyprsplit", "millennium": "millennium", - "musnix": "musnix", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-patch-xdg-desktop-portal": "nixpkgs-patch-xdg-desktop-portal", "nixpkgs-patcher": "nixpkgs-patcher", "nixvim": "nixvim", @@ -1114,7 +1079,7 @@ "inputs": { "crane": "crane", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "xremap": "xremap" }, "locked": { @@ -1134,7 +1099,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1786764320, diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index c0312dc..d0d0dee 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -43,17 +43,6 @@ powerOnBoot = false; }; - environment.systemPackages = [ - (pkgs.writeShellScriptBin "enable-hypervisor" '' - sudo modprobe -r kvm_amd kvm - sudo modprobe cpuid_fault_emulation - '') - (pkgs.writeShellScriptBin "disable-hypervisor" '' - sudo modprobe -r cpuid_fault_emulation - sudo modprobe kvm_amd kvm - '') - ]; - networking.hostName = "nixos-desktop"; networking.firewall.enable = true; networking.networkmanager.enable = true; diff --git a/modules/home/mpd.nix b/modules/home/mpd.nix index 4ee72af..972006b 100644 --- a/modules/home/mpd.nix +++ b/modules/home/mpd.nix @@ -4,6 +4,7 @@ musicDirectory = "/home/user/Music"; playlistDirectory = "/home/user/Music/Playlists"; dbFile = "/home/user/.config/mpd/database"; + network.listenAddress = "/tmp/mpd_socket"; # log_file = "~/.config/mpd/log"; extraConfig = '' save_absolute_paths_in_playlists "yes" @@ -22,7 +23,6 @@ max_playlist_length "131072" max_output_buffer_size "32768" ''; - network.listenAddress = "/home/user/.config/mpd/socket"; }; services.mpdscribble = { @@ -41,7 +41,7 @@ #![enable(unwrap_newtypes)] #![enable(unwrap_variant_newtypes)] ( - address: "/home/user/.config/mpd/socket", + address: "/tmp/mpd_socket", password: None, theme: Some("default"), cache_dir: Some("/home/user/Music/rmpc"), @@ -97,7 +97,7 @@ "O": ShowOutputs, "P": ShowDecoders, "R": AddRandom, - "": ExternalCommand(command: ["/home/user/.scripts/check-playlist.sh"], description: "Check if selected song is already in a playlist"), + "": ExternalCommand(command: ["check-playlist"], description: "Check if selected song is already in a playlist"), }, navigation: { "k": Up, diff --git a/modules/scripts.nix b/modules/scripts.nix index 90c91a9..87c1fa1 100644 --- a/modules/scripts.nix +++ b/modules/scripts.nix @@ -11,6 +11,7 @@ fi ' _ {} | sort '') + (pkgs.writeShellScriptBin "2scan" '' find . -type f \( -iname "*.mp3" -o -iname "*.flac" -o -iname "*.m4a" -o -iname "*.ogg" -o -iname "*.wav" -o -iname "*.aiff" \) -print0 | xargs -0 -P"$(nproc)" -I{} sh -c ' @@ -21,5 +22,58 @@ fi ' _ {} '') + + (pkgs.writeShellScriptBin "enable-hypervisor" '' + sudo modprobe -r kvm_amd kvm + sudo modprobe cpuid_fault_emulation + '') + + (pkgs.writeShellScriptBin "disable-hypervisor" '' + sudo modprobe -r cpuid_fault_emulation + sudo modprobe kvm_amd kvm + '') + + (pkgs.writeShellScriptBin "check-playlist" '' + PLAYLIST_DIR="/home/user/Music/Playlists/" + BASENAME="/home/user/Music/$SELECTED_SONGS" + # echo $BASENAME | kitty +kitten clipboard + shopt -s extglob + if grep -q "$BASENAME" "$PLAYLIST_DIR"/!(new|lostfrog).m3u + then + notify-send "Song is in a playlist"; + else + notify-send "Song isnt in a playlist"; + fi + '') + + (pkgs.writeShellScriptBin "mpd-volume" '' + if [ $# != 1 ]; then + echo "Usage: ''${0} up|down" + exit 1 + fi + + STEP=5 + + get_vol() { + mpc --host=/tmp/mpd_socket volume + } + + set_vol() { + mpc --host=/tmp/mpd_socket volume "$1" + } + + case "$1" in + up) + set_vol +$((STEP)) + ;; + down) + set_vol -$((STEP)) + ;; + *) + echo "Usage: ''${0} up|down" + exit 1 + ;; + esac + '') ]; }