1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57

diff --git a/apps/gui/default.nix b/apps/gui/default.nix
index dc224a10d6266beb9ec07945b894a38866666820..a80195f6ad62e7b817db092a4f6aa0df3714ee50 100644
--- a/apps/gui/default.nix
+++ b/apps/gui/default.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   imports = [
     ../nogui
     ./firefox.nix
@@ -24,24 +25,26 @@       marksman
       nodePackages.yaml-language-server
     ];
   };
-  dconf.settings = let
-    wallpaper = pkgs.fetchurl {
-      url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png";
-      hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ=";
-    };
-  in {
-    "org/cinnamon/desktop/background" = {
-      picture-uri = "file://${wallpaper}";
-    };
-    "org/cinnamon/desktop/interface" = {
-      font-name = "Monaspace Neon 10";
-    };
-    "org/cinnamon/desktop/wm/preferences" = {
-      titlebar-font = "Monaspace Neon Bold 10";
-    };
-    "org/gnome/desktop/interface" = {
-      document-font-name = "Monaspace Xenon 10";
-      monospace-font-name = "Monaspace Argon 10";
+  dconf.settings =
+    let
+      wallpaper = pkgs.fetchurl {
+        url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png";
+        hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ=";
+      };
+    in
+    {
+      "org/cinnamon/desktop/background" = {
+        picture-uri = "file://${wallpaper}";
+      };
+      "org/cinnamon/desktop/interface" = {
+        font-name = "Monaspace Neon 10";
+      };
+      "org/cinnamon/desktop/wm/preferences" = {
+        titlebar-font = "Monaspace Neon Bold 10";
+      };
+      "org/gnome/desktop/interface" = {
+        document-font-name = "Monaspace Xenon 10";
+        monospace-font-name = "Monaspace Argon 10";
+      };
     };
-  };
 }

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164

