diff --git a/hosts/midas/services/default.nix b/hosts/midas/services/default.nix index f546d3b5..29185594 100644 --- a/hosts/midas/services/default.nix +++ b/hosts/midas/services/default.nix @@ -1,7 +1,6 @@ { ... }: { services = { - blocky.enable = true; cloudflare-dyndns.enable = true; forgejo.enable = true; icecast.enable = true; diff --git a/modules/home/programs/gui/foot/default.nix b/modules/home/programs/gui/foot/default.nix index acd2601b..c91dc8e9 100644 --- a/modules/home/programs/gui/foot/default.nix +++ b/modules/home/programs/gui/foot/default.nix @@ -10,7 +10,7 @@ }; colors = { alpha = "0.85"; - background = "${config.look.colors.dark}"; + background = config.look.colors.dark; regular0 = "3f3f3f"; regular1 = "cc0000"; regular2 = "4e9a06"; diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix index 649f97d1..48d7c771 100644 --- a/modules/home/programs/gui/librewolf/default.nix +++ b/modules/home/programs/gui/librewolf/default.nix @@ -42,7 +42,7 @@ sponsorblock ublock-origin vimium - violentmonkey + violentmonkey ]; commonSearch = { force = true; diff --git a/modules/home/programs/misc/avtools/default.nix b/modules/home/programs/misc/avtools/default.nix index 85c1278b..0e4e4dc4 100644 --- a/modules/home/programs/misc/avtools/default.nix +++ b/modules/home/programs/misc/avtools/default.nix @@ -8,4 +8,6 @@ pulsemixer spotdl ]; + + home.shellAliases.spotopus = "spotdl --m3u --format opus"; } diff --git a/modules/home/programs/terminal/yt-dlp/default.nix b/modules/home/programs/terminal/yt-dlp/default.nix index dae62169..2c03225a 100644 --- a/modules/home/programs/terminal/yt-dlp/default.nix +++ b/modules/home/programs/terminal/yt-dlp/default.nix @@ -1,16 +1,15 @@ -{ config, lib, ... }: +{ config, ... }: { - config = lib.mkIf config.home.desktop.enable { - programs.yt-dlp = { - enable = true; - settings = { - add-metadata = true; - embed-thumbnail = true; - convert-thumbnails = "jpg"; - audio-format = "opus"; - output = ''"%(artist)s - %(title)s.%(ext)s"''; - }; + programs.yt-dlp = { + enable = config.home.desktop.enable; + settings = { + add-metadata = true; + embed-thumbnail = true; + convert-thumbnails = "jpg"; + audio-format = "opus"; + output = ''"%(artist)s - %(title)s.%(ext)s"''; }; - home.shellAliases.opusdl = "yt-dlp -f ba -x --audio-quality 0"; }; + + home.shellAliases.opusdl = "yt-dlp -f ba -x --audio-quality 0"; } diff --git a/modules/home/settings/aliases/default.nix b/modules/home/settings/aliases/default.nix index c3811e97..eb7b803b 100644 --- a/modules/home/settings/aliases/default.nix +++ b/modules/home/settings/aliases/default.nix @@ -8,7 +8,6 @@ # Shortcuts ff = "clear && fastfetch"; - spotdl = "spotdl --m3u --format opus"; copycat = "wl-copy <"; myip = "curl ifconfig.co"; seneca = "ssh jhampton1@matrix.senecapolytechnic.ca"; diff --git a/modules/system/services/general/libvirtd/default.nix b/modules/system/services/general/libvirtd/default.nix index d30cb1e1..8cb556dd 100644 --- a/modules/system/services/general/libvirtd/default.nix +++ b/modules/system/services/general/libvirtd/default.nix @@ -23,13 +23,6 @@ systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 - libvirtd -" ]; - environment.persistence."/persist".directories = [ - "/var/lib/libvirt/dnsmasq" - "/var/lib/libvirt/nwfilter" - "/var/lib/libvirt/qemu" - "/var/lib/libvirt/secrets" - "/var/lib/libvirt/storage" - "/var/lib/libvirt/swtpm" - ]; + environment.persistence."/persist".directories = [ "/var/lib/libvirt" ]; }; } diff --git a/modules/system/services/server/blocky/default.nix b/modules/system/services/server/blocky/default.nix deleted file mode 100644 index 6c69269c..00000000 --- a/modules/system/services/server/blocky/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, ... }: -{ - services.blocky = { - settings = { - upstreams.groups.default = [ - "2606:4700:4700::1111" - "2606:4700:4700::1001" - "1.1.1.1" - "1.0.0.1" - ]; - blocking = { - clientGroupsBlock.default = [ - "pro" - "tif" - ]; - denylists = { - "pro" = [ "https://codeberg.org/hagezi/mirror2/raw/branch/main/dns-blocklists/wildcard/pro.txt" ]; - "tif" = [ "https://codeberg.org/hagezi/mirror2/raw/branch/main/dns-blocklists/wildcard/tif.txt" ]; - }; - }; - caching = { - prefetching = true; - minTime = "1m"; - }; - }; - }; -} diff --git a/modules/system/services/server/default.nix b/modules/system/services/server/default.nix index c1e7490a..6d5cadf6 100644 --- a/modules/system/services/server/default.nix +++ b/modules/system/services/server/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./blocky ./cfdyndns ./forgejo ./icecast