From eb34493b18846c10fa69daf463833a59ac31b494 Mon Sep 17 00:00:00 2001
From: Vice <vice@nixfox.ca>
Date: Wed, 5 Mar 2025 02:17:33 -0500
Subject: [PATCH] Simplify some vars and such

---
 modules/home/programs/gui/looking-glass/default.nix | 11 +----------
 modules/home/programs/misc/avtools/default.nix      |  1 +
 modules/home/programs/misc/general/default.nix      |  1 -
 modules/home/programs/misc/headless/default.nix     |  3 ++-
 modules/home/programs/terminal/default.nix          |  1 -
 modules/home/programs/terminal/ranger/default.nix   |  2 +-
 modules/home/programs/terminal/spotdl/default.nix   |  7 -------
 modules/home/services/mpd/default.nix               |  2 +-
 modules/home/settings/aliases/default.nix           |  1 +
 9 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 modules/home/programs/terminal/spotdl/default.nix

diff --git a/modules/home/programs/gui/looking-glass/default.nix b/modules/home/programs/gui/looking-glass/default.nix
index 9e1f6b10..9c1a0cea 100644
--- a/modules/home/programs/gui/looking-glass/default.nix
+++ b/modules/home/programs/gui/looking-glass/default.nix
@@ -2,15 +2,6 @@
 {
   programs.looking-glass-client = {
     enable = if config.home.desktop.enable && config.nixpkgs.system == "x86_64-linux" then true else false;
-    settings = {
-      input = {
-        rawMouse = true;
-        escapeKey = 62;
-      };
-      spice = {
-        enable = true;
-        audio = true;
-      };
-    };
+    settings.input.rawMouse = true;
   };
 }
diff --git a/modules/home/programs/misc/avtools/default.nix b/modules/home/programs/misc/avtools/default.nix
index 489405e1..1c5699ef 100644
--- a/modules/home/programs/misc/avtools/default.nix
+++ b/modules/home/programs/misc/avtools/default.nix
@@ -5,5 +5,6 @@
     ffmpegthumbnailer
     puddletag
     pulsemixer
+    spotdl
   ];
 }
diff --git a/modules/home/programs/misc/general/default.nix b/modules/home/programs/misc/general/default.nix
index f0c73a98..66bc2df4 100644
--- a/modules/home/programs/misc/general/default.nix
+++ b/modules/home/programs/misc/general/default.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 {
   home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
-    bc
     libreoffice
     vesktop
   ];
diff --git a/modules/home/programs/misc/headless/default.nix b/modules/home/programs/misc/headless/default.nix
index ecdc584b..0dcbb42f 100644
--- a/modules/home/programs/misc/headless/default.nix
+++ b/modules/home/programs/misc/headless/default.nix
@@ -1,6 +1,7 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
+    bc
     dua
     p7zip
     vimv
diff --git a/modules/home/programs/terminal/default.nix b/modules/home/programs/terminal/default.nix
index 58754429..7122a888 100644
--- a/modules/home/programs/terminal/default.nix
+++ b/modules/home/programs/terminal/default.nix
@@ -10,7 +10,6 @@
     ./nh
     ./nix-index
     ./ranger
-    ./spotdl
     ./tmux
     ./yt-dlp
     ./zsh
diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix
index b1d4b857..1c86c4c5 100644
--- a/modules/home/programs/terminal/ranger/default.nix
+++ b/modules/home/programs/terminal/ranger/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
 {
   programs.ranger = {
     enable = true;
diff --git a/modules/home/programs/terminal/spotdl/default.nix b/modules/home/programs/terminal/spotdl/default.nix
deleted file mode 100644
index 98a1511e..00000000
--- a/modules/home/programs/terminal/spotdl/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  home = lib.mkIf config.home.desktop.enable {
-    packages = with pkgs; [ spotdl ];
-    shellAliases.spotdl = "spotdl --m3u --format opus";
-  };
-}
diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix
index 4666df03..41be19e5 100644
--- a/modules/home/services/mpd/default.nix
+++ b/modules/home/services/mpd/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   services.mpd = {
     enable = config.home.desktop.enable;
diff --git a/modules/home/settings/aliases/default.nix b/modules/home/settings/aliases/default.nix
index ef64b67a..7debe8b1 100644
--- a/modules/home/settings/aliases/default.nix
+++ b/modules/home/settings/aliases/default.nix
@@ -14,6 +14,7 @@
     ff = "clear && fastfetch";
     ip = "ip -c";
     cat = "${pkgs.bat}/bin/bat --paging never";
+    spotdl = "spotdl --m3u --format opus";
     copycat = "wl-copy <";
     myip = "curl ifconfig.co";
     seneca = "ssh jhampton1@matrix.senecapolytechnic.ca";