diff --git a/apps/gui/firefox.nix b/apps/gui/firefox.nix
index 8d8dafd3d9674f6f1be664f8593f9e8d2ea3e754..9a85476b494e4ce3d167d7f58c03625404cec4eb 100644
--- a/apps/gui/firefox.nix
+++ b/apps/gui/firefox.nix
@@ -1,15 +1,19 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.firefox = {
     enable = true;
     profiles.default = {
       search = {
         default = "Kagi";
         privateDefault = "DuckDuckGo";
-        order = ["Kagi" "DuckDuckGo"];
+        order = [
+          "Kagi"
+          "DuckDuckGo"
+        ];
         force = true;
         engines = {
           "Kagi" = {
-            definedAliases = ["@k"];
+            definedAliases = [ "@k" ];
             urls = [
               {
                 template = "https://kagi.com/search";
@@ -23,7 +27,7 @@               }
             ];
           };
           "DuckDuckGo" = {
-            definedAliases = ["@d"];
+            definedAliases = [ "@d" ];
             urls = [
               {
                 template = "https://duckduckgo.com/";
@@ -57,9 +61,9 @@         "extensions.pocket.enabled" = false;
         "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
         "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
         "browser.newtabpage.pinned" = builtins.toJSON [
-          {url = "https://github.com/";}
-          {url = "https://git.jojodev.com/";}
-          {url = "https://git.jolheiser.com";}
+          { url = "https://github.com/"; }
+          { url = "https://git.jojodev.com/"; }
+          { url = "https://git.jolheiser.com"; }
         ];
         "browser.fixup.domainwhitelist.go" = true; # golink
       };
@@ -73,31 +77,34 @@               name = "Gitea";
               bookmarks = [
                 {
                   name = "github";
-                  tags = ["gitea"];
+                  tags = [ "gitea" ];
                   keyword = "go-gitea";
                   url = "https://github.com/go-gitea/gitea";
                 }
                 {
                   name = "jojodev";
-                  tags = ["gitea"];
+                  tags = [ "gitea" ];
                   keyword = "jojodev";
                   url = "https://git.jojodev.com";
                 }
                 {
                   name = "gist";
-                  tags = ["gitea" "gist"];
+                  tags = [
+                    "gitea"
+                    "gist"
+                  ];
                   keyword = "gist";
                   url = "https://gist.jojodev.com";
                 }
                 {
                   name = "gitea";
-                  tags = ["gitea"];
+                  tags = [ "gitea" ];
                   keyword = "gitea";
                   url = "https://gitea.com";
                 }
                 {
                   name = "try";
-                  tags = ["gitea"];
+                  tags = [ "gitea" ];
                   keyword = "try";
                   url = "https://try.gitea.io";
                 }
@@ -108,25 +115,28 @@               name = "Tailnet";
               bookmarks = [
                 {
                   name = "golink";
-                  tags = ["tailscale"];
+                  tags = [ "tailscale" ];
                   keyword = "go";
                   url = "http://go";
                 }
                 {
                   name = "tclip";
-                  tags = ["tailscale"];
+                  tags = [ "tailscale" ];
                   keyword = "paste";
                   url = "http://paste";
                 }
                 {
                   name = "ugit";
-                  tags = ["tailscale" "git"];
+                  tags = [
+                    "tailscale"
+                    "git"
+                  ];
                   keyword = "git";
                   url = "http://git";
                 }
                 {
                   name = "jellyfin";
-                  tags = ["jellyfin"];
+                  tags = [ "jellyfin" ];
                   keyword = "jellyfin";
                   url = "http://sencha:8096";
                 }
@@ -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";
             }
@@ -156,7 +175,7 @@         }
         # Not in the toolbar, but still usable via keyword/searching
         {
           name = "Go Playground";
-          tags = ["golang"];
+          tags = [ "golang" ];
           keyword = "play";
           url = "https://go.dev/play/";
         }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14

diff --git a/apps/gui/ghostty.nix b/apps/gui/ghostty.nix
index e34d63c6d00f67341059cc3a108097e9a6e01570..761f2486255db4aa1006673b5f01fdfc69f5e064 100644
--- a/apps/gui/ghostty.nix
+++ b/apps/gui/ghostty.nix
@@ -8,7 +8,7 @@     theme                 = catppuccin-mocha
     term                  = xterm-256color
   '';
   # zig build -p ~/.local/share/ghostty -Doptimize=ReleaseFast
-  xdg.systemDirs.data = ["/home/jolheiser/.local/share/ghostty/share"];
-  home.sessionPath = ["/home/jolheiser/.local/share/ghostty/bin"];
+  xdg.systemDirs.data = [ "/home/jolheiser/.local/share/ghostty/share" ];
+  home.sessionPath = [ "/home/jolheiser/.local/share/ghostty/bin" ];
   programs.bash.enable = true;
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37

diff --git a/apps/gui/gtk.nix b/apps/gui/gtk.nix
index 615ab9f0e331fcb408f34dc3684c4bc124921b45..ee390716861c6f586b3f47955ed7f3a93e4c3bc7 100644
--- a/apps/gui/gtk.nix
+++ b/apps/gui/gtk.nix
@@ -3,7 +3,8 @@   config,
   lib,
   pkgs,
   ...
-}: {
+}:
+{
   home.pointerCursor = {
     name = "catppuccin-cursors";
     package = pkgs.catppuccin-cursors.mochaLavender;
@@ -21,7 +22,7 @@     };
     theme = {
       name = "Catppuccin-Mocha-Compact-Lavender-Dark";
       package = pkgs.catppuccin-gtk.override {
-        accents = ["lavender"];
+        accents = [ "lavender" ];
         variant = "mocha";
         size = "compact";
       };
@@ -41,9 +42,10 @@       gtk-xft-rgba = "rgb";
     };
   };
 
-  xdg = let
-    themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
-  in
+  xdg =
+    let
+      themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
+    in
     lib.mkIf config.gtk.enable {
       configFile = {
         "gtk-4.0/assets" = {

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37

diff --git a/apps/gui/spotify.nix b/apps/gui/spotify.nix
index 847b8e602c93ad0fa962e66ff73fff0690e3306d..e6ed0673b0c81dbc4a98e0302691949c41bc66e6 100644
--- a/apps/gui/spotify.nix
+++ b/apps/gui/spotify.nix
@@ -1,17 +1,22 @@
-{pkgs, ...}: {
-  xdg.configFile."spotify-player/theme.toml".text = builtins.readFile (pkgs.fetchFromGitHub {
+{ pkgs, ... }:
+{
+  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");
-  xdg.configFile."spotify-player/app.toml".source = (pkgs.formats.toml {}).generate "spotify-player-config" {
-    client_id = "41af4976ba70474fbd541ee8764a2cda";
-    theme = "Catppuccin-mocha";
-    enable_notify = false;
-    enable_media_control = true;
-    device.volume = 100;
-  };
+    + "/src/theme.toml"
+  );
+  xdg.configFile."spotify-player/app.toml".source =
+    (pkgs.formats.toml { }).generate "spotify-player-config"
+      {
+        client_id = "41af4976ba70474fbd541ee8764a2cda";
+        theme = "Catppuccin-mocha";
+        enable_notify = false;
+        enable_media_control = true;
+        device.volume = 100;
+      };
   programs.nushell.shellAliases.spt = "spotify_player";
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35

diff --git a/apps/gui/tiny.nix b/apps/gui/tiny.nix
index e6113b5ea642ba7ade00ddea7c35f94e2b57c59a..edf264fade688d0c1dcac705884ccd2d4a25fd47 100644
--- a/apps/gui/tiny.nix
+++ b/apps/gui/tiny.nix
@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   programs.tiny = {
     enable = true;
     settings = {
@@ -8,9 +9,12 @@           addr = "irc.libera.chat";
           port = 6697;
           tls = true;
           realname = "jolheiser";
-          nicks = ["jolheiser"];
+          nicks = [ "jolheiser" ];
           alias = "LiberaChat";
-          join = ["#gitea" "#gitea-devel"];
+          join = [
+            "#gitea"
+            "#gitea-devel"
+          ];
           sasl = {
             username = "jolheiser";
             password = {
@@ -20,7 +24,7 @@           };
         }
       ];
       defaults = {
-        nicks = ["jolheiser"];
+        nicks = [ "jolheiser" ];
         realname = "jolheiser";
       };
       key_map = {

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

diff --git a/apps/gui/zed.nix b/apps/gui/zed.nix
index 6fff16e926fd1d978c37911521d493b25a1d6cdc..d6b5ba2a0836dedf78083f6eab2ef0e79d5456a3 100644
--- a/apps/gui/zed.nix
+++ b/apps/gui/zed.nix
@@ -1,5 +1,6 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.zed-editor];
+{ pkgs, ... }:
+{
+  home.packages = [ pkgs.zed-editor ];
   xdg.configFile."zed/settings.json".text = builtins.toJSON {
     buffer_font_family = "Monaspace Neon";
     buffer_font_size = 16;
@@ -10,7 +11,9 @@       metrics = false;
     };
     terminal = {
       font_family = "Monaspace Neon";
-      shell = {program = "nu";};
+      shell = {
+        program = "nu";
+      };
     };
     theme = "Catppuccin Mocha";
     ui_font_size = 16;

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

diff --git a/apps/nogui/aerc.nix b/apps/nogui/aerc.nix
index ddbc8a3409590e0733ddf67dcc9d36e0b3d342a5..0bf314e9f40ba6f0be41dede8eccff613f770bed 100644
--- a/apps/nogui/aerc.nix
+++ b/apps/nogui/aerc.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.aerc = {
     enable = true;
     extraConfig = {
@@ -31,13 +32,15 @@         cache-headers = true;
       };
     };
     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"
+      );
     };
   };
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

diff --git a/apps/nogui/atuin.nix b/apps/nogui/atuin.nix
index a2496998b3f1a49db4167c013d5150c3b462406a..8ee816f59951ef098daa8a5aeb658f2b55ebe790 100644
--- a/apps/nogui/atuin.nix
+++ b/apps/nogui/atuin.nix
@@ -2,6 +2,6 @@ {
   programs.atuin = {
     enable = true;
     enableNushellIntegration = true;
-    flags = ["--disable-up-arrow"];
+    flags = [ "--disable-up-arrow" ];
   };
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17

diff --git a/apps/nogui/bat.nix b/apps/nogui/bat.nix
index afb7398dd126cf31666d600641e479b7d5fadc6d..8eff3e66a5c4b88cf75f2df646c3e28a6aa8ccbf 100644
--- a/apps/nogui/bat.nix
+++ b/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 {

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36

diff --git a/apps/nogui/bottom.nix b/apps/nogui/bottom.nix
index e7d4b88a7930a98361ad2a5082aa5d4d37eb8f2e..98446f73b58894566dde029df4e9614f4cf00b2a 100644
--- a/apps/nogui/bottom.nix
+++ b/apps/nogui/bottom.nix
@@ -6,7 +6,14 @@       colors = {
         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 @@         selected_bg_color = "#cba6f7";
         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";
       };
     };

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23

diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix
index a74f6792ecba42dcd77bfd9c1e485f9aaac8192a..cfabab80bda9b7788d5847c95dd09ec9a4d76d5b 100644
--- a/apps/nogui/default.nix
+++ b/apps/nogui/default.nix
@@ -1,8 +1,5 @@
+{ pkgs, config, ... }:
 {
-  pkgs,
-  config,
-  ...
-}: {
   imports = [
     ./aerc.nix
     ./atuin.nix
@@ -52,7 +49,7 @@       go-jsonnet
       jsonnet-language-server
 
       # Formatters
-      alejandra
+      nixfmt-rfc-style
       gofumpt
 
       # Flake overlays

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11

diff --git a/apps/nogui/eza.nix b/apps/nogui/eza.nix
index 4bc03742d5fd5cb5dd1e5e402c7ebd8b04ea54f8..ac1155f0c3e0841e8562b0ea1d1da7728f761437 100644
--- a/apps/nogui/eza.nix
+++ b/apps/nogui/eza.nix
@@ -1,4 +1,5 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   programs.eza = {
     enable = true;
     git = true;

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93

diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix
index 6b96c2fe9fe1d1550bb6d1b9ebad3acfaec1ac91..9ddc6eea1af37d10214f79d5adc8f7c3edfd6738 100644
--- a/apps/nogui/git.nix
+++ b/apps/nogui/git.nix
@@ -1,8 +1,5 @@
-{
-  pkgs,
-  config,
-  ...
-}: let
+{ pkgs, config, ... }:
+let
   insteadOf = prefix: domain: {
     "https://${domain}/".insteadOf = "${prefix}:";
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
@@ -17,7 +14,8 @@       format = "ssh";
       ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "git@jolheiser.com ${key}"}";
     };
   };
-in {
+in
+{
   programs.git = {
     enable = true;
     userName = "jolheiser";
@@ -40,38 +38,37 @@       last = "log --show-signature --format=fuller --max-count=1 HEAD";
       tui = "!lazygit";
     };
     lfs.enable = true;
-    ignores = [".idea/" "result" "node_modules" "ve"];
-    extraConfig =
-      {
-        init.defaultBranch = "main";
-        merge.conflictstyle = "zdiff3";
-        diff.colorMoved = "default";
-        core.editor = "hx";
-        push = {
-          sutoSetupRemote = true;
-          default = "current";
-          gpgSign = "if-asked";
-        };
-        rerere.enabled = true;
-        pull.rebase = true;
-        diff.algorithm = "histogram";
-        merge.tool = "hx";
-        url =
-          insteadOf "jo" "git.jolheiser.com"
-          // insteadOf "gh" "github.com"
-          // insteadOf "jj" "git.jojodev.com"
-          // insteadOf "gt" "gitea.com"
-          // insteadOf "gl" "gitlab.com"
-          // insteadOf "cb" "codeberg.org";
-      }
-      // sshSigning;
+    ignores = [
+      ".idea/"
+      "result"
+      "node_modules"
+      "ve"
+    ];
+    extraConfig = {
+      init.defaultBranch = "main";
+      merge.conflictstyle = "zdiff3";
+      diff.colorMoved = "default";
+      core.editor = "hx";
+      push = {
+        sutoSetupRemote = true;
+        default = "current";
+        gpgSign = "if-asked";
+      };
+      rerere.enabled = true;
+      pull.rebase = true;
+      diff.algorithm = "histogram";
+      merge.tool = "hx";
+      url =
+        insteadOf "jo" "git.jolheiser.com"
+        // insteadOf "gh" "github.com"
+        // insteadOf "jj" "git.jojodev.com"
+        // insteadOf "gt" "gitea.com"
+        // insteadOf "gl" "gitlab.com"
+        // insteadOf "cb" "codeberg.org";
+    } // sshSigning;
     difftastic = {
       enable = true;
     };
-    includes = [
-      {
-        path = config.age.secrets.git-send-email.path;
-      }
-    ];
+    includes = [ { path = config.age.secrets.git-send-email.path; } ];
   };
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

diff --git a/apps/nogui/go.nix b/apps/nogui/go.nix
index 6d7ec86bd1d2734271fce20090f04e1b3a714127..47f4a8ff1620cf059b4b8af0202d73a551f80cab 100644
--- a/apps/nogui/go.nix
+++ b/apps/nogui/go.nix
@@ -1,6 +1,7 @@
 let
   goPath = ".local/share/go";
-in {
+in
+{
   programs.go = {
     inherit goPath;
     enable = true;

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26

diff --git a/apps/nogui/gpg.nix b/apps/nogui/gpg.nix
index dac104358fc9ea3ce41b93e5632d9a6a1206cbd6..bb1873d19625b99ee6f99bc4187adcd95e0dd05e 100644
--- a/apps/nogui/gpg.nix
+++ b/apps/nogui/gpg.nix
@@ -1,7 +1,9 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
+let
   key = "0xB853ADA5DA7BBF7A";
-in {
-  home.packages = with pkgs; [pinentry];
+in
+{
+  home.packages = with pkgs; [ pinentry ];
   home.file.".mozilla/native-messaging-hosts/gpgmejson.json" = {
     enable = true;
     text = builtins.toJSON {
@@ -9,7 +11,7 @@       name = "gpgmejson";
       description = "JavaScript binding for GnuPG";
       path = pkgs.gpgme.dev + /bin/gpgme-json;
       type = "stdio";
-      allowed_extensions = ["jid1-AQqSMBYb0a8ADg@jetpack"];
+      allowed_extensions = [ "jid1-AQqSMBYb0a8ADg@jetpack" ];
     };
   };
   programs.gpg = {

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342

diff --git a/apps/nogui/helix.nix b/apps/nogui/helix.nix
index 375ca868ed653f512fc634426480cc615b15cf20..3397587fb5bce40670b60bfc484e340b52ab2e2d 100644
--- a/apps/nogui/helix.nix
+++ b/apps/nogui/helix.nix
@@ -1,15 +1,20 @@
 # This entire file is superceded by https://git.jolheiser.com/helix.drv
-{pkgs, ...}: let
-  query = scm:
-    builtins.readFile (pkgs.fetchFromGitea {
+{ pkgs, ... }:
+let
+  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");
-in {
+      + "/queries/templ/${scm}.scm"
+    );
+in
+{
   programs.helix = {
     enable = true;
     defaultEditor = true;
@@ -25,12 +30,16 @@           insert = "bar";
           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 @@             "position"
             "file-encoding"
           ];
         };
-        lsp = {display-messages = true;};
+        lsp = {
+          display-messages = true;
+        };
       };
       keys = {
         normal = {
@@ -56,33 +67,61 @@           "C-/" = "toggle_comments";
           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-d = ["half_page_down" "align_view_center"];
+          C-u = [
+            "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"];
-          C = ["collapse_selection" "extend_to_line_end" "change_selection"];
-          D = ["extend_to_line_end" "delete_selection"];
+          V = [
+            "select_mode"
+            "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"];
-            t = ["extend_till_char"];
-            s = ["surround_delete"];
-            i = ["select_textobject_inner"];
-            a = ["select_textobject_around"];
+            d = [
+              "extend_to_line_bounds"
+              "delete_selection"
+            ];
+            t = [ "extend_till_char" ];
+            s = [ "surround_delete" ];
+            i = [ "select_textobject_inner" ];
+            a = [ "select_textobject_around" ];
           };
 
           x = "delete_selection";
@@ -101,16 +140,40 @@             "goto_line_start"
             "collapse_selection"
           ];
 
-          w = ["move_next_word_start" "move_char_right" "collapse_selection"];
-          e = ["move_next_word_end" "collapse_selection"];
-          b = ["move_prev_word_start" "collapse_selection"];
+          w = [
+            "move_next_word_start"
+            "move_char_right"
+            "collapse_selection"
+          ];
+          e = [
+            "move_next_word_end"
+            "collapse_selection"
+          ];
+          b = [
+            "move_prev_word_start"
+            "collapse_selection"
+          ];
 
-          i = ["insert_mode" "collapse_selection"];
-          a = ["append_mode" "collapse_selection"];
+          i = [
+            "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 @@               e = ":pipe jq";
               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"];
-          C = ["goto_line_start" "extend_to_line_bounds" "change_selection"];
+          D = [
+            "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"];
-          C-a = ["append_mode" "collapse_selection"];
+          tab = [
+            "insert_mode"
+            "collapse_selection"
+          ];
+          C-a = [
+            "append_mode"
+            "collapse_selection"
+          ];
 
-          k = ["extend_line_up" "extend_to_line_bounds"];
-          j = ["extend_line_down" "extend_to_line_bounds"];
+          k = [
+            "extend_line_up"
+            "extend_to_line_bounds"
+          ];
+          j = [
+            "extend_line_down"
+            "extend_to_line_bounds"
+          ];
 
-          d = ["yank_main_selection_to_clipboard" "delete_selection"];
-          x = ["yank_main_selection_to_clipboard" "delete_selection"];
+          d = [
+            "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 @@           ];
           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"
+          ];
         };
       };
     };
@@ -172,7 +271,7 @@         {
           name = "lua";
           formatter = {
             command = "luafmt";
-            args = ["--stdin"];
+            args = [ "--stdin" ];
           };
         }
         {
@@ -180,7 +279,10 @@           name = "python";
           auto-format = true;
           formatter = {
             command = "black";
-            args = ["--quiet" "-"];
+            args = [
+              "--quiet"
+              "-"
+            ];
           };
         }
         {
@@ -188,7 +290,7 @@           name = "nix";
           auto-format = true;
           formatter = {
             command = "alejandra";
-            args = ["-qq"];
+            args = [ "-qq" ];
           };
         }
         {
@@ -196,16 +298,16 @@           name = "templ";
           auto-format = true;
           scope = "source.templ";
           injection-regex = "templ";
-          file-types = ["templ"];
-          roots = ["go.mod"];
+          file-types = [ "templ" ];
+          roots = [ "go.mod" ];
           comment-token = "//";
           language-server = {
             command = "templ";
-            args = ["lsp"];
+            args = [ "lsp" ];
           };
           formatter = {
             command = "templ";
-            args = ["fmt"];
+            args = [ "fmt" ];
           };
         }
       ];
@@ -222,19 +324,19 @@     };
     themes = {
       catppuccin_frappe_transparent = {
         inherits = "catppuccin_frappe";
-        "ui.background" = {};
+        "ui.background" = { };
       };
       catppuccin_latte_transparent = {
         inherits = "catppuccin_latte";
-        "ui.background" = {};
+        "ui.background" = { };
       };
       catppuccin_macchiato_transparent = {
         inherits = "catppuccin_macchiato";
-        "ui.background" = {};
+        "ui.background" = { };
       };
       catppuccin_mocha_transparent = {
         inherits = "catppuccin_mocha";
-        "ui.background" = {};
+        "ui.background" = { };
       };
     };
   };

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

diff --git a/apps/nogui/jj.nix b/apps/nogui/jj.nix
index 5d6b9f41e4004334dd33f73823e3f9c92809ccf4..2cd4c9acaf261ae9ee504915b0ae0dd281566ea9 100644
--- a/apps/nogui/jj.nix
+++ b/apps/nogui/jj.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.jujutsu = {
     enable = true;
     settings = {
@@ -7,7 +8,12 @@         name = "jolheiser";
         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 = {

1
2
3
4
5
6
7

diff --git a/apps/nogui/jq.nix b/apps/nogui/jq.nix
index 1cb6a313855f56e4fc1bf64cd314423df4c2109c..3c01c415d9a2bd365f83f4ec6a57f64eb6a40692 100644
--- a/apps/nogui/jq.nix
+++ b/apps/nogui/jq.nix
@@ -1 +1 @@
-{programs.jq.enable = true;}
+{ programs.jq.enable = true; }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30

diff --git a/apps/nogui/lazygit.nix b/apps/nogui/lazygit.nix
index c3345634446c090f24737692adbd05a42274b782..651aac3798a9fd7b73d385712ac34189b0d4792a 100644
--- a/apps/nogui/lazygit.nix
+++ b/apps/nogui/lazygit.nix
@@ -6,14 +6,17 @@       nerdFontsVersion = "3";
       update.method = "never";
       gui.theme = {
         lightTheme = false;
-        activeBorderColor = ["#a6e3a1" "bold"];
-        inactiveBorderColor = ["#cdd6f4"];
-        optionsTextColor = ["#89b4fa"];
-        selectedLineBgColor = ["#313244"];
-        selectedRangeBgColor = ["#313244"];
-        cherryPickedCommitBgColor = ["#94e2d5"];
-        cherryPickedCommitFgColor = ["#89b4fa"];
-        unstagedChangesColor = ["#f38ba8"];
+        activeBorderColor = [
+          "#a6e3a1"
+          "bold"
+        ];
+        inactiveBorderColor = [ "#cdd6f4" ];
+        optionsTextColor = [ "#89b4fa" ];
+        selectedLineBgColor = [ "#313244" ];
+        selectedRangeBgColor = [ "#313244" ];
+        cherryPickedCommitBgColor = [ "#94e2d5" ];
+        cherryPickedCommitFgColor = [ "#89b4fa" ];
+        unstagedChangesColor = [ "#f38ba8" ];
       };
     };
   };

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14

diff --git a/apps/nogui/nushell.nix b/apps/nogui/nushell.nix
index 70b128b76b11eb7597356fa42ef1579593384631..918dcd5a16cdb8bf38a10b4fe878b72431aa4dc1 100644
--- a/apps/nogui/nushell.nix
+++ b/apps/nogui/nushell.nix
@@ -1,8 +1,5 @@
+{ pkgs, config, ... }:
 {
-  pkgs,
-  config,
-  ...
-}: {
   programs.nushell = {
     enable = true;
     configFile.source = ./nushell/config.nu;

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16

diff --git a/apps/nogui/oh-my-posh.nix b/apps/nogui/oh-my-posh.nix
index a763f3fa7cac57df0cd2c803da4e5b9cac9ad806..b1848ce3615998f896ad013b5a671565fe4363fd 100644
--- a/apps/nogui/oh-my-posh.nix
+++ b/apps/nogui/oh-my-posh.nix
@@ -1,8 +1,8 @@
 {
   programs.oh-my-posh = {
     enable = true;
-    settings =
-      builtins.fromJSON (builtins.unsafeDiscardStringContext
-        (builtins.readFile ./ohmyposh/config.json));
+    settings = builtins.fromJSON (
+      builtins.unsafeDiscardStringContext (builtins.readFile ./ohmyposh/config.json)
+    );
   };
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21

diff --git a/apps/nogui/senpai.nix b/apps/nogui/senpai.nix
index e5355953cae89bd6e2ab07476da122ccc70b808e..2cdf4540d756434c1473bafd66fc04a9e7d0f320 100644
--- a/apps/nogui/senpai.nix
+++ b/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;
     };

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16

diff --git a/apps/nogui/ssh.nix b/apps/nogui/ssh.nix
index 86c957d573a428ef023a34b0eb321b6de5079ae4..b50143e94c7ab887560d9e04a30c45dc145d01b5 100644
--- a/apps/nogui/ssh.nix
+++ b/apps/nogui/ssh.nix
@@ -1,8 +1,7 @@
-{config, ...}: {
+{ config, ... }:
+{
   programs.ssh = {
     enable = true;
-    includes = [
-      config.age.secrets.ssh-config.path
-    ];
+    includes = [ config.age.secrets.ssh-config.path ];
   };
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11

diff --git a/apps/nogui/xdg.nix b/apps/nogui/xdg.nix
index 7f478142fabab8e136227363d99e9033d4413d0d..ade2de73c9eca74b65bfaefc5aa67b0792b4c586 100644
--- a/apps/nogui/xdg.nix
+++ b/apps/nogui/xdg.nix
@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   xdg = {
     enable = true;
     userDirs.enable = true;

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279

diff --git a/flake.nix b/flake.nix
index 5787a3d0ac28b2ba4900f418162542e969668417..f0a645891538fc16d867bea809351fb18da9e6f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -120,143 +120,148 @@       inputs.flake-utils.follows = "flake-utils";
     };
   };
 
-  outputs = {
-    nixpkgs,
-    home-manager,
-    nixos-hardware,
-    agenix,
-    wsl,
-    ...
-  } @ inputs: let
-    overlays = [
-      (_: prev: {
-        nur = import inputs.nur {
-          nurpkgs = prev;
-          pkgs = prev;
-        };
-        jolheiser = {
-          nur = inputs.jolheiser-nur.packages.${prev.system};
-          helix = inputs.helix.packages.${prev.system}.default;
-          website = inputs.website.packages.${prev.system}.default;
-          resume = inputs.resume.packages.${prev.system}.default;
-          git-age = inputs.git-age.packages.${prev.system}.default;
-          gist = inputs.gist.packages.${prev.system}.default;
-          tmpl = inputs.tmpl.packages.${prev.system}.default;
-          gomodinit = inputs.gomodinit.packages.${prev.system}.default;
-          cfg = inputs.cfg.packages.${prev.system}.default;
-          blog = inputs.blog.packages.${prev.system}.default;
-          bennet = inputs.bennet.packages.${prev.system}.default;
-        };
-        tclip = inputs.tclip.packages.${prev.system}.tclip;
-        templ = inputs.templ.packages.${prev.system}.templ;
-      })
-      inputs.golink.overlay
-    ];
-    pkgs = import inputs.nixpkgs {
-      inherit overlays system;
-      config.allowUnfree = true;
-    };
-    commonConfig = {config, ...}: {
-      config = {
-        nixpkgs.overlays = overlays;
-        # TODO Remove when apps are updated
-        nixpkgs.config.permittedInsecurePackages = [
-          "electron-25.9.0"
-        ];
+  outputs =
+    {
+      nixpkgs,
+      home-manager,
+      nixos-hardware,
+      agenix,
+      wsl,
+      ...
+    }@inputs:
+    let
+      overlays = [
+        (_: prev: {
+          nur = import inputs.nur {
+            nurpkgs = prev;
+            pkgs = prev;
+          };
+          jolheiser = {
+            nur = inputs.jolheiser-nur.packages.${prev.system};
+            helix = inputs.helix.packages.${prev.system}.default;
+            website = inputs.website.packages.${prev.system}.default;
+            resume = inputs.resume.packages.${prev.system}.default;
+            git-age = inputs.git-age.packages.${prev.system}.default;
+            gist = inputs.gist.packages.${prev.system}.default;
+            tmpl = inputs.tmpl.packages.${prev.system}.default;
+            gomodinit = inputs.gomodinit.packages.${prev.system}.default;
+            cfg = inputs.cfg.packages.${prev.system}.default;
+            blog = inputs.blog.packages.${prev.system}.default;
+            bennet = inputs.bennet.packages.${prev.system}.default;
+          };
+          tclip = inputs.tclip.packages.${prev.system}.tclip;
+          templ = inputs.templ.packages.${prev.system}.templ;
+        })
+        inputs.golink.overlay
+      ];
+      pkgs = import inputs.nixpkgs {
+        inherit overlays system;
+        config.allowUnfree = true;
       };
-    };
-    username = "jolheiser";
-    system = "x86_64-linux";
-    homeManagerModules = [
-      agenix.homeManagerModules.age
-      {
-        home = {
-          inherit username;
-          homeDirectory = "/home/${username}";
+      commonConfig =
+        { config, ... }:
+        {
+          config = {
+            nixpkgs.overlays = overlays;
+            # TODO Remove when apps are updated
+            nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
+          };
         };
-        age = {
-          secretsDir = "/home/${username}/.agenix/agenix";
-          secretsMountPoint = "/home/${username}/.agenix/agenix.d";
-          identityPaths = ["/home/${username}/.ssh/nix"];
-          secrets = {
-            ssh-config.file = ./secrets/shared/ssh-config.age;
-            spotify = {
-              file = ./secrets/shared/spotify.age;
-              path = "/home/${username}/.cache/spotify-player/credentials.json";
-            };
-            irc-pw.file = ./secrets/shared/irc-pw.age;
-            gist-pw.file = ./secrets/shared/gist-pw.age;
-            git-send-email.file = ./secrets/shared/git-send-email.age;
-            cachix = {
-              file = ./secrets/shared/cachix.age;
-              path = "/home/${username}/.config/cachix/cachix.dhall";
+      username = "jolheiser";
+      system = "x86_64-linux";
+      homeManagerModules = [
+        agenix.homeManagerModules.age
+        {
+          home = {
+            inherit username;
+            homeDirectory = "/home/${username}";
+          };
+          age = {
+            secretsDir = "/home/${username}/.agenix/agenix";
+            secretsMountPoint = "/home/${username}/.agenix/agenix.d";
+            identityPaths = [ "/home/${username}/.ssh/nix" ];
+            secrets = {
+              ssh-config.file = ./secrets/shared/ssh-config.age;
+              spotify = {
+                file = ./secrets/shared/spotify.age;
+                path = "/home/${username}/.cache/spotify-player/credentials.json";
+              };
+              irc-pw.file = ./secrets/shared/irc-pw.age;
+              gist-pw.file = ./secrets/shared/gist-pw.age;
+              git-send-email.file = ./secrets/shared/git-send-email.age;
+              cachix = {
+                file = ./secrets/shared/cachix.age;
+                path = "/home/${username}/.config/cachix/cachix.dhall";
+              };
             };
           };
+        }
+        ./apps/gui
+      ];
+    in
+    {
+      inherit homeManagerModules;
+      homeConfigurations = {
+        "jolheiser" = home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+          modules = homeManagerModules;
         };
-      }
-      ./apps/gui
-    ];
-  in {
-    inherit homeManagerModules;
-    homeConfigurations = {
-      "jolheiser" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        modules = homeManagerModules;
       };
-    };
-    nixosConfigurations = {
-      "matcha" = nixpkgs.lib.nixosSystem {
-        inherit system;
-        modules = [
-          ./machines/matcha
-          commonConfig
-        ];
+      nixosConfigurations = {
+        "matcha" = nixpkgs.lib.nixosSystem {
+          inherit system;
+          modules = [
+            ./machines/matcha
+            commonConfig
+          ];
+        };
+        "genmaicha" = nixpkgs.lib.nixosSystem {
+          inherit system;
+          modules = [
+            nixos-hardware.nixosModules.framework-13-7040-amd
+            ./machines/genmaicha
+            commonConfig
+          ];
+        };
+        "sencha" = nixpkgs.lib.nixosSystem {
+          inherit system;
+          modules = [
+            ./machines/sencha
+            commonConfig
+          ];
+        };
       };
-      "genmaicha" = nixpkgs.lib.nixosSystem {
-        inherit system;
-        modules = [
-          nixos-hardware.nixosModules.framework-13-7040-amd
-          ./machines/genmaicha
-          commonConfig
-        ];
+      colmena = {
+        meta = {
+          nixpkgs = import nixpkgs { inherit overlays system; };
+        };
+        dragonwell =
+          { pkgs, ... }:
+          {
+            imports = [
+              inputs.agenix.nixosModules.default
+              inputs.golink.nixosModules.default
+              inputs.ugit.nixosModules.default
+              inputs.git-pr.nixosModules.default
+              inputs.actual.nixosModules.default
+              inputs.tsnet-serve.nixosModules.default
+              ./modules/tclip
+              ./machines/dragonwell
+            ];
+            services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd;
+          };
       };
-      "sencha" = nixpkgs.lib.nixosSystem {
-        inherit system;
-        modules = [
-          ./machines/sencha
-          commonConfig
+      nixConfig = {
+        extra-substitutors = [ "https://jolheiser.cachix.org" ];
+        extra-trusted-public-keys = [
+          "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="
         ];
       };
-    };
-    colmena = {
-      meta = {
-        nixpkgs = import nixpkgs {
-          inherit overlays system;
-        };
-      };
-      dragonwell = {pkgs, ...}: {
-        imports = [
-          inputs.agenix.nixosModules.default
-          inputs.golink.nixosModules.default
-          inputs.ugit.nixosModules.default
-          inputs.git-pr.nixosModules.default
-          inputs.actual.nixosModules.default
-          inputs.tsnet-serve.nixosModules.default
-          ./modules/tclip
-          ./machines/dragonwell
+      devShells.${system}.default = pkgs.mkShell {
+        nativeBuildInputs = [
+          agenix.packages.${system}.agenix
+          pkgs.colmena
         ];
-        services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd;
       };
     };
-    nixConfig = {
-      extra-substitutors = ["https://jolheiser.cachix.org"];
-      extra-trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="];
-    };
-    devShells.${system}.default = pkgs.mkShell {
-      nativeBuildInputs = [
-        agenix.packages.${system}.agenix
-        pkgs.colmena
-      ];
-    };
-  };
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix
index 1c509f057fd210267ead1e2aa666d9a32fc72a8b..cb201071c12567b05fe4ae5978f05fc6460b5ffb 100644
--- a/machines/common/gui/default.nix
+++ b/machines/common/gui/default.nix
@@ -1,9 +1,12 @@
-{pkgs, ...}: {
-  imports = [../nogui];
+{ 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 @@         variant = "";
       };
     };
   };
-  fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono" "Iosevka" "Hack"];}) monaspace];
-  environment.systemPackages = [pkgs.tailscale-systray];
+  fonts.packages = with pkgs; [
+    (nerdfonts.override {
+      fonts = [
+        "JetBrainsMono"
+        "Iosevka"
+        "Hack"
+      ];
+    })
+    monaspace
+  ];
+  environment.systemPackages = [ pkgs.tailscale-systray ];
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

diff --git a/machines/common/nogui/default.nix b/machines/common/nogui/default.nix
index 2343af3ff189f866438590a78cba0939dea5920f..8bc8c87c92ab9c0940eb07e1b0ed11053766dd7f 100644
--- a/machines/common/nogui/default.nix
+++ b/machines/common/nogui/default.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   console.colors = [
     "1e1e2e"
     "585b70"
@@ -45,12 +46,20 @@   nix = {
     gc.automatic = true;
     package = pkgs.nixVersions.stable;
     settings = {
-      trusted-users = ["@sudo" "@wheel" "jolheiser"];
-      experimental-features = ["flakes" "nix-command" "repl-flake"];
+      trusted-users = [
+        "@sudo"
+        "@wheel"
+        "jolheiser"
+      ];
+      experimental-features = [
+        "flakes"
+        "nix-command"
+        "repl-flake"
+      ];
       auto-optimise-store = true;
       warn-dirty = false;
-      substituters = ["https://jolheiser.cachix.org"];
-      trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="];
+      substituters = [ "https://jolheiser.cachix.org" ];
+      trusted-public-keys = [ "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg=" ];
     };
   };
 
@@ -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
+    ];
   };
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50

diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix
index 52b17742d7e965583a5105eb66a19d952ede413c..7621f1aa8a5b0a079bdd38d76fabf060f69aa5dd 100644
--- a/machines/dragonwell/caddy.nix
+++ b/machines/dragonwell/caddy.nix
@@ -1,6 +1,8 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
+let
   modules = import ./go.nix;
-in {
+in
+{
   services.caddy = {
     enable = true;
     virtualHosts = {
@@ -8,15 +10,17 @@       "jolheiser.com" = {
         extraConfig = ''
           handle_path /.well-known/webfinger {
             header Content-Type application/jrd+json
-            respond ${builtins.toJSON {
-            subject = "acct:john@jolheiser.com";
-            links = [
-              {
-                rel = "http://openid.net/specs/connect/1.0/issuer";
-                href = "https://auth.jolheiser.com";
+            respond ${
+              builtins.toJSON {
+                subject = "acct:john@jolheiser.com";
+                links = [
+                  {
+                    rel = "http://openid.net/specs/connect/1.0/issuer";
+                    href = "https://auth.jolheiser.com";
+                  }
+                ];
               }
-            ];
-          }}
+            }
           }
           handle_path /bennet* {
             root * ${pkgs.jolheiser.bennet}
@@ -32,7 +36,7 @@             root * ${pkgs.jolheiser.website}
             file_server
           }
         '';
-        serverAliases = ["www.jolheiser.com"];
+        serverAliases = [ "www.jolheiser.com" ];
       };
       "blog.jolheiser.com" = {
         extraConfig = ''