Home

dotnix @main - refs - log -
-
https://git.jolheiser.com/dotnix.git
My nix dotfiles
tree log patch
chore: nixfmt -> alejandra Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmSnFsMACgkQuFOtpdp7 v3r5pw/9G44c68rIhKB5hhYKCrgZCAOTD+0pPQHTm6ni/fwdZp54vCZs+DTGapi1 za4ZKCS42ODK7MjdfxoCH9miZKzwAyQ41Sb4HNIlKQmf4XC8SZKJUN4lzetEyIYL 2Db7okQpwKMwqwuD8o34v0MrezaGDyp7fVyLG7IzcG+/PPw0vjRzIPW66gNaZc2O AEOajnsqh5arkQu3DaXRa37zXZsXUkjcSjRvMfEynGXCc7UJvZ63HOvdOhqUVbek 0dNpQrS1y2KCikda2OVNuERzn6lWLHbZKWtL+i3AzYnNJ1otCKlyjEAzg2M4+o87 QnnLS02ItTfHCSRHjN4KP5BDOWU1DJoBV8q4uO/pnaH5loipDmTY9yHlOVN7gVVY VsyYspQhycQBJZRevlRmopoXbgEYpQG3niJ2C3++pK0GmKY69yPvt2Hv+eQ8Gk1q +aF+z2zEFRCaOGsqiYMrDzaZpjpERldqQfRRtqqGn0eA9FKkHiIN8pPQA+C6Ks85 0UdUF0TKBulQK1YMv7Lwt4xoJjuxFADzmmyqOnwa95yhTH7dzn2qUMJ+uRPO7lny z6y8CLh0F4nU+QpfWqNr3APFStXAH9nd9W1PlJ2ZI3AgvAqz2hV37zRT94RJNorG 92q5HTqg90iMYRYihRz/81nd4t6GBbjLrfMHqRc0tdJgca5tdLk= =6VyD -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
2 years ago
20 changed files, 196 additions(+), 180 deletions(-)
apps/bat.nixapps/bottom.nixapps/default.nixapps/firefox.nixapps/git.nixapps/go.nixapps/gpg.nixapps/helix.nixapps/jq.nixapps/nushell.nixapps/oh-my-posh.nixapps/zoxide.nixflake.nixmachines/chai/default.nixmachines/chai/hardware.nixmachines/common/default.nixmachines/common/sound.nixmachines/common/xserver.nixmachines/matcha/default.nixmachines/matcha/hardware.nix
M apps/bat.nixapps/bat.nix
 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
diff --git a/apps/bat.nix b/apps/bat.nix
index 4ad3045b65ae0284a89819d25c2dc8ee8555f7e6..ff6b2869d783e19f9fc911b7a040e9e0abcc33e5 100644
--- a/apps/bat.nix
+++ b/apps/bat.nix
@@ -1,14 +1,15 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   programs.bat = {
     enable = true;
-    config = { theme = "ctp-mocha"; };
+    config = {theme = "ctp-mocha";};
     themes = {
       ctp-mocha = builtins.readFile (pkgs.fetchFromGitHub {
-        owner = "catppuccin";
-        repo = "bat";
-        rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-        sha256 = "1g2r6j33f4zys853i1c5gnwcdbwb6xv5w6pazfdslxf69904lrg9";
-      } + "/Catppuccin-mocha.tmTheme");
+          owner = "catppuccin";
+          repo = "bat";
+          rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+          sha256 = "1g2r6j33f4zys853i1c5gnwcdbwb6xv5w6pazfdslxf69904lrg9";
+        }
+        + "/Catppuccin-mocha.tmTheme");
     };
   };
 }
M apps/bottom.nixapps/bottom.nix
 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/bottom.nix b/apps/bottom.nix
