feat: expanded all lists

This commit is contained in:
Nick 2025-01-08 19:11:58 -06:00
parent bb0b55b011
commit 4d8d534088
20 changed files with 107 additions and 28 deletions

View file

@ -17,8 +17,19 @@ let
); );
modules = modules =
moduleImport modulesPath (name: builtins.replaceStrings [".nix"] [""] name) moduleImport modulesPath (name:
// moduleImport miscPath (name: "misc-${builtins.replaceStrings [".nix"] [""] name}") builtins.replaceStrings [
".nix"
] [
""
]
name)
// moduleImport miscPath (name: "misc-${builtins.replaceStrings [
".nix"
] [
""
]
name}")
// (path: // (path:
builtins.listToAttrs ( builtins.listToAttrs (
map map

View file

@ -167,7 +167,9 @@ in {
name = "${instances.syncthing.label} (${instances.synology.label})"; name = "${instances.syncthing.label} (${instances.synology.label})";
url = "http://${synology.ip.address0}:${toString instances.syncthing.ports.port0}"; url = "http://${synology.ip.address0}:${toString instances.syncthing.ports.port0}";
tags = tags =
["synology"] [
"synology"
]
++ syncthingTags; ++ syncthingTags;
keyword = instances.syncthing.label; keyword = instances.syncthing.label;
} }
@ -175,7 +177,9 @@ in {
name = "${instances.syncthing.label} (Desktop)"; name = "${instances.syncthing.label} (Desktop)";
url = "http://localhost:${toString instances.syncthing.ports.port0}"; url = "http://localhost:${toString instances.syncthing.ports.port0}";
tags = tags =
["desktop"] [
"desktop"
]
++ syncthingTags; ++ syncthingTags;
keyword = instances.syncthing.label; keyword = instances.syncthing.label;
} }

View file

@ -1,6 +1,17 @@
let let
discordTags = ["disboard" "discord" "dis" "ds" "social"]; discordTags = [
youtubeTags = ["youtube" "you" "tube" "yt"]; "disboard"
"discord"
"dis"
"ds"
"social"
];
youtubeTags = [
"youtube"
"you"
"tube"
"yt"
];
in { in {
name = "Social Media"; name = "Social Media";
toolbar = false; toolbar = false;

View file

@ -1,6 +1,8 @@
{ {
"Spankbang" = { "Spankbang" = {
definedAliases = ["@sb"]; definedAliases = [
"@sb"
];
icon = ./icons/sb.png; icon = ./icons/sb.png;
urls = [ urls = [
{template = "https://spankbang.com/s/{searchTerms}/";} {template = "https://spankbang.com/s/{searchTerms}/";}

View file

@ -12,7 +12,9 @@
} }
{ {
auto-format = true; auto-format = true;
language-servers = ["elm-language-server"]; language-servers = [
"elm-language-server"
];
name = "elm"; name = "elm";
} }
{ {

View file

@ -32,7 +32,12 @@
in { in {
add_newline = false; add_newline = false;
character = let character = let
makeChar = bg: c: surround (makeColor bg) ("[" + c + "](" + makeStyle (makeColor bg) (makeColor colors.crust) + ")"); makeChar = bg: c:
surround (makeColor bg) ("["
+ c
+ "]("
+ makeStyle (makeColor bg) (makeColor colors.crust)
+ ")");
in { in {
error_symbol = makeChar colors.maroon ""; error_symbol = makeChar colors.maroon "";
format = "$symbol"; format = "$symbol";

View file

@ -1,11 +1,15 @@
{ {
keymap.manager.prepend_keymap = [ keymap.manager.prepend_keymap = [
{ {
on = ["Q"]; on = [
"Q"
];
run = "quit"; run = "quit";
} }
{ {
on = ["q"]; on = [
"q"
];
run = "quit --no-cwd-file"; run = "quit --no-cwd-file";
} }
]; ];

View file

@ -14,7 +14,13 @@ let
) )
); );
modules = modules =
moduleImport modulesPath (name: builtins.replaceStrings [".nix"] [""] name) moduleImport modulesPath (name:
builtins.replaceStrings [
".nix"
] [
""
]
name)
// (path: // (path:
builtins.listToAttrs ( builtins.listToAttrs (
map map

View file

@ -5,7 +5,9 @@
package = pkgs.bluez; package = pkgs.bluez;
powerOnBoot = true; powerOnBoot = true;
settings = {General = {Experimental = true;};}; settings = {General = {Experimental = true;};};
disabledPlugins = ["sap"]; disabledPlugins = [
"sap"
];
}; };
}; };
services.blueman.enable = true; services.blueman.enable = true;

View file

@ -21,7 +21,9 @@ in {
sansSerif = [ sansSerif = [
font font
]; ];
emoji = ["Noto Fonts Color Emoji"]; emoji = [
"Noto Fonts Color Emoji"
];
}; };
antialias = true; antialias = true;
}; };

View file

@ -23,7 +23,9 @@
substituters = [ substituters = [
"https://hyprland.cachix.org" "https://hyprland.cachix.org"
]; ];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
];
}; };
}; };
} }

View file

@ -96,7 +96,9 @@ in {
options = [ options = [
"bind" "bind"
]; ];
depends = [server.storage0.mount]; depends = [
server.storage0.mount
];
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [

View file

@ -48,7 +48,9 @@ in {
options = [ options = [
"bind" "bind"
]; ];
depends = [server.storage0.mount]; depends = [
server.storage0.mount
];
}; };
in { in {
"/var/lib/${service.name}" = "/var/lib/${service.name}" =

View file

@ -160,7 +160,10 @@ in {
}; };
}; };
systemd.services.caddy.serviceConfig.ReadWriteDirectories = lib.mkForce ["/var/lib/caddy" "/run/mastodon-web"]; systemd.services.caddy.serviceConfig.ReadWriteDirectories = lib.mkForce [
"/var/lib/caddy"
"/run/mastodon-web"
];
sops = let sops = let
sopsPath = secret: { sopsPath = secret: {
@ -189,7 +192,9 @@ in {
options = [ options = [
"bind" "bind"
]; ];
depends = [server.storage0.mount]; depends = [
server.storage0.mount
];
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [

View file

@ -113,7 +113,9 @@ in {
options = [ options = [
"bind" "bind"
]; ];
depends = [server.storage0.mount]; depends = [
server.storage0.mount
];
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [

View file

@ -55,7 +55,9 @@ in {
options = [ options = [
"bind" "bind"
]; ];
depends = [server.storage0.mount]; depends = [
server.storage0.mount
];
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [

View file

@ -120,7 +120,9 @@ in {
options = [ options = [
"bind" "bind"
]; ];
depends = [server.storage0.mount]; depends = [
server.storage0.mount
];
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
@ -128,7 +130,10 @@ in {
"Z ${service.sops.path0} 755 ${service.name} ${service.name} -" "Z ${service.sops.path0} 755 ${service.name} ${service.name} -"
]; ];
users.users.${service.name}.extraGroups = ["nginx" "caddy"]; users.users.${service.name}.extraGroups = [
"nginx"
"caddy"
];
networking = { networking = {
firewall = { firewall = {

View file

@ -45,7 +45,9 @@ in {
fsType = "cifs"; fsType = "cifs";
options = options =
synology.${synologyDrive}.options synology.${synologyDrive}.options
++ ["credentials=${synologySecrets}"]; ++ [
"credentials=${synologySecrets}"
];
}; };
}; };
@ -65,7 +67,9 @@ in {
fsType = "cifs"; fsType = "cifs";
options = options =
server.${sambaDrive}.options server.${sambaDrive}.options
++ ["credentials=${serverSecrets}"]; ++ [
"credentials=${serverSecrets}"
];
}; };
}; };
in in

View file

@ -40,7 +40,9 @@ in {
fsType = "cifs"; fsType = "cifs";
options = options =
synology.${synologyDrive}.options synology.${synologyDrive}.options
++ ["credentials=${synologySecrets}"]; ++ [
"credentials=${synologySecrets}"
];
}; };
}; };
@ -51,7 +53,9 @@ in {
fsType = "cifs"; fsType = "cifs";
options = options =
server.${sambaDrive}.options server.${sambaDrive}.options
++ ["credentials=${serverSecrets}"]; ++ [
"credentials=${serverSecrets}"
];
}; };
}; };
in in

View file

@ -15,7 +15,9 @@
imports = [ imports = [
./parts ./parts
]; ];
systems = [system]; systems = [
system
];
perSystem = {pkgs, ...}: { perSystem = {pkgs, ...}: {
_module.args.pkgs = import inputs.nixpkgs { _module.args.pkgs = import inputs.nixpkgs {
inherit system; inherit system;