Update some formatting and move aliases into app specific nix files
This commit is contained in:
parent
fb06bdf1f0
commit
c50925b74b
9 changed files with 16 additions and 52 deletions
|
@ -1,7 +1,6 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
services = {
|
services = {
|
||||||
blocky.enable = true;
|
|
||||||
cloudflare-dyndns.enable = true;
|
cloudflare-dyndns.enable = true;
|
||||||
forgejo.enable = true;
|
forgejo.enable = true;
|
||||||
icecast.enable = true;
|
icecast.enable = true;
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
};
|
};
|
||||||
colors = {
|
colors = {
|
||||||
alpha = "0.85";
|
alpha = "0.85";
|
||||||
background = "${config.look.colors.dark}";
|
background = config.look.colors.dark;
|
||||||
regular0 = "3f3f3f";
|
regular0 = "3f3f3f";
|
||||||
regular1 = "cc0000";
|
regular1 = "cc0000";
|
||||||
regular2 = "4e9a06";
|
regular2 = "4e9a06";
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
sponsorblock
|
sponsorblock
|
||||||
ublock-origin
|
ublock-origin
|
||||||
vimium
|
vimium
|
||||||
violentmonkey
|
violentmonkey
|
||||||
];
|
];
|
||||||
commonSearch = {
|
commonSearch = {
|
||||||
force = true;
|
force = true;
|
||||||
|
|
|
@ -8,4 +8,6 @@
|
||||||
pulsemixer
|
pulsemixer
|
||||||
spotdl
|
spotdl
|
||||||
];
|
];
|
||||||
|
|
||||||
|
home.shellAliases.spotopus = "spotdl --m3u --format opus";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
{ config, lib, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
config = lib.mkIf config.home.desktop.enable {
|
programs.yt-dlp = {
|
||||||
programs.yt-dlp = {
|
enable = config.home.desktop.enable;
|
||||||
enable = true;
|
settings = {
|
||||||
settings = {
|
add-metadata = true;
|
||||||
add-metadata = true;
|
embed-thumbnail = true;
|
||||||
embed-thumbnail = true;
|
convert-thumbnails = "jpg";
|
||||||
convert-thumbnails = "jpg";
|
audio-format = "opus";
|
||||||
audio-format = "opus";
|
output = ''"%(artist)s - %(title)s.%(ext)s"'';
|
||||||
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";
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
# Shortcuts
|
# Shortcuts
|
||||||
ff = "clear && fastfetch";
|
ff = "clear && fastfetch";
|
||||||
spotdl = "spotdl --m3u --format opus";
|
|
||||||
copycat = "wl-copy <";
|
copycat = "wl-copy <";
|
||||||
myip = "curl ifconfig.co";
|
myip = "curl ifconfig.co";
|
||||||
seneca = "ssh jhampton1@matrix.senecapolytechnic.ca";
|
seneca = "ssh jhampton1@matrix.senecapolytechnic.ca";
|
||||||
|
|
|
@ -23,13 +23,6 @@
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 - libvirtd -" ];
|
systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 - libvirtd -" ];
|
||||||
|
|
||||||
environment.persistence."/persist".directories = [
|
environment.persistence."/persist".directories = [ "/var/lib/libvirt" ];
|
||||||
"/var/lib/libvirt/dnsmasq"
|
|
||||||
"/var/lib/libvirt/nwfilter"
|
|
||||||
"/var/lib/libvirt/qemu"
|
|
||||||
"/var/lib/libvirt/secrets"
|
|
||||||
"/var/lib/libvirt/storage"
|
|
||||||
"/var/lib/libvirt/swtpm"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -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";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./blocky
|
|
||||||
./cfdyndns
|
./cfdyndns
|
||||||
./forgejo
|
./forgejo
|
||||||
./icecast
|
./icecast
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue