chore: nixfmt-rfc-style

Signed-off-by: jolheiser <git@jolheiser.com>

apps/gui/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   imports = [
     ../nogui
     ./firefox.nix
@@ -24,12 +25,14 @@
       nodePackages.yaml-language-server
     ];
   };
-  dconf.settings = let
+  dconf.settings =
+    let
       wallpaper = pkgs.fetchurl {
         url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png";
         hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ=";
       };
-  in {
+    in
+    {
       "org/cinnamon/desktop/background" = {
         picture-uri = "file://${wallpaper}";
       };

apps/gui/firefox.nix

@@ -1,11 +1,15 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.firefox = {
     enable = true;
     profiles.default = {
       search = {
         default = "Kagi";
         privateDefault = "DuckDuckGo";
-        order = ["Kagi" "DuckDuckGo"];
+        order = [
+          "Kagi"
+          "DuckDuckGo"
+        ];
         force = true;
         engines = {
           "Kagi" = {
@@ -85,7 +89,10 @@
                 }
                 {
                   name = "gist";
-                  tags = ["gitea" "gist"];
+                  tags = [
+                    "gitea"
+                    "gist"
+                  ];
                   keyword = "gist";
                   url = "https://gist.jojodev.com";
                 }
@@ -120,7 +127,10 @@
                 }
                 {
                   name = "ugit";
-                  tags = ["tailscale" "git"];
+                  tags = [
+                    "tailscale"
+                    "git"
+                  ];
                   keyword = "git";
                   url = "http://git";
                 }
@@ -134,20 +144,29 @@
             }
             {
               name = "ugit";
-              tags = ["git" "ugit"];
+              tags = [
+                "git"
+                "ugit"
+              ];
               keyword = "ugit";
               url = "https://git.jolheiser.com";
             }
             {
               name = "git-pr";
-              tags = ["git" "pr"];
+              tags = [
+                "git"
+                "pr"
+              ];
               keyword = "git-pr";
               url = "https://pr.jolheiser.com";
             }
 
             {
               name = "todo";
-              tags = ["vikunja" "todo"];
+              tags = [
+                "vikunja"
+                "todo"
+              ];
               keyword = "todo";
               url = "https://todo.jolheiser.com";
             }

apps/gui/gtk.nix

@@ -3,7 +3,8 @@
   lib,
   pkgs,
   ...
-}: {
+}:
+{
   home.pointerCursor = {
     name = "catppuccin-cursors";
     package = pkgs.catppuccin-cursors.mochaLavender;
@@ -41,7 +42,8 @@
     };
   };
 
-  xdg = let
+  xdg =
+    let
       themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
     in
     lib.mkIf config.gtk.enable {

apps/gui/spotify.nix

@@ -1,12 +1,17 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
-  xdg.configFile."spotify-player/theme.toml".text = builtins.readFile (pkgs.fetchFromGitHub {
+{
+  xdg.configFile."spotify-player/theme.toml".text = builtins.readFile (
+    pkgs.fetchFromGitHub {
       owner = "catppuccin";
       repo = "spotify-player";
       rev = "002d51b02b3a2ebc0804e4839ee604dbdab4bec3";
       sha256 = "sha256-IUhzVrIBMi/Dn6+HV0m9i38Msg8zzzJlR85JeEVE7EU=";
     }
-    + "/src/theme.toml");
+    + "/src/theme.toml"
-  xdg.configFile."spotify-player/app.toml".source = (pkgs.formats.toml {}).generate "spotify-player-config" {
+  );
+  xdg.configFile."spotify-player/app.toml".source =
+    (pkgs.formats.toml { }).generate "spotify-player-config"
+      {
         client_id = "41af4976ba70474fbd541ee8764a2cda";
         theme = "Catppuccin-mocha";
         enable_notify = false;

apps/gui/tiny.nix

@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   programs.tiny = {
     enable = true;
     settings = {
@@ -10,7 +11,10 @@
           realname = "jolheiser";
           nicks = [ "jolheiser" ];
           alias = "LiberaChat";
-          join = ["#gitea" "#gitea-devel"];
+          join = [
+            "#gitea"
+            "#gitea-devel"
+          ];
           sasl = {
             username = "jolheiser";
             password = {

apps/gui/zed.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   home.packages = [ pkgs.zed-editor ];
   xdg.configFile."zed/settings.json".text = builtins.toJSON {
     buffer_font_family = "Monaspace Neon";
@@ -10,7 +11,9 @@
     };
     terminal = {
       font_family = "Monaspace Neon";
-      shell = {program = "nu";};
+      shell = {
+        program = "nu";
+      };
     };
     theme = "Catppuccin Mocha";
     ui_font_size = 16;

apps/nogui/aerc.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.aerc = {
     enable = true;
     extraConfig = {
@@ -31,13 +32,15 @@
       };
     };
     stylesets = {
-      catppuccin-mocha = builtins.readFile (pkgs.fetchFromGitHub {
+      catppuccin-mocha = builtins.readFile (
+        pkgs.fetchFromGitHub {
           owner = "catppuccin";
           repo = "aerc";
           rev = "c1f233bd22894d7ccf69846c3bd7bcd5af0fc2a2";
           sha256 = "sha256-YJdNPROhwgge14O1zuGh/ZK/qjHDxi+xdAyPEIXRI9c=";
         }
-        + "/dist/catppuccin-mocha");
+        + "/dist/catppuccin-mocha"
+      );
     };
   };
 }

apps/nogui/bat.nix

@@ -1,7 +1,10 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.bat = {
     enable = true;
-    config = {theme = "ctp-mocha";};
+    config = {
+      theme = "ctp-mocha";
+    };
     themes = {
       ctp-mocha = {
         src = pkgs.fetchFromGitHub {

apps/nogui/bottom.nix

@@ -6,7 +6,14 @@
         table_header_color = "#f5e0dc";
         all_cpu_color = "#f5e0dc";
         avg_cpu_color = "#eba0ac";
-        cpu_core_colors = ["#f38ba8" "#fab387" "#f9e2af" "#a6e3a1" "#74c7ec" "#cba6f7"];
+        cpu_core_colors = [
+          "#f38ba8"
+          "#fab387"
+          "#f9e2af"
+          "#a6e3a1"
+          "#74c7ec"
+          "#cba6f7"
+        ];
         ram_color = "#a6e3a1";
         swap_color = "#fab387";
         rx_color = "#a6e3a1";
@@ -22,7 +29,14 @@
         high_battery_color = "#a6e3a1";
         medium_battery_color = "#f9e2af";
         low_battery_color = "#f38ba8";
-        gpu_core_colors = ["#74c7ec" "#cba6f7" "#f38ba8" "#fab387" "#f9e2af" "#a6e3a1"];
+        gpu_core_colors = [
+          "#74c7ec"
+          "#cba6f7"
+          "#f38ba8"
+          "#fab387"
+          "#f9e2af"
+          "#a6e3a1"
+        ];
         arc_color = "#89dceb";
       };
     };

apps/nogui/default.nix

@@ -1,8 +1,5 @@
+{ pkgs, config, ... }:
 {
-  pkgs,
-  config,
-  ...
-}: {
   imports = [
     ./aerc.nix
     ./atuin.nix
@@ -52,7 +49,7 @@
       jsonnet-language-server
 
       # Formatters
-      alejandra
+      nixfmt-rfc-style
       gofumpt
 
       # Flake overlays

apps/nogui/eza.nix

@@ -1,4 +1,5 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   programs.eza = {
     enable = true;
     git = true;

apps/nogui/git.nix

@@ -1,8 +1,5 @@
-{
+{ pkgs, config, ... }:
-  pkgs,
+let
-  config,
-  ...
-}: let
   insteadOf = prefix: domain: {
     "https://${domain}/".insteadOf = "${prefix}:";
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
@@ -17,7 +14,8 @@
       ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "git@jolheiser.com ${key}"}";
     };
   };
-in {
+in
+{
   programs.git = {
     enable = true;
     userName = "jolheiser";
@@ -40,9 +38,13 @@ in {
       tui = "!lazygit";
     };
     lfs.enable = true;
-    ignores = [".idea/" "result" "node_modules" "ve"];
+    ignores = [
-    extraConfig =
+      ".idea/"
-      {
+      "result"
+      "node_modules"
+      "ve"
+    ];
+    extraConfig = {
       init.defaultBranch = "main";
       merge.conflictstyle = "zdiff3";
       diff.colorMoved = "default";
@@ -63,15 +65,10 @@ in {
         // insteadOf "gt" "gitea.com"
         // insteadOf "gl" "gitlab.com"
         // insteadOf "cb" "codeberg.org";
-      }
+    } // sshSigning;
-      // sshSigning;
     difftastic = {
       enable = true;
     };
-    includes = [
+    includes = [ { path = config.age.secrets.git-send-email.path; } ];
-      {
-        path = config.age.secrets.git-send-email.path;
-      }
-    ];
   };
 }

apps/nogui/go.nix

@@ -1,6 +1,7 @@
 let
   goPath = ".local/share/go";
-in {
+in
+{
   programs.go = {
     inherit goPath;
     enable = true;

apps/nogui/gpg.nix

@@ -1,6 +1,8 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
+let
   key = "0xB853ADA5DA7BBF7A";
-in {
+in
+{
   home.packages = with pkgs; [ pinentry ];
   home.file.".mozilla/native-messaging-hosts/gpgmejson.json" = {
     enable = true;

apps/nogui/helix.nix

@@ -1,15 +1,20 @@
 # This entire file is superceded by https://git.jolheiser.com/helix.drv
-{pkgs, ...}: let
+{ pkgs, ... }:
-  query = scm:
+let
-    builtins.readFile (pkgs.fetchFromGitea {
+  query =
+    scm:
+    builtins.readFile (
+      pkgs.fetchFromGitea {
         domain = "git.jojodev.com";
         owner = "jolheiser";
         repo = "templ-helix";
         rev = "2a47b9c5af0fd9ae8bba8198fd66abc6d07fdf10";
         sha256 = "sha256-pTdOX9bPup626t+ko6k3Xq/tprAMAZCUBl+xeIBkhfs=";
       }
-      + "/queries/templ/${scm}.scm");
+      + "/queries/templ/${scm}.scm"
-in {
+    );
+in
+{
   programs.helix = {
     enable = true;
     defaultEditor = true;
@@ -25,12 +30,16 @@ in {
           normal = "block";
           select = "underline";
         };
-        file-picker = {hidden = false;};
+        file-picker = {
+          hidden = false;
+        };
         indent-guides = {
           render = true;
           skip-levels = 1;
         };
-        soft-wrap = {enable = true;};
+        soft-wrap = {
+          enable = true;
+        };
         statusline = {
           right = [
             "version-control"
@@ -40,7 +49,9 @@ in {
             "file-encoding"
           ];
         };
-        lsp = {display-messages = true;};
+        lsp = {
+          display-messages = true;
+        };
       };
       keys = {
         normal = {
@@ -56,29 +67,57 @@ in {
           S-right = "goto_next_buffer";
           S-left = "goto_previous_buffer";
           C-b = ":buffer-close";
-          C-s = ["select_all" "select_regex"];
+          C-s = [
+            "select_all"
+            "select_regex"
+          ];
 
           C-j = "shrink_selection";
           C-k = "expand_selection";
           C-l = "select_next_sibling";
           C-a = "select_all";
-          C-u = ["half_page_up" "align_view_center"];
+          C-u = [
-          C-d = ["half_page_down" "align_view_center"];
+            "half_page_up"
+            "align_view_center"
+          ];
+          C-d = [
+            "half_page_down"
+            "align_view_center"
+          ];
 
-          "{" = ["goto_prev_paragraph" "collapse_selection"];
+          "{" = [
-          "}" = ["goto_next_paragraph" "collapse_selection"];
+            "goto_prev_paragraph"
+            "collapse_selection"
+          ];
+          "}" = [
+            "goto_next_paragraph"
+            "collapse_selection"
+          ];
           "0" = "goto_line_start";
           "$" = "goto_line_end";
           "^" = "goto_first_nonwhitespace";
           G = "goto_file_end";
           "%" = "match_brackets";
-          V = ["select_mode" "extend_to_line_bounds"];
+          V = [
-          C = ["collapse_selection" "extend_to_line_end" "change_selection"];
+            "select_mode"
-          D = ["extend_to_line_end" "delete_selection"];
+            "extend_to_line_bounds"
+          ];
+          C = [
+            "collapse_selection"
+            "extend_to_line_end"
+            "change_selection"
+          ];
+          D = [
+            "extend_to_line_end"
+            "delete_selection"
+          ];
           S = "surround_add";
 
           d = {
-            d = ["extend_to_line_bounds" "delete_selection"];
+            d = [
+              "extend_to_line_bounds"
+              "delete_selection"
+            ];
             t = [ "extend_till_char" ];
             s = [ "surround_delete" ];
             i = [ "select_textobject_inner" ];
@@ -101,16 +140,40 @@ in {
             "collapse_selection"
           ];
 
-          w = ["move_next_word_start" "move_char_right" "collapse_selection"];
+          w = [
-          e = ["move_next_word_end" "collapse_selection"];
+            "move_next_word_start"
-          b = ["move_prev_word_start" "collapse_selection"];
+            "move_char_right"
+            "collapse_selection"
+          ];
+          e = [
+            "move_next_word_end"
+            "collapse_selection"
+          ];
+          b = [
+            "move_prev_word_start"
+            "collapse_selection"
+          ];
 
-          i = ["insert_mode" "collapse_selection"];
+          i = [
-          a = ["append_mode" "collapse_selection"];
+            "insert_mode"
+            "collapse_selection"
+          ];
+          a = [
+            "append_mode"
+            "collapse_selection"
+          ];
 
-          esc = ["collapse_selection" "keep_primary_selection"];
+          esc = [
+            "collapse_selection"
+            "keep_primary_selection"
+          ];
+        };
+        insert = {
+          esc = [
+            "collapse_selection"
+            "normal_mode"
+          ];
         };
-        insert = {esc = ["collapse_selection" "normal_mode"];};
         select = {
           space = {
             j = {
@@ -118,28 +181,60 @@ in {
               c = ":pipe jq -c";
             };
           };
-          "{" = ["extend_to_line_bounds" "goto_prev_paragraph"];
+          "{" = [
-          "}" = ["extend_to_line_bounds" "goto_next_paragraph"];
+            "extend_to_line_bounds"
+            "goto_prev_paragraph"
+          ];
+          "}" = [
+            "extend_to_line_bounds"
+            "goto_next_paragraph"
+          ];
           "0" = "goto_line_start";
           "$" = "goto_line_end";
           "^" = "goto_first_nonwhitespace";
           G = "goto_file_end";
-          D = ["extend_to_line_bounds" "delete_selection" "normal_mode"];
+          D = [
-          C = ["goto_line_start" "extend_to_line_bounds" "change_selection"];
+            "extend_to_line_bounds"
+            "delete_selection"
+            "normal_mode"
+          ];
+          C = [
+            "goto_line_start"
+            "extend_to_line_bounds"
+            "change_selection"
+          ];
           "%" = "match_brackets";
           S = "surround_add";
 
           i = "select_textobject_inner";
           a = "select_textobject_around";
 
-          tab = ["insert_mode" "collapse_selection"];
+          tab = [
-          C-a = ["append_mode" "collapse_selection"];
+            "insert_mode"
+            "collapse_selection"
+          ];
+          C-a = [
+            "append_mode"
+            "collapse_selection"
+          ];
 
-          k = ["extend_line_up" "extend_to_line_bounds"];
+          k = [
-          j = ["extend_line_down" "extend_to_line_bounds"];
+            "extend_line_up"
+            "extend_to_line_bounds"
+          ];
+          j = [
+            "extend_line_down"
+            "extend_to_line_bounds"
+          ];
 
-          d = ["yank_main_selection_to_clipboard" "delete_selection"];
+          d = [
-          x = ["yank_main_selection_to_clipboard" "delete_selection"];
+            "yank_main_selection_to_clipboard"
+            "delete_selection"
+          ];
+          x = [
+            "yank_main_selection_to_clipboard"
+            "delete_selection"
+          ];
           y = [
             "yank_main_selection_to_clipboard"
             "normal_mode"
@@ -156,7 +251,11 @@ in {
           p = "replace_selections_with_clipboard";
           P = "paste_clipboard_before";
 
-          esc = ["collapse_selection" "keep_primary_selection" "normal_mode"];
+          esc = [
+            "collapse_selection"
+            "keep_primary_selection"
+            "normal_mode"
+          ];
         };
       };
     };
@@ -180,7 +279,10 @@ in {
           auto-format = true;
           formatter = {
             command = "black";
-            args = ["--quiet" "-"];
+            args = [
+              "--quiet"
+              "-"
+            ];
           };
         }
         {

apps/nogui/jj.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.jujutsu = {
     enable = true;
     settings = {
@@ -7,7 +8,12 @@
         email = "git@jolheiser.com";
       };
       ui = {
-        diff.tool = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"];
+        diff.tool = [
+          "${pkgs.difftastic}/bin/difft"
+          "--color=always"
+          "$left"
+          "$right"
+        ];
         editor = "hx";
       };
       signing = {

apps/nogui/lazygit.nix

@@ -6,7 +6,10 @@
       update.method = "never";
       gui.theme = {
         lightTheme = false;
-        activeBorderColor = ["#a6e3a1" "bold"];
+        activeBorderColor = [
+          "#a6e3a1"
+          "bold"
+        ];
         inactiveBorderColor = [ "#cdd6f4" ];
         optionsTextColor = [ "#89b4fa" ];
         selectedLineBgColor = [ "#313244" ];

apps/nogui/nushell.nix

@@ -1,8 +1,5 @@
+{ pkgs, config, ... }:
 {
-  pkgs,
-  config,
-  ...
-}: {
   programs.nushell = {
     enable = true;
     configFile.source = ./nushell/config.nu;

apps/nogui/oh-my-posh.nix

@@ -1,8 +1,8 @@
 {
   programs.oh-my-posh = {
     enable = true;
-    settings =
+    settings = builtins.fromJSON (
-      builtins.fromJSON (builtins.unsafeDiscardStringContext
+      builtins.unsafeDiscardStringContext (builtins.readFile ./ohmyposh/config.json)
-        (builtins.readFile ./ohmyposh/config.json));
+    );
   };
 }

apps/nogui/senpai.nix

@@ -1,10 +1,14 @@
-{config, ...}: {
+{ config, ... }:
+{
   programs.senpai = {
     enable = true;
     config = {
       address = "ircs+insecure://irc.jolheiser.com:6697";
       nickname = "jolheiser";
-      password-cmd = ["cat" "${config.age.secrets.irc-pw.path}"];
+      password-cmd = [
+        "cat"
+        "${config.age.secrets.irc-pw.path}"
+      ];
       #channel = "#pico.sh #gitea";
       typings = false;
     };

apps/nogui/ssh.nix

@@ -1,8 +1,7 @@
-{config, ...}: {
+{ config, ... }:
+{
   programs.ssh = {
     enable = true;
-    includes = [
+    includes = [ config.age.secrets.ssh-config.path ];
-      config.age.secrets.ssh-config.path
-    ];
   };
 }

apps/nogui/xdg.nix

@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   xdg = {
     enable = true;
     userDirs.enable = true;

flake.nix

@@ -120,14 +120,16 @@
     };
   };
 
-  outputs = {
+  outputs =
+    {
       nixpkgs,
       home-manager,
       nixos-hardware,
       agenix,
       wsl,
       ...
-  } @ inputs: let
+    }@inputs:
+    let
       overlays = [
         (_: prev: {
           nur = import inputs.nur {
@@ -156,13 +158,13 @@
         inherit overlays system;
         config.allowUnfree = true;
       };
-    commonConfig = {config, ...}: {
+      commonConfig =
+        { config, ... }:
+        {
           config = {
             nixpkgs.overlays = overlays;
             # TODO Remove when apps are updated
-        nixpkgs.config.permittedInsecurePackages = [
+            nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
-          "electron-25.9.0"
-        ];
           };
         };
       username = "jolheiser";
@@ -196,7 +198,8 @@
         }
         ./apps/gui
       ];
-  in {
+    in
+    {
       inherit homeManagerModules;
       homeConfigurations = {
         "jolheiser" = home-manager.lib.homeManagerConfiguration {
@@ -230,11 +233,11 @@
       };
       colmena = {
         meta = {
-        nixpkgs = import nixpkgs {
+          nixpkgs = import nixpkgs { inherit overlays system; };
-          inherit overlays system;
         };
-      };
+        dragonwell =
-      dragonwell = {pkgs, ...}: {
+          { pkgs, ... }:
+          {
             imports = [
               inputs.agenix.nixosModules.default
               inputs.golink.nixosModules.default
@@ -250,7 +253,9 @@
       };
       nixConfig = {
         extra-substitutors = [ "https://jolheiser.cachix.org" ];
-      extra-trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="];
+        extra-trusted-public-keys = [
+          "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="
+        ];
       };
       devShells.${system}.default = pkgs.mkShell {
         nativeBuildInputs = [

machines/common/gui/default.nix

@@ -1,9 +1,12 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   imports = [ ../nogui ];
 
   sound.enable = true;
   hardware.pulseaudio.enable = false;
-  security = {rtkit.enable = true;};
+  security = {
+    rtkit.enable = true;
+  };
   services = {
     pipewire = {
       enable = true;
@@ -20,6 +23,15 @@
       };
     };
   };
-  fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono" "Iosevka" "Hack"];}) monaspace];
+  fonts.packages = with pkgs; [
+    (nerdfonts.override {
+      fonts = [
+        "JetBrainsMono"
+        "Iosevka"
+        "Hack"
+      ];
+    })
+    monaspace
+  ];
   environment.systemPackages = [ pkgs.tailscale-systray ];
 }

machines/common/nogui/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   console.colors = [
     "1e1e2e"
     "585b70"
@@ -45,8 +46,16 @@
     gc.automatic = true;
     package = pkgs.nixVersions.stable;
     settings = {
-      trusted-users = ["@sudo" "@wheel" "jolheiser"];
+      trusted-users = [
-      experimental-features = ["flakes" "nix-command" "repl-flake"];
+        "@sudo"
+        "@wheel"
+        "jolheiser"
+      ];
+      experimental-features = [
+        "flakes"
+        "nix-command"
+        "repl-flake"
+      ];
       auto-optimise-store = true;
       warn-dirty = false;
       substituters = [ "https://jolheiser.cachix.org" ];
@@ -64,6 +73,10 @@
   services.tailscale.enable = true;
 
   environment = {
-    systemPackages = with pkgs; [podman podman-compose podman-tui];
+    systemPackages = with pkgs; [
+      podman
+      podman-compose
+      podman-tui
+    ];
   };
 }

machines/dragonwell/caddy.nix

@@ -1,6 +1,8 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
+let
   modules = import ./go.nix;
-in {
+in
+{
   services.caddy = {
     enable = true;
     virtualHosts = {
@@ -8,7 +10,8 @@ in {
         extraConfig = ''
           handle_path /.well-known/webfinger {
             header Content-Type application/jrd+json
-            respond ${builtins.toJSON {
+            respond ${
+              builtins.toJSON {
                 subject = "acct:john@jolheiser.com";
                 links = [
                   {
@@ -16,7 +19,8 @@ in {
                     href = "https://auth.jolheiser.com";
                   }
                 ];
-          }}
+              }
+            }
           }
           handle_path /bennet* {
             root * ${pkgs.jolheiser.bennet}

machines/dragonwell/default.nix

@@ -1,8 +1,23 @@
 let
   username = "jolheiser";
   key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser'';
-in {
+in
-  imports = [./actual.nix ./caddy.nix ./dex.nix ./git-pr.nix ./golink.nix ./gotosocial.nix ./restic.nix ./soju.nix ./tandoor.nix ./tclip.nix ./ugit.nix ./vikunja.nix ./hardware.nix];
+{
+  imports = [
+    ./actual.nix
+    ./caddy.nix
+    ./dex.nix
+    ./git-pr.nix
+    ./golink.nix
+    ./gotosocial.nix
+    ./restic.nix
+    ./soju.nix
+    ./tandoor.nix
+    ./tclip.nix
+    ./ugit.nix
+    ./vikunja.nix
+    ./hardware.nix
+  ];
 
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
@@ -12,7 +27,11 @@ in {
 
     firewall = {
       enable = true;
-      allowedTCPPorts = [80 443 6697];
+      allowedTCPPorts = [
+        80
+        443
+        6697
+      ];
     };
   };
 
@@ -23,11 +42,13 @@ in {
 
   users.users = {
     "${username}" = {
-      extraGroups = ["wheel" "docker" "storage"];
+      extraGroups = [
-      isNormalUser = true;
+        "wheel"
-      openssh.authorizedKeys.keys = [
+        "docker"
-        key
+        "storage"
       ];
+      isNormalUser = true;
+      openssh.authorizedKeys.keys = [ key ];
     };
     "root".openssh.authorizedKeys.keys = [ key ];
   };

machines/dragonwell/git-pr.nix

@@ -3,7 +3,9 @@
     enable = true;
     openFirewall = true;
     url = "pr.jolheiser.com";
-    admins = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"];
+    admins = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"
+    ];
     sshPort = 7448;
     enableWeb = true;
     webPort = 7449;

machines/dragonwell/go.nix

@@ -10,12 +10,13 @@ let
     }
   ];
 in
-  builtins.concatStringsSep "\n" (builtins.map (module: ''
+builtins.concatStringsSep "\n" (
+  builtins.map (module: ''
     respond /${module.name}* `<html><head>
               <meta name="go-import" content="go.jolheiser.com/${module.name} git https://${module.repo}.git">
               <meta http-equiv="refresh" content="3; url=https://pkg.go.dev/go.jolheiser.com/${module.name}" />
               </head><body>
               Redirecting to <a href="https://pkg.go.dev/go.jolheiser.com/${module.name}">https://pkg.go.dev/go.jolheiser.com/${module.name}</a>
               </body></html>`
-    '')
+  '') modules
-    modules)
+)

machines/dragonwell/golink.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   services.golink = {
     enable = true;
     tailscaleAuthKeyFile = pkgs.writeText "tskey" "tskey-auth-kGaKxz5CNTRL-nvyRLm7J38B37QZ2gCDM8BqtwyC6zJUh7"; # One-time key

machines/dragonwell/hardware.nix

@@ -1,7 +1,13 @@
-{modulesPath, ...}: {
+{ modulesPath, ... }:
+{
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
   boot.loader.grub.device = "/dev/sda";
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
+  boot.initrd.availableKernelModules = [
+    "ata_piix"
+    "uhci_hcd"
+    "xen_blkfront"
+    "vmw_pvscsi"
+  ];
   boot.initrd.kernelModules = [ "nvme" ];
   fileSystems."/" = {
     device = "/dev/sda1";

machines/dragonwell/restic.nix

@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   age.secrets = {
     restic-env.file = ../../secrets/personal/restic-env.age;
     restic-pass.file = ../../secrets/personal/restic-pass.age;
@@ -10,7 +11,11 @@
     passwordFile = config.age.secrets.restic-pass.path;
     repositoryFile = config.age.secrets.restic-repo.path;
     paths = [ "/var/lib/ugit/repos" ];
-    pruneOpts = ["--keep-daily 7" "--keep-weekly 2" "--keep-monthly 2"];
+    pruneOpts = [
+      "--keep-daily 7"
+      "--keep-weekly 2"
+      "--keep-monthly 2"
+    ];
     timerConfig = {
       OnCalendar = "daily";
       Persistent = true;

machines/dragonwell/soju.nix

@@ -1,6 +1,8 @@
-{lib, ...}: let
+{ lib, ... }:
+let
   baseCertPath = "/var/lib/acme/irc.jolheiser.com";
-in {
+in
+{
   security.acme = {
     acceptTerms = true;
     email = "irc@jolheiser.com";

machines/dragonwell/ugit.nix

@@ -2,7 +2,9 @@
   services.ugit = {
     enable = true;
     openFirewall = true;
-    authorizedKeys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"];
+    authorizedKeys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"
+    ];
     tsAuthKey = "tskey-auth-kRUJE7zxH621CNTRL-Td29STXSrtTUHdacaKaYtTD82uyDXZj7"; # One-time key
     config = {
       ssh.clone-url = "ugit@git.jolheiser.com";

machines/genmaicha/default.nix

@@ -1,11 +1,19 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
+let
   username = "jolheiser";
-in {
+in
-  imports = [./hardware.nix ../common/gui];
+{
+  imports = [
+    ./hardware.nix
+    ../common/gui
+  ];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = ["quiet" "splash"];
+    kernelParams = [
+      "quiet"
+      "splash"
+    ];
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
@@ -28,7 +36,11 @@ in {
   virtualisation.docker.enable = true;
 
   users.users."${username}" = {
-    extraGroups = ["wheel" "docker" "storage"];
+    extraGroups = [
+      "wheel"
+      "docker"
+      "storage"
+    ];
     isNormalUser = true;
   };
 

machines/genmaicha/hardware.nix

@@ -6,12 +6,17 @@
   lib,
   modulesPath,
   ...
-}: {
+}:
-  imports = [
+{
-    (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-  ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "thunderbolt"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
@@ -26,9 +31,7 @@
     fsType = "vfat";
   };
 
-  swapDevices = [
+  swapDevices = [ { device = "/dev/disk/by-uuid/2034b9e4-011b-4715-a7a2-5f5445dc2849"; } ];
-    {device = "/dev/disk/by-uuid/2034b9e4-011b-4715-a7a2-5f5445dc2849";}
-  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

machines/matcha/default.nix

@@ -1,11 +1,19 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
+let
   username = "jolheiser";
-in {
+in
-  imports = [./hardware.nix ../common/gui];
+{
+  imports = [
+    ./hardware.nix
+    ../common/gui
+  ];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = ["quiet" "splash"];
+    kernelParams = [
+      "quiet"
+      "splash"
+    ];
     loader.grub = {
       enable = true;
       device = "/dev/sda";
@@ -14,7 +22,9 @@ in {
     };
   };
 
-  boot.initrd.secrets = {"/crypto_keyfile.bin" = null;};
+  boot.initrd.secrets = {
+    "/crypto_keyfile.bin" = null;
+  };
 
   boot.initrd.luks.devices = {
     "luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".keyFile = "/crypto_keyfile.bin";
@@ -24,7 +34,9 @@ in {
     };
   };
 
-  hardware = {bluetooth.enable = true;};
+  hardware = {
+    bluetooth.enable = true;
+  };
 
   networking = {
     hostName = "matcha";
@@ -41,7 +53,11 @@ in {
   virtualisation.docker.enable = true;
 
   users.users."${username}" = {
-    extraGroups = ["wheel" "docker" "storage"];
+    extraGroups = [
+      "wheel"
+      "docker"
+      "storage"
+    ];
     isNormalUser = true;
   };
 

machines/matcha/hardware.nix

@@ -6,7 +6,8 @@
   lib,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [
@@ -45,6 +46,5 @@
   # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode =
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

machines/sencha/default.nix

@@ -1,9 +1,16 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
-  imports = [./hardware.nix ../common/gui];
+{
+  imports = [
+    ./hardware.nix
+    ../common/gui
+  ];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = ["quiet" "splash"];
+    kernelParams = [
+      "quiet"
+      "splash"
+    ];
   };
 
   boot.loader.systemd-boot.enable = true;
@@ -11,7 +18,9 @@
 
   boot.initrd.luks.devices."luks-c1c666de-2c68-4d50-98f1-3974ef424ff3".device = "/dev/disk/by-uuid/c1c666de-2c68-4d50-98f1-3974ef424ff3";
 
-  hardware = {bluetooth.enable = true;};
+  hardware = {
+    bluetooth.enable = true;
+  };
 
   networking = {
     hostName = "sencha";
@@ -28,7 +37,10 @@
     pcscd.enable = true;
     printing = {
       enable = true;
-      drivers = [pkgs.canon-cups-ufr2 pkgs.cnijfilter_4_00];
+      drivers = [
+        pkgs.canon-cups-ufr2
+        pkgs.cnijfilter_4_00
+      ];
     };
     jellyfin.enable = true;
     mullvad-vpn = {
@@ -44,11 +56,19 @@
     users = {
       olheiser.isNormalUser = true;
       jolheiser = {
-        extraGroups = ["wheel" "docker" "storage"];
+        extraGroups = [
+          "wheel"
+          "docker"
+          "storage"
+        ];
         isNormalUser = true;
       };
     };
-    groups.media.members = ["jolheiser" "olheiser" "jellyfin"];
+    groups.media.members = [
+      "jolheiser"
+      "olheiser"
+      "jellyfin"
+    ];
   };
 
   environment.systemPackages = with pkgs; [

machines/sencha/hardware.nix

@@ -6,12 +6,19 @@
   lib,
   modulesPath,
   ...
-}: {
+}:
-  imports = [
+{
-    (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-  ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+    "sr_mod"
+    "rtsx_usb_sdmmc"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
@@ -28,9 +35,7 @@
     fsType = "vfat";
   };
 
-  swapDevices = [
+  swapDevices = [ { device = "/dev/disk/by-uuid/5c3eb124-674b-4315-890d-137275aab504"; } ];
-    {device = "/dev/disk/by-uuid/5c3eb124-674b-4315-890d-137275aab504";}
-  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

modules/tclip/default.nix

@@ -1,10 +1,8 @@
-{
+{ config, lib, ... }:
-  config,
+let
-  lib,
-  ...
-}: let
   cfg = config.services.tclip;
-in {
+in
+{
   options.services.tclip = {
     enable = lib.mkEnableOption "tclip service";
 
@@ -75,14 +73,11 @@ in {
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
-        ExecStart = let
+        ExecStart =
+          let
             args =
-            lib.optionals (cfg.httpPort != null) [
+              lib.optionals (cfg.httpPort != null) [ "--http-port=${cfg.httpPort}" ]
-              "--http-port=${cfg.httpPort}"
+              ++ lib.optionals (cfg.controlURL != null) [ "--control-url=${cfg.controlURL}" ]
-            ]
-            ++ lib.optionals (cfg.controlURL != null) [
-              "--control-url=${cfg.controlURL}"
-            ]
               ++ [
                 (lib.optionalString cfg.disableHTTPS "--disable-https")
                 "--hostname=${cfg.hostname}"
@@ -91,7 +86,8 @@ in {
                 (lib.optionalString cfg.useFunnel "--use-funnel")
                 (lib.optionalString cfg.hideFunnelUsers "--hide-funnel-users")
               ];
-        in "${cfg.package}/bin/tclipd ${lib.concatStringsSep " " args}";
+          in
+          "${cfg.package}/bin/tclipd ${lib.concatStringsSep " " args}";
         Restart = "always";
         User = "tclip";
         Group = "tclip";

secrets/secrets.nix

@@ -5,19 +5,47 @@ let
   sencha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJurjAMu4IXgpBwgUP0QvE2ySE5/Orn/yflkdWVvy6Am";
   dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53";
 
-  all = [jolheiser matcha genmaicha sencha dragonwell];
+  all = [
-in {
+    jolheiser
+    matcha
+    genmaicha
+    sencha
+    dragonwell
+  ];
+in
+{
   "shared/cachix.age".publicKeys = all;
   "shared/ssh-config.age".publicKeys = all;
   "shared/spotify.age".publicKeys = all;
   "shared/irc-pw.age".publicKeys = all;
   "shared/gist-pw.age".publicKeys = all;
   "shared/git-send-email.age".publicKeys = all;
-  "personal/restic-env.age".publicKeys = [jolheiser dragonwell];
+  "personal/restic-env.age".publicKeys = [
-  "personal/restic-pass.age".publicKeys = [jolheiser dragonwell];
+    jolheiser
-  "personal/restic-repo.age".publicKeys = [jolheiser dragonwell];
+    dragonwell
-  "personal/dex.age".publicKeys = [jolheiser dragonwell];
+  ];
-  "personal/dex-tailscale.age".publicKeys = [jolheiser dragonwell];
+  "personal/restic-pass.age".publicKeys = [
-  "personal/dex-vikunja.age".publicKeys = [jolheiser dragonwell];
+    jolheiser
-  "personal/dex-tandoor.age".publicKeys = [jolheiser dragonwell];
+    dragonwell
+  ];
+  "personal/restic-repo.age".publicKeys = [
+    jolheiser
+    dragonwell
+  ];
+  "personal/dex.age".publicKeys = [
+    jolheiser
+    dragonwell
+  ];
+  "personal/dex-tailscale.age".publicKeys = [
+    jolheiser
+    dragonwell
+  ];
+  "personal/dex-vikunja.age".publicKeys = [
+    jolheiser
+    dragonwell
+  ];
+  "personal/dex-tandoor.age".publicKeys = [
+    jolheiser
+    dragonwell
+  ];
 }