index 44843edd4791018e9be93b7bdcf1018514db9995..e7d4b88a7930a98361ad2a5082aa5d4d37eb8f2e 100644
--- a/apps/bottom.nix
+++ b/apps/bottom.nix
@@ -6,8 +6,7 @@       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";
@@ -23,8 +22,7 @@         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";
       };
     };
M apps/default.nixapps/default.nix
 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
diff --git a/apps/default.nix b/apps/default.nix
index ed9a189f9b81030cac05f7107ea2fc6d4a4660c1..ae5140551d68b8ecf893a30f25440a3738d2aa27 100644
--- a/apps/default.nix
+++ b/apps/default.nix
@@ -1,4 +1,8 @@
-{ pkgs, config, ... }: {
+{
+  pkgs,
+  config,
+  ...
+}: {
   imports = [
     ./bat.nix
     ./bottom.nix
@@ -17,7 +21,6 @@     ./zoxide.nix
   ];
   home = {
     packages = with pkgs; [
-
       # Tools
       age
       bitwarden-cli
@@ -36,10 +39,10 @@       nil
       nodePackages.yaml-language-server
 
       # Formatters
+      alejandra
       black
       gofumpt
       nodePackages.lua-fmt
-      nixfmt
 
       # IDEs
       jetbrains.goland
@@ -53,5 +56,5 @@     '';
     stateVersion = "22.11";
   };
 
-  programs = { home-manager.enable = true; };
+  programs = {home-manager.enable = true;};
 }
M apps/firefox.nixapps/firefox.nix
 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
diff --git a/apps/firefox.nix b/apps/firefox.nix
index 09c7b2f2df2f7696f1f078b1c54a4979f35eda46..c8c6543f219bffb4856950efd8989cb28fb260ac 100644
--- a/apps/firefox.nix
+++ b/apps/firefox.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   programs.firefox = {
     enable = true;
     profiles.default = {
@@ -19,29 +19,31 @@         "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://mynixos.com/"; }
-          { url = "https://github.com/"; }
-          { url = "https://git.jojodev.com/"; }
+          {url = "https://mynixos.com/";}
+          {url = "https://github.com/";}
+          {url = "https://git.jojodev.com/";}
         ];
       };
-      bookmarks = [{
-        name = "Gitea";
-        toolbar = true;
-        bookmarks = [
-          {
-            name = "gitea";
-            tags = [ "gitea" ];
-            keyword = "gitea";
-            url = "https://github.com/go-gitea/gitea";
-          }
-          {
-            name = "jojodev";
-            tags = [ "gitea" ];
-            keyword = "jojodev";
-            url = "https://git.jojodev.com";
-          }
-        ];
-      }];
+      bookmarks = [
+        {
+          name = "Gitea";
+          toolbar = true;
+          bookmarks = [
+            {
+              name = "gitea";
+              tags = ["gitea"];
+              keyword = "gitea";
+              url = "https://github.com/go-gitea/gitea";
+            }
+            {
+              name = "jojodev";
+              tags = ["gitea"];
+              keyword = "jojodev";
+              url = "https://git.jojodev.com";
+            }
+          ];
+        }
+      ];
     };
   };
 }
M apps/git.nixapps/git.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
diff --git a/apps/git.nix b/apps/git.nix
index 33a8cd78d7d0bbe0e68db9256065d0bea530ff14..261293fe10d83410ee5b977c6886209ce05b1494 100644
--- a/apps/git.nix
+++ b/apps/git.nix
@@ -1,4 +1,5 @@
-let key = "0xB853ADA5DA7BBF7A";
+let
+  key = "0xB853ADA5DA7BBF7A";
 in {
   programs.git = {
     enable = true;
@@ -20,7 +21,7 @@       fu = "fetch upstream";
       fo = "fetch origin";
     };
     lfs.enable = true;
-    ignores = [ ".idea/" ];
+    ignores = [".idea/"];
     extraConfig = {
       init.defaultBranch = "main";
       merge.conflictstyle = "diff3";
M apps/go.nixapps/go.nix
1
2
3
4
5
6
7
diff --git a/apps/go.nix b/apps/go.nix
index 0f089ec4eca0ccf8322d3e87c13d24c6f5a2e9ef..8fa1bca795f95dab07d2947216765ef46fcee3ee 100644
--- a/apps/go.nix
+++ b/apps/go.nix
@@ -1 +1 @@
-{ programs.go.enable = true; }
+{programs.go.enable = true;}
M apps/gpg.nixapps/gpg.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
diff --git a/apps/gpg.nix b/apps/gpg.nix
index 1b1ad50b3faf5a2f089c0ecb9b55af6dc435a3ce..8a6f77d25e12008bcf404547836f9da02d2a7855 100644
--- a/apps/gpg.nix
+++ b/apps/gpg.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
-let key = "0xB853ADA5DA7BBF7A";
+{pkgs, ...}: let
+  key = "0xB853ADA5DA7BBF7A";
 in {
-  home.packages = with pkgs; [ pinentry ];
+  home.packages = with pkgs; [pinentry];
   programs.gpg = {
     enable = true;
     settings = {
M apps/helix.nixapps/helix.nix
  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
diff --git a/apps/helix.nix b/apps/helix.nix
index 9052328aebba15a3f6216f69d77e7d6eea117f5a..d6b637696a42caec3a42110ee1687b745821498a 100644
--- a/apps/helix.nix
+++ b/apps/helix.nix
@@ -14,12 +14,12 @@           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"
@@ -29,7 +29,7 @@             "position"
             "file-encoding"
           ];
         };
-        lsp = { display-messages = true; };
+        lsp = {display-messages = true;};
       };
       keys = {
         normal = {
@@ -45,33 +45,33 @@           "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";
@@ -90,17 +90,16 @@             "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 = {
@@ -108,28 +107,28 @@               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"
@@ -146,7 +145,7 @@           ];
           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"];
         };
       };
     };
@@ -157,14 +156,14 @@           name = "jsonnet";
           auto-format = true;
           formatter = {
             command = "jsonnetfmt";
-            args = [ "-" ];
+            args = ["-"];
           };
         }
         {
           name = "go";
           formatter = {
             command = "gofumpt";
-            args = [ ];
+            args = [];
           };
         }
         {
@@ -172,15 +171,15 @@           name = "python";
           auto-format = true;
           formatter = {
             command = "black";
-            args = [ "--quiet" "-" ];
+            args = ["--quiet" "-"];
           };
         }
         {
           name = "nix";
           auto-format = true;
           formatter = {
-            command = "nixfmt";
-            args = [ ];
+            command = "alejandra";
+            args = ["-qq"];
           };
         }
       ];
@@ -188,19 +187,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" = {};
       };
     };
   };
M apps/jq.nixapps/jq.nix
1
2
3
4
5
6
7
diff --git a/apps/jq.nix b/apps/jq.nix
index 3c01c415d9a2bd365f83f4ec6a57f64eb6a40692..1cb6a313855f56e4fc1bf64cd314423df4c2109c 100644
--- a/apps/jq.nix
+++ b/apps/jq.nix
@@ -1 +1 @@
-{ programs.jq.enable = true; }
+{programs.jq.enable = true;}
M apps/nushell.nixapps/nushell.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
diff --git a/apps/nushell.nix b/apps/nushell.nix
index 5aee629c492c97b4673c98b9fc6e1414c4443e03..99c5f26ee54a25306c1dc3f20dcce90a541eda8f 100644
--- a/apps/nushell.nix
+++ b/apps/nushell.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   programs.nushell = {
     enable = true;
     configFile.source = ./nushell/config.nu;
M apps/oh-my-posh.nixapps/oh-my-posh.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
diff --git a/apps/oh-my-posh.nix b/apps/oh-my-posh.nix
index 156a4ccf3863ab8fad009e35c593511c7c6ca28a..a763f3fa7cac57df0cd2c803da4e5b9cac9ad806 100644
--- a/apps/oh-my-posh.nix
+++ b/apps/oh-my-posh.nix
@@ -1,7 +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));
   };
 }
M apps/zoxide.nixapps/zoxide.nix
1
2
3
4
5
6
7
diff --git a/apps/zoxide.nix b/apps/zoxide.nix
index d54841661cb9c0288991af3173a6c84c20d939c0..1d60a23bda80b25c83aef3c82bbc6acb2213082a 100644
--- a/apps/zoxide.nix
+++ b/apps/zoxide.nix
@@ -1 +1 @@
-{ programs.zoxide.enable = true; }
+{programs.zoxide.enable = true;}
M flake.nixflake.nix
  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
diff --git a/flake.nix b/flake.nix
index 03ef6932e24f04d4f03a0f76a3276a3bcfdc55b0..d60ee0316ea8374c7a5d7a96e19273c0eb6d8152 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,56 +10,64 @@     nur.url = "github:nix-community/nur";
     jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
   };
 
-  nixConfig = { warn-dirty = false; };
+  nixConfig = {warn-dirty = false;};
 
-  outputs = { self, nixpkgs, home-manager, jolheiser-nur, ... }@inputs:
-    let
-      overlays = final: prev: {
-        nur = import inputs.nur {
-          nurpkgs = prev;
-          pkgs = prev;
-          repoOverrides = {
-            jolheiser = import jolheiser-nur { pkgs = prev; };
-          };
+  outputs = {
+    self,
+    nixpkgs,
+    home-manager,
+    jolheiser-nur,
+    ...
+  } @ inputs: let
+    overlays = final: prev: {
+      nur = import inputs.nur {
+        nurpkgs = prev;
+        pkgs = prev;
+        repoOverrides = {
+          jolheiser = import jolheiser-nur {pkgs = prev;};
         };
       };
-      commonConfig = { username }:
-        ({ config, pkgs, ... }: {
-          config = {
-            nixpkgs.overlays = [ overlays ];
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              sharedModules = [
-                # inputs.jolheiser-nur.homeManagerModules.default
-              ];
-              users.${username}.imports = [ ./apps ];
-              extraSpecialArgs = {
-                flakePath = "/home/${username}/.config/nixpkgs";
-              };
-            };
-          };
-        });
-    in {
-      nixosConfigurations = {
-        "chai" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            home-manager.nixosModules.home-manager
-            ./machines/common
-            ./machines/chai
-            (commonConfig { username = "jolheiser"; })
+    };
+    commonConfig = {username}: ({
+      config,
+      pkgs,
+      ...
+    }: {
+      config = {
+        nixpkgs.overlays = [overlays];
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          sharedModules = [
+            # inputs.jolheiser-nur.homeManagerModules.default
           ];
+          users.${username}.imports = [./apps];
+          extraSpecialArgs = {
+            flakePath = "/home/${username}/.config/nixpkgs";
+          };
         };
-        "matcha" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            home-manager.nixosModules.home-manager
-            ./machines/common
-            ./machines/matcha
-            (commonConfig { username = "jolheiser"; })
-          ];
-        };
+      };
+    });
+  in {
+    nixosConfigurations = {
+      "chai" = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          home-manager.nixosModules.home-manager
+          ./machines/common
+          ./machines/chai
+          (commonConfig {username = "jolheiser";})
+        ];
+      };
+      "matcha" = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          home-manager.nixosModules.home-manager
+          ./machines/common
+          ./machines/matcha
+          (commonConfig {username = "jolheiser";})
+        ];
       };
     };
+  };
 }
M machines/chai/default.nixmachines/chai/default.nix
 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
diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index 7bbb7e3ad9592a6c3337e836957ad6aecc4083cf..3f198f26cf2646b5edd98f431cfa862af028fa0f 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -1,17 +1,17 @@
-{ pkgs, ... }:
-let username = "jolheiser";
+{pkgs, ...}: let
+  username = "jolheiser";
 in {
-  imports = [ ./hardware.nix ../common ];
+  imports = [./hardware.nix ../common];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = [ "quiet" "splash" ];
+    kernelParams = ["quiet" "splash"];
     loader.efi.canTouchEfiVariables = true;
     loader.systemd-boot.enable = true;
     initrd.systemd.enable = true;
   };
 
-  hardware = { bluetooth.enable = true; };
+  hardware = {bluetooth.enable = true;};
 
   networking = {
     hostName = "chai";
@@ -31,14 +31,14 @@     blueman.enable = true;
     pcscd.enable = true;
     openssh = {
       enable = true;
-      settings = { X11Forwarding = true; };
+      settings = {X11Forwarding = true;};
     };
   };
 
   virtualisation.docker.enable = true;
 
   users.users."${username}" = {
-    extraGroups = [ "wheel" "docker" ];
+    extraGroups = ["wheel" "docker"];
     isNormalUser = true;
     shell = pkgs.nushell;
   };
M machines/chai/hardware.nixmachines/chai/hardware.nix
 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
diff --git a/machines/chai/hardware.nix b/machines/chai/hardware.nix
index 19946417ed675c5e1fe1fa4a8d958ca4568b0520..cce8a8beffa8898f7aff21ac27f09c4527ff13e1 100644
--- a/machines/chai/hardware.nix
+++ b/machines/chai/hardware.nix
@@ -1,29 +1,30 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/b8a0cc98-5882-4b69-a8cb-375726767606";
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-bd0a4998-266e-4aae-8f20-89561a2fa169".device =
-    "/dev/disk/by-uuid/bd0a4998-266e-4aae-8f20-89561a2fa169";
+  boot.initrd.luks.devices."luks-bd0a4998-266e-4aae-8f20-89561a2fa169".device = "/dev/disk/by-uuid/bd0a4998-266e-4aae-8f20-89561a2fa169";
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/5531-69DC";
     fsType = "vfat";
   };
 
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/eb7acf5d-e5db-45fa-8691-8ef5641cde68"; }];
+  swapDevices = [{device = "/dev/disk/by-uuid/eb7acf5d-e5db-45fa-8691-8ef5641cde68";}];
 
   networking.useDHCP = lib.mkDefault true;
 
M machines/common/default.nixmachines/common/default.nix
 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
diff --git a/machines/common/default.nix b/machines/common/default.nix
index 07e48a6c14b4fea9f69e4fbe67a5eac1741d5c71..b181e9515b3a43f5c87a26cc9c7995ab0eeb5010 100644
--- a/machines/common/default.nix
+++ b/machines/common/default.nix
@@ -1,5 +1,5 @@
-{ pkgs, ... }: {
-  imports = [ ./sound.nix ./xserver.nix ];
+{pkgs, ...}: {
+  imports = [./sound.nix ./xserver.nix];
 
   console.colors = [
     "1e1e2e"
@@ -47,7 +47,7 @@   nix = {
     gc.automatic = true;
     package = pkgs.nixVersions.nix_2_15;
     settings = {
-      experimental-features = [ "flakes" "nix-command" "repl-flake" ];
+      experimental-features = ["flakes" "nix-command" "repl-flake"];
       auto-optimise-store = true;
     };
   };
@@ -60,9 +60,8 @@     '';
   };
 
   environment = {
-    systemPackages = with pkgs; [ podman podman-compose podman-tui ];
+    systemPackages = with pkgs; [podman podman-compose podman-tui];
   };
 
-  fonts.fonts = with pkgs;
-    [ (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ];
+  fonts.fonts = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono"];})];
 }
M machines/common/sound.nixmachines/common/sound.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
diff --git a/machines/common/sound.nix b/machines/common/sound.nix
index bcb852a73e450a7891bc6d1499f7bc998dd28227..aa630608409417081dca06ed78155f14c27a9ea0 100644
--- a/machines/common/sound.nix
+++ b/machines/common/sound.nix
@@ -1,7 +1,7 @@
 {
   sound.enable = true;
   hardware.pulseaudio.enable = false;
-  security = { rtkit.enable = true; };
+  security = {rtkit.enable = true;};
   services = {
     pipewire = {
       enable = true;
M machines/common/xserver.nixmachines/common/xserver.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
diff --git a/machines/common/xserver.nix b/machines/common/xserver.nix
index eb712def0b8e50c6eef9d5902a7a1c882c5e9bb0..de0d030d95a15afc1506b4497b1462bcb958d903 100644
--- a/machines/common/xserver.nix
+++ b/machines/common/xserver.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   services.xserver = {
     enable = true;
     displayManager.lightdm.enable = true;
M machines/matcha/default.nixmachines/matcha/default.nix
 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
diff --git a/machines/matcha/default.nix b/machines/matcha/default.nix
index 44babaf4ddc1626207a6cd730427f0fa0bf7f0a4..d29994c03c77897f1f5fdcff3bc20dc80047cd33 100644
--- a/machines/matcha/default.nix
+++ b/machines/matcha/default.nix
@@ -1,11 +1,11 @@
-{ pkgs, ... }:
-let username = "jolheiser";
+{pkgs, ...}: let
+  username = "jolheiser";
 in {
-  imports = [ ./hardware.nix ../common ];
+  imports = [./hardware.nix ../common];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = [ "quiet" "splash" ];
+    kernelParams = ["quiet" "splash"];
     loader.grub = {
       enable = true;
       device = "/dev/sda";
@@ -14,7 +14,7 @@       enableCryptodisk = true;
     };
   };
 
-  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 +24,7 @@       keyFile = "/crypto_keyfile.bin";
     };
   };
 
-  hardware = { bluetooth.enable = true; };
+  hardware = {bluetooth.enable = true;};
 
   networking = {
     hostName = "matcha";
@@ -41,7 +41,7 @@
   virtualisation.docker.enable = true;
 
   users.users."${username}" = {
-    extraGroups = [ "wheel" "docker" "storage" ];
+    extraGroups = ["wheel" "docker" "storage"];
     isNormalUser = true;
     shell = pkgs.nushell;
   };
M machines/matcha/hardware.nixmachines/matcha/hardware.nix
 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
diff --git a/machines/matcha/hardware.nix b/machines/matcha/hardware.nix
index 35e7318320df922693feb64830187334f2a29f6d..1ebefc6592af542c9ca332ae046c077e55e5ff36 100644
--- a/machines/matcha/hardware.nix
+++ b/machines/matcha/hardware.nix
@@ -1,8 +1,13 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, modulesPath, ... }: {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
   boot.initrd.availableKernelModules = [
     "xhci_pci"
@@ -13,9 +18,9 @@     "usbhid"
     "sd_mod"
     "rtsx_pci_sdmmc"
   ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/a3e3e496-9497-4340-9750-2104e2ab22ab";
@@ -27,11 +32,9 @@     device = "/dev/disk/by-uuid/eb8ad2da-12cf-454b-aa20-e497c4550b7c";
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".device =
-    "/dev/disk/by-uuid/1f9bde68-9c4c-423c-a95f-17aa170dd2b4";
+  boot.initrd.luks.devices."luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".device = "/dev/disk/by-uuid/1f9bde68-9c4c-423c-a95f-17aa170dd2b4";
 
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/7e84d904-b00a-4c6c-aba4-ec1dde2dff85"; }];
+  swapDevices = [{device = "/dev/disk/by-uuid/7e84d904-b00a-4c6c-aba4-ec1dde2dff85";}];
 
   # 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