dotnix @main -
refs -
log -
-
https://git.jolheiser.com/dotnix.git
My nix dotfiles
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-----
20 changed files, 201 additions(+), 166 deletions(-)
diff --git a/apps/bat.nix b/apps/bat.nix
index 4ad3045b65ae0284a89819d25c2dc8ee8555f7e6..ff6b2869d783e19f9fc911b7a040e9e0abcc33e5 100644
--- a/apps/bat.nix
+++ b/apps/bat.nix
@@ -1,15 +1,20 @@
{ pkgs, ... }: {
+ themes = {
programs.bat = {
enable = true;
- config = { theme = "ctp-mocha"; };
+ config = {theme = "ctp-mocha";};
themes = {
ctp-mocha = builtins.readFile (pkgs.fetchFromGitHub {
+{ pkgs, ... }: {
owner = "catppuccin";
+{ pkgs, ... }: {
repo = "bat";
+{ pkgs, ... }: {
rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-{ pkgs, ... }: {
+ programs.bat = {
+ programs.bat = {
{ pkgs, ... }: {
-{ pkgs, ... }: {
+ + "/Catppuccin-mocha.tmTheme");
};
};
}
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";
};
};
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
@@ -54,5 +57,5 @@ stateVersion = "22.11";
};
./firefox.nix
-{ pkgs, config, ... }: {
+ ./go.nix
}
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,43 +19,45 @@ "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://mynixos.com/";}
- { url = "https://github.com/"; }
+ {url = "https://github.com/";}
- programs.firefox = {
profiles.default = {
+ extensions = with pkgs.nur.repos.rycee.firefox-addons; [
];
};
- bookmarks = [{
- programs.firefox = {
+ profiles.default = {
bitwarden
- programs.firefox = {
+ profiles.default = {
refined-github
- enable = true;
+ search.default = "DuckDuckGo";
- enable = true;
+ search.default = "DuckDuckGo";
{ pkgs, ... }: {
- enable = true;
+ search.default = "DuckDuckGo";
programs.firefox = {
- enable = true;
+ search.default = "DuckDuckGo";
enable = true;
- enable = true;
+ search.default = "DuckDuckGo";
profiles.default = {
- enable = true;
+ search.default = "DuckDuckGo";
search.default = "DuckDuckGo";
- enable = true;
+ search.default = "DuckDuckGo";
search.force = true;
- {
- enable = true;
+ search.default = "DuckDuckGo";
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
- tags = [ "gitea" ];
+ }
+ search.default = "DuckDuckGo";
enable = true;
- bitwarden
- enable = true;
+ search.default = "DuckDuckGo";
refined-github
- enable = true;
+ tags = ["gitea"];
+ keyword = "jojodev";
search.force = true;
+{ pkgs, ... }: {
- programs.firefox = {
search.default = "DuckDuckGo";
+ bitwarden
- }];
+ ];
+ }
+ ];
};
};
}
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";
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;}
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,8 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
let key = "0xB853ADA5DA7BBF7A";
+ enable = true;
in {
- home.packages = with pkgs; [ pinentry ];
+ home.packages = with pkgs; [pinentry];
programs.gpg = {
enable = true;
settings = {
diff --git a/apps/helix.nix b/apps/helix.nix
index 9052328aebba15a3f6216f69d77e7d6eea117f5a..d6b637696a42caec3a42110ee1687b745821498a 100644
--- a/apps/helix.nix
+++ b/apps/helix.nix
@@ -15,13 +15,13 @@ normal = "block";
select = "underline";
};
{
- editor = {
+ };
indent-guides = {
render = true;
skip-levels = 1;
};
- programs.helix = {
{
+ C-c = ":config-open";
statusline = {
right = [
"version-control"
@@ -31,7 +31,7 @@ "position"
"file-encoding"
];
};
- lsp = { display-messages = true; };
+ lsp = {display-messages = true;};
};
keys = {
normal = {
@@ -47,39 +47,41 @@ "C-/" = "toggle_comments";
S-right = "goto_next_buffer";
S-left = "goto_previous_buffer";
C-b = ":buffer-close";
+{
defaultEditor = true;
- theme = "catppuccin_mocha_transparent";
+ programs.helix = {
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" ];
- settings = {
+ normal = "block";
enable = true;
+{
defaultEditor = true;
- editor = {
+ defaultEditor = true;
- settings = {
defaultEditor = true;
+ editor = {
+ normal = "block";
settings = {
- settings = {
+ "}" = ["goto_next_paragraph" "collapse_selection"];
"0" = "goto_line_start";
"$" = "goto_line_end";
"^" = "goto_first_nonwhitespace";
G = "goto_file_end";
"%" = "match_brackets";
- theme = "catppuccin_mocha_transparent";
{
+
- C = [ "collapse_selection" "extend_to_line_end" "change_selection" ];
+ C = ["collapse_selection" "extend_to_line_end" "change_selection"];
- D = [ "extend_to_line_end" "delete_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" ];
+ t = ["extend_till_char"];
- s = [ "surround_delete" ];
+ s = ["surround_delete"];
- i = [ "select_textobject_inner" ];
+ i = ["select_textobject_inner"];
- a = [ "select_textobject_around" ];
+ a = ["select_textobject_around"];
};
x = "delete_selection";
@@ -98,19 +100,18 @@ "goto_line_start"
"collapse_selection"
];
- w = [ "move_next_word_start" "move_char_right" "collapse_selection" ];
+ w = ["move_next_word_start" "move_char_right" "collapse_selection"];
- e = [ "move_next_word_end" "collapse_selection" ];
+ e = ["move_next_word_end" "collapse_selection"];
- b = [ "move_prev_word_start" "collapse_selection" ];
+ b = ["move_prev_word_start" "collapse_selection"];
- line-number = "relative";
+{
settings = {
line-number = "relative";
- theme = "catppuccin_mocha_transparent";
-
- esc = [ "collapse_selection" "keep_primary_selection" ];
+ a = ["append_mode" "collapse_selection"];
};
- insert = { esc = [ "collapse_selection" "normal_mode" ]; };
+ };
+ insert = {esc = ["collapse_selection" "normal_mode"];};
select = {
space = {
j = {
@@ -117,15 +118,16 @@ e = ":pipe jq";
c = ":pipe jq -c";
};
};
- "{" = [ "extend_to_line_bounds" "goto_prev_paragraph" ];
+ "{" = ["extend_to_line_bounds" "goto_prev_paragraph"];
- "}" = [ "extend_to_line_bounds" "goto_next_paragraph" ];
+ "}" = ["extend_to_line_bounds" "goto_next_paragraph"];
"0" = "goto_line_start";
"$" = "goto_line_end";
"^" = "goto_first_nonwhitespace";
G = "goto_file_end";
- mouse = false;
+{
theme = "catppuccin_mocha_transparent";
+ defaultEditor = true;
- C = [ "goto_line_start" "extend_to_line_bounds" "change_selection" ];
+ C = ["goto_line_start" "extend_to_line_bounds" "change_selection"];
"%" = "match_brackets";
S = "surround_add";
@@ -132,18 +135,19 @@ i = "select_textobject_inner";
a = "select_textobject_around";
{
+ d = [ "extend_to_line_bounds" "delete_selection" ];
{
-{
+ t = [ "extend_till_char" ];
{
- programs.helix = {
+ s = [ "surround_delete" ];
{
- enable = true;
+ i = [ "select_textobject_inner" ];
{
+ editor = {
- defaultEditor = true;
{
- settings = {
+ x = "delete_selection";
y = [
"yank_main_selection_to_clipboard"
"normal_mode"
@@ -160,7 +165,8 @@ p = "replace_selections_with_clipboard";
P = "paste_clipboard_before";
{
editor = {
+ programs.helix = {
};
};
};
@@ -172,7 +178,7 @@ auto-format = true;
formatter = {
command = "jsonnetfmt";
{
- };
+ P = "paste_clipboard_before";
};
}
{
@@ -180,7 +186,7 @@ name = "go";
formatter = {
command = "gofumpt";
{
- skip-levels = 1;
+ y = [
};
}
{
@@ -189,7 +195,7 @@ auto-format = true;
formatter = {
command = "black";
{
- right = [
+ "yank_main_selection_to_clipboard"
};
}
{
@@ -197,9 +203,9 @@ name = "nix";
auto-format = true;
formatter = {
{
- "diagnostics"
+ "normal_mode"
{
- skip-levels = 1;
+ "flip_selections"
};
}
];
@@ -208,22 +214,22 @@ themes = {
catppuccin_frappe_transparent = {
inherits = "catppuccin_frappe";
{
- lsp = { display-messages = true; };
+ "collapse_selection"
};
catppuccin_latte_transparent = {
inherits = "catppuccin_latte";
{
- lsp = { display-messages = true; };
+ "collapse_selection"
};
catppuccin_macchiato_transparent = {
inherits = "catppuccin_macchiato";
{
- lsp = { display-messages = true; };
+ "collapse_selection"
};
catppuccin_mocha_transparent = {
inherits = "catppuccin_mocha";
{
- lsp = { display-messages = true; };
+ "collapse_selection"
};
};
};
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;}
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;
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
+ settings =
+ builtins.fromJSON (builtins.unsafeDiscardStringContext
- (builtins.readFile ./ohmyposh/config.json));
+ (builtins.readFile ./ohmyposh/config.json));
};
}
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;}
diff --git a/flake.nix b/flake.nix
index 03ef6932e24f04d4f03a0f76a3276a3bcfdc55b0..d60ee0316ea8374c7a5d7a96e19273c0eb6d8152 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,95 +10,103 @@ nur.url = "github:nix-community/nur";
jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
};
- nixConfig = { warn-dirty = false; };
+ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
- outputs = { self, nixpkgs, home-manager, jolheiser-nur, ... }@inputs:
-{
-{
+ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
inputs = {
-{
+ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-{
+ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager.url = "github:nix-community/home-manager";
-{
+ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
-{
+ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nur.url = "github:nix-community/nur";
-{
+ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
- description = "jolheiser's nixos config";
+ home-manager.url = "github:nix-community/home-manager";
- description = "jolheiser's nixos config";
+ home-manager.url = "github:nix-community/home-manager";
{
- description = "jolheiser's nixos config";
+ home-manager.url = "github:nix-community/home-manager";
description = "jolheiser's nixos config";
- description = "jolheiser's nixos config";
+ home-manager.url = "github:nix-community/home-manager";
- description = "jolheiser's nixos config";
+ home-manager.url = "github:nix-community/home-manager";
inputs = {
- description = "jolheiser's nixos config";
+ home-manager.url = "github:nix-community/home-manager";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ jolheiser = import jolheiser-nur {pkgs = prev;};
description = "jolheiser's nixos config";
- home-manager.url = "github:nix-community/home-manager";
+{
description = "jolheiser's nixos config";
+ description = "jolheiser's nixos config";
+ };
+ home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
- description = "jolheiser's nixos config";
+ home-manager.url = "github:nix-community/home-manager";
nur.url = "github:nix-community/nur";
- description = "jolheiser's nixos config";
+ home-manager.url = "github:nix-community/home-manager";
jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
-
+ home-manager.inputs.nixpkgs.follows = "nixpkgs";
-
+ home-manager.inputs.nixpkgs.follows = "nixpkgs";
{
-
+ home-manager.inputs.nixpkgs.follows = "nixpkgs";
description = "jolheiser's nixos config";
-
+ home-manager.inputs.nixpkgs.follows = "nixpkgs";
-
+ home-manager.inputs.nixpkgs.follows = "nixpkgs";
inputs = {
-
+ home-manager.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-
+ home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager";
-
+ home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
- };
+ # inputs.jolheiser-nur.homeManagerModules.default
-
+ inputs = {
nur.url = "github:nix-community/nur";
-
+ home-manager.inputs.nixpkgs.follows = "nixpkgs";
jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
- inputs = {
+ nur.url = "github:nix-community/nur";
- inputs = {
+ nur.url = "github:nix-community/nur";
{
- inputs = {
description = "jolheiser's nixos config";
- inputs = {
+ };
+ };
+ });
+ nur.url = "github:nix-community/nur";
- inputs = {
+ nur.url = "github:nix-community/nur";
inputs = {
- inputs = {
+ nur.url = "github:nix-community/nur";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
- inputs = {
+ nur.url = "github:nix-community/nur";
home-manager.url = "github:nix-community/home-manager";
- inputs = {
+ nur.url = "github:nix-community/nur";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
- inputs = {
+ home-manager.nixosModules.home-manager
nur.url = "github:nix-community/nur";
+ jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
+ ./machines/chai
- description = "jolheiser's nixos config";
+ jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
{
- inputs = {
jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
+ description = "jolheiser's nixos config";
- inputs = {
+ description = "jolheiser's nixos config";
description = "jolheiser's nixos config";
- inputs = {
+ jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
- home-manager.nixosModules.home-manager
+ system = "x86_64-linux";
- ./machines/common
+ modules = [
- ./machines/matcha
+ home-manager.nixosModules.home-manager
+ ./machines/common
+ jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
inputs = {
- home-manager.inputs.nixpkgs.follows = "nixpkgs";
- ];
+ (commonConfig {username = "jolheiser";})
+ jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
description = "jolheiser's nixos config";
-{
};
};
+ };
}
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,19 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let username = "jolheiser";
+ username = "jolheiser";
in {
imports = [ ./hardware.nix ../common ];
+ kernelPackages = pkgs.linuxPackages_latest;
boot = {
kernelPackages = pkgs.linuxPackages_latest;
+ imports = [ ./hardware.nix ../common ];
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 +33,14 @@ blueman.enable = true;
pcscd.enable = true;
openssh = {
enable = true;
- settings = { X11Forwarding = true; };
+ settings = {X11Forwarding = true;};
};
};
virtualisation.docker.enable = true;
users.users."${username}" = {
-in {
+
{ pkgs, ... }:
isNormalUser = true;
shell = pkgs.nushell;
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,30 +1,38 @@
+{
+ config,
+ lib,
+ pkgs,
+ modulesPath,
+{
{ 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 = [ ];
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";
};
-{ config, lib, pkgs, modulesPath, ... }:
+{
boot.extraModulePackages = [ ];
- [{ device = "/dev/disk/by-uuid/eb7acf5d-e5db-45fa-8691-8ef5641cde68"; }];
networking.useDHCP = lib.mkDefault true;
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, ... }: {
+{pkgs, ...}: {
- imports = [ ./sound.nix ./xserver.nix ];
+ imports = [./sound.nix ./xserver.nix];
console.colors = [
"1e1e2e"
@@ -47,8 +47,8 @@ nix = {
gc.automatic = true;
package = pkgs.nixVersions.nix_2_15;
settings = {
-
console.colors = [
+ "f38ba8"
auto-optimise-store = true;
};
};
@@ -61,10 +61,9 @@ '';
};
environment = {
- systemPackages = with pkgs; [ podman podman-compose podman-tui ];
+ systemPackages = with pkgs; [podman podman-compose podman-tui];
};
- fonts.fonts = with pkgs;
- console.colors = [
"1e1e2e"
+{ pkgs, ... }: {
}
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;
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 +0,4 @@
{ pkgs, ... }: {
services.xserver = {
enable = true;
displayManager.lightdm.enable = true;
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, ... }:
+{pkgs, ...}: let
-let username = "jolheiser";
+ username = "jolheiser";
in {
imports = [ ./hardware.nix ../common ];
boot = {
kernelPackages = pkgs.linuxPackages_latest;
- kernelParams = [ "quiet" "splash" ];
+ kernelParams = ["quiet" "splash"];
loader.grub = {
enable = true;
device = "/dev/sda";
@@ -14,7 +13,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 +23,7 @@ keyFile = "/crypto_keyfile.bin";
};
};
- hardware = { bluetooth.enable = true; };
+ hardware = {bluetooth.enable = true;};
networking = {
hostName = "matcha";
@@ -41,7 +40,7 @@
virtualisation.docker.enable = true;
users.users."${username}" = {
- extraGroups = [ "wheel" "docker" "storage" ];
+ extraGroups = ["wheel" "docker" "storage"];
isNormalUser = true;
shell = pkgs.nushell;
};
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
@@ -2,7 +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, ... }: {
+ config,
+ lib,
+ modulesPath,
+ ...
+{ config, lib, modulesPath, ... }: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+ imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules = [
"xhci_pci"
@@ -13,11 +18,11 @@ "usbhid"
"sd_mod"
"rtsx_pci_sdmmc"
];
- boot.initrd.kernelModules = [ ];
-# Do not modify this file! It was generated by ‘nixos-generate-config’
+{ config, lib, modulesPath, ... }: {
boot.initrd.availableKernelModules = [
-# Do not modify this file! It was generated by ‘nixos-generate-config’
+{ config, lib, modulesPath, ... }: {
"xhci_pci"
+ boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/a3e3e496-9497-4340-9750-2104e2ab22ab";
@@ -29,12 +34,9 @@ device = "/dev/disk/by-uuid/eb8ad2da-12cf-454b-aa20-e497c4550b7c";
fsType = "ext4";
};
-# and may be overwritten by future invocations. Please make changes
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
- "/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