diff --git a/home/default.nix b/home/default.nix index ca51b04..d8382c3 100755 --- a/home/default.nix +++ b/home/default.nix @@ -17,8 +17,19 @@ let ); modules = - moduleImport modulesPath (name: builtins.replaceStrings [".nix"] [""] name) - // moduleImport miscPath (name: "misc-${builtins.replaceStrings [".nix"] [""] name}") + moduleImport modulesPath (name: + builtins.replaceStrings [ + ".nix" + ] [ + "" + ] + name) + // moduleImport miscPath (name: "misc-${builtins.replaceStrings [ + ".nix" + ] [ + "" + ] + name}") // (path: builtins.listToAttrs ( map diff --git a/home/modules/firefox/config/bookmarks/config/flake/selfHosted.nix b/home/modules/firefox/config/bookmarks/config/flake/selfHosted.nix index 0d2a6f8..6672689 100755 --- a/home/modules/firefox/config/bookmarks/config/flake/selfHosted.nix +++ b/home/modules/firefox/config/bookmarks/config/flake/selfHosted.nix @@ -167,7 +167,9 @@ in { name = "${instances.syncthing.label} (${instances.synology.label})"; url = "http://${synology.ip.address0}:${toString instances.syncthing.ports.port0}"; tags = - ["synology"] + [ + "synology" + ] ++ syncthingTags; keyword = instances.syncthing.label; } @@ -175,7 +177,9 @@ in { name = "${instances.syncthing.label} (Desktop)"; url = "http://localhost:${toString instances.syncthing.ports.port0}"; tags = - ["desktop"] + [ + "desktop" + ] ++ syncthingTags; keyword = instances.syncthing.label; } diff --git a/home/modules/firefox/config/bookmarks/config/socialMedia.nix b/home/modules/firefox/config/bookmarks/config/socialMedia.nix index b92975e..37543eb 100755 --- a/home/modules/firefox/config/bookmarks/config/socialMedia.nix +++ b/home/modules/firefox/config/bookmarks/config/socialMedia.nix @@ -1,6 +1,17 @@ let - discordTags = ["disboard" "discord" "dis" "ds" "social"]; - youtubeTags = ["youtube" "you" "tube" "yt"]; + discordTags = [ + "disboard" + "discord" + "dis" + "ds" + "social" + ]; + youtubeTags = [ + "youtube" + "you" + "tube" + "yt" + ]; in { name = "Social Media"; toolbar = false; diff --git a/home/modules/firefox/config/search/config/spank.nix b/home/modules/firefox/config/search/config/spank.nix index 5d3dbbf..1ac3ecc 100755 --- a/home/modules/firefox/config/search/config/spank.nix +++ b/home/modules/firefox/config/search/config/spank.nix @@ -1,6 +1,8 @@ { "Spankbang" = { - definedAliases = ["@sb"]; + definedAliases = [ + "@sb" + ]; icon = ./icons/sb.png; urls = [ {template = "https://spankbang.com/s/{searchTerms}/";} diff --git a/home/modules/helix/config/languages.nix b/home/modules/helix/config/languages.nix index 5cf8d24..f22b576 100755 --- a/home/modules/helix/config/languages.nix +++ b/home/modules/helix/config/languages.nix @@ -12,7 +12,9 @@ } { auto-format = true; - language-servers = ["elm-language-server"]; + language-servers = [ + "elm-language-server" + ]; name = "elm"; } { diff --git a/home/modules/starship/config/settings.nix b/home/modules/starship/config/settings.nix index cdc9ca2..ab55412 100755 --- a/home/modules/starship/config/settings.nix +++ b/home/modules/starship/config/settings.nix @@ -32,7 +32,12 @@ in { add_newline = false; 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 { error_symbol = makeChar colors.maroon "⊥"; format = "$symbol"; diff --git a/home/modules/yazi/config/keymap.nix b/home/modules/yazi/config/keymap.nix index 34df0cd..b35618c 100755 --- a/home/modules/yazi/config/keymap.nix +++ b/home/modules/yazi/config/keymap.nix @@ -1,11 +1,15 @@ { keymap.manager.prepend_keymap = [ { - on = ["Q"]; + on = [ + "Q" + ]; run = "quit"; } { - on = ["q"]; + on = [ + "q" + ]; run = "quit --no-cwd-file"; } ]; diff --git a/nixos/default.nix b/nixos/default.nix index 3b5d57a..39c93ac 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -14,7 +14,13 @@ let ) ); modules = - moduleImport modulesPath (name: builtins.replaceStrings [".nix"] [""] name) + moduleImport modulesPath (name: + builtins.replaceStrings [ + ".nix" + ] [ + "" + ] + name) // (path: builtins.listToAttrs ( map diff --git a/nixos/modules/bluetooth.nix b/nixos/modules/bluetooth.nix index 621eac6..ffb634e 100755 --- a/nixos/modules/bluetooth.nix +++ b/nixos/modules/bluetooth.nix @@ -5,7 +5,9 @@ package = pkgs.bluez; powerOnBoot = true; settings = {General = {Experimental = true;};}; - disabledPlugins = ["sap"]; + disabledPlugins = [ + "sap" + ]; }; }; services.blueman.enable = true; diff --git a/nixos/modules/fonts.nix b/nixos/modules/fonts.nix index 8d8e12f..05cee6f 100755 --- a/nixos/modules/fonts.nix +++ b/nixos/modules/fonts.nix @@ -21,7 +21,9 @@ in { sansSerif = [ font ]; - emoji = ["Noto Fonts Color Emoji"]; + emoji = [ + "Noto Fonts Color Emoji" + ]; }; antialias = true; }; diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index c4c04c1..b91b837 100755 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -23,7 +23,9 @@ substituters = [ "https://hyprland.cachix.org" ]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + trusted-public-keys = [ + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + ]; }; }; } diff --git a/nixos/modules/services/forgejo.nix b/nixos/modules/services/forgejo.nix index 9819538..6dd2723 100755 --- a/nixos/modules/services/forgejo.nix +++ b/nixos/modules/services/forgejo.nix @@ -96,7 +96,9 @@ in { options = [ "bind" ]; - depends = [server.storage0.mount]; + depends = [ + server.storage0.mount + ]; }; systemd.tmpfiles.rules = [ diff --git a/nixos/modules/services/jellyfin.nix b/nixos/modules/services/jellyfin.nix index df7f845..8153d30 100755 --- a/nixos/modules/services/jellyfin.nix +++ b/nixos/modules/services/jellyfin.nix @@ -48,7 +48,9 @@ in { options = [ "bind" ]; - depends = [server.storage0.mount]; + depends = [ + server.storage0.mount + ]; }; in { "/var/lib/${service.name}" = diff --git a/nixos/modules/services/mastodon/default.nix b/nixos/modules/services/mastodon/default.nix index 9c9a04c..2e92af7 100755 --- a/nixos/modules/services/mastodon/default.nix +++ b/nixos/modules/services/mastodon/default.nix @@ -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 sopsPath = secret: { @@ -189,7 +192,9 @@ in { options = [ "bind" ]; - depends = [server.storage0.mount]; + depends = [ + server.storage0.mount + ]; }; systemd.tmpfiles.rules = [ diff --git a/nixos/modules/services/nextcloud.nix b/nixos/modules/services/nextcloud.nix index f52aa0c..dc9fa3d 100755 --- a/nixos/modules/services/nextcloud.nix +++ b/nixos/modules/services/nextcloud.nix @@ -113,7 +113,9 @@ in { options = [ "bind" ]; - depends = [server.storage0.mount]; + depends = [ + server.storage0.mount + ]; }; systemd.tmpfiles.rules = [ diff --git a/nixos/modules/services/ollama.nix b/nixos/modules/services/ollama.nix index 34ec3eb..48086c9 100755 --- a/nixos/modules/services/ollama.nix +++ b/nixos/modules/services/ollama.nix @@ -55,7 +55,9 @@ in { options = [ "bind" ]; - depends = [server.storage0.mount]; + depends = [ + server.storage0.mount + ]; }; systemd.tmpfiles.rules = [ diff --git a/nixos/modules/services/peertube.nix b/nixos/modules/services/peertube.nix index ea0b2c1..1ff3aab 100755 --- a/nixos/modules/services/peertube.nix +++ b/nixos/modules/services/peertube.nix @@ -120,7 +120,9 @@ in { options = [ "bind" ]; - depends = [server.storage0.mount]; + depends = [ + server.storage0.mount + ]; }; systemd.tmpfiles.rules = [ @@ -128,7 +130,10 @@ in { "Z ${service.sops.path0} 755 ${service.name} ${service.name} -" ]; - users.users.${service.name}.extraGroups = ["nginx" "caddy"]; + users.users.${service.name}.extraGroups = [ + "nginx" + "caddy" + ]; networking = { firewall = { diff --git a/systems/desktop/config/filesystem.nix b/systems/desktop/config/filesystem.nix index 87e7b0f..1f145fc 100755 --- a/systems/desktop/config/filesystem.nix +++ b/systems/desktop/config/filesystem.nix @@ -45,7 +45,9 @@ in { fsType = "cifs"; options = synology.${synologyDrive}.options - ++ ["credentials=${synologySecrets}"]; + ++ [ + "credentials=${synologySecrets}" + ]; }; }; @@ -65,7 +67,9 @@ in { fsType = "cifs"; options = server.${sambaDrive}.options - ++ ["credentials=${serverSecrets}"]; + ++ [ + "credentials=${serverSecrets}" + ]; }; }; in diff --git a/systems/laptop/config/filesystem.nix b/systems/laptop/config/filesystem.nix index 975f891..d81e8a7 100755 --- a/systems/laptop/config/filesystem.nix +++ b/systems/laptop/config/filesystem.nix @@ -40,7 +40,9 @@ in { fsType = "cifs"; options = synology.${synologyDrive}.options - ++ ["credentials=${synologySecrets}"]; + ++ [ + "credentials=${synologySecrets}" + ]; }; }; @@ -51,7 +53,9 @@ in { fsType = "cifs"; options = server.${sambaDrive}.options - ++ ["credentials=${serverSecrets}"]; + ++ [ + "credentials=${serverSecrets}" + ]; }; }; in diff --git a/templates/elm/flake.nix b/templates/elm/flake.nix index 23508b5..4da66f2 100755 --- a/templates/elm/flake.nix +++ b/templates/elm/flake.nix @@ -15,7 +15,9 @@ imports = [ ./parts ]; - systems = [system]; + systems = [ + system + ]; perSystem = {pkgs, ...}: { _module.args.pkgs = import inputs.nixpkgs { inherit system;