phundrak/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: phundrak/nix-config:cfedfd8ef29454f3ca9bcf2de7e1dc40f11e672c
Branches Tags
phundrak/nix-config:main phundrak/nix-config:feature/dendritic-rewrite phundrak/nix-config:feature/steamdeck
...
compare: phundrak/nix-config:3874468107678f5ab7164c75abbf0c49a785d21f
Branches Tags
phundrak/nix-config:feature/dendritic-rewrite phundrak/nix-config:main phundrak/nix-config:feature/steamdeck

6 Commits
cfedfd8ef2 ... 3874468107

Author SHA1 Message Date
phundrak 3874468107 feat(sounds): make noisetorch optional 2026-05-24 10:42:13 +02:00
phundrak 20b98780bf refactor(flatpak): simplify flatpak module 2026-05-24 10:42:13 +02:00
phundrak e46c158122 refactor: enable modules to add groups to users themselves 2026-05-24 10:42:13 +02:00
phundrak 19b772b1d2 feat(jujutsu): enable jujutsu shell autocompletion 2026-05-24 10:42:13 +02:00
phundrak 695e011020 refactor(kitty): refactor kitty config with prefix for keybinds 2026-05-24 10:12:51 +02:00
phundrak e26a2bacbb feat(packages): remove (again) KiCad in favour of Flatpak 2026-05-24 10:12:07 +02:00
12 changed files with 101 additions and 79 deletions
Expand all files Collapse all files
hosts/marpa/default.nix
+1
View File
@@ -82,6 +82,7 @@
}; };
sound = { sound = {
enable = true; enable = true;
noisetorch = true;
jack = true; jack = true;
scarlett.enable = true; scarlett.enable = true;
}; };
system/dev/docker.nix
+4 -1
View File
@@ -20,6 +20,9 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
mySystem.users.phundrak = mkIf cfg.mySystem.users.phundrak.enable {
extraGroups = ["docker"] ++ lists.optional cfg.podman.enable "podman";
};
environment.systemPackages = with pkgs; environment.systemPackages = with pkgs;
[ [
dive # A tool for exploring each layer in a docker image dive # A tool for exploring each layer in a docker image
@@ -29,7 +32,7 @@ in {
podman-compose podman-compose
podman-desktop podman-desktop
]; ];
virtualisation = mkIf cfg.enable { virtualisation = {
docker = mkIf (!cfg.podman.enable) { docker = mkIf (!cfg.podman.enable) {
enable = true; enable = true;
enableNvidia = cfg.nvidia.enable; enableNvidia = cfg.nvidia.enable;
system/hardware/sound.nix
+2 -1
View File
@@ -9,6 +9,7 @@ with lib; let
in { in {
options.mySystem.hardware.sound = { options.mySystem.hardware.sound = {
enable = mkEnableOption "Whether to enable sounds with Pipewire"; enable = mkEnableOption "Whether to enable sounds with Pipewire";
noisetorch = mkEnableOption "Whether to activate noisetorch support";
scarlett.enable = mkEnableOption "Activate support for Scarlett sound card"; scarlett.enable = mkEnableOption "Activate support for Scarlett sound card";
alsa = mkOption { alsa = mkOption {
type = types.bool; type = types.bool;
@@ -44,7 +45,7 @@ in {
pulseaudio.enable = false; pulseaudio.enable = false;
}; };
programs.noisetorch = mkIf cfg.enable { programs.noisetorch = mkIf cfg.enable {
inherit (cfg) enable; enable = cfg.noisetorch;
}; };
}; };
} }
system/packages/flatpak.nix
+3 -7
View File
@@ -11,12 +11,8 @@ in {
enable = mkEnableOption "Enable Flatpak support"; enable = mkEnableOption "Enable Flatpak support";
builder.enable = mkEnableOption "Enable Flatpak builder"; builder.enable = mkEnableOption "Enable Flatpak builder";
}; };
config = { config = mkIf cfg.enable {
services.flatpak = mkIf cfg.enable { environment.systemPackages = lists.optional cfg.builder.enable pkgs.flatpak-builder;
inherit (cfg) enable; services.flatpak.enable = true;
};
environment.systemPackages = mkIf cfg.builder.enable [
pkgs.flatpak-buildR
];
}; };
} }
system/users/phundrak.nix
+8 -1
View File
@@ -10,13 +10,20 @@ in {
options.mySystem.users.phundrak = { options.mySystem.users.phundrak = {
enable = mkEnableOption "Enables user phundrak"; enable = mkEnableOption "Enables user phundrak";
trusted = mkEnableOption "Mark the user as trusted by Nix"; trusted = mkEnableOption "Mark the user as trusted by Nix";
extraGroups = mkOption {
type = types.listOf types.str;
default = [];
example = ["feedbackd"];
};
}; };
config = { config = {
users.users.phundrak = mkIf cfg.enable { users.users.phundrak = mkIf cfg.enable {
isNormalUser = true; isNormalUser = true;
description = "Lucien Cartier-Tilet"; description = "Lucien Cartier-Tilet";
extraGroups = ["networkmanager" "wheel" "docker" "dialout" "podman" "plugdev" "games" "audio" "input" "uinput"]; extraGroups =
["networkmanager" "wheel" "dialout" "plugdev" "games" "audio" "input"]
++ extraGroups;
shell = pkgs.zsh; shell = pkgs.zsh;
openssh.authorizedKeys.keyFiles = lib.filesystem.listFilesRecursive ../../users/phundrak/keys; openssh.authorizedKeys.keyFiles = lib.filesystem.listFilesRecursive ../../users/phundrak/keys;
}; };
users/modules/desktop/kitty.nix
+67 -65
View File
@@ -29,84 +29,86 @@ in {
detect_urls = true; detect_urls = true;
background_opacity = 0.7; background_opacity = 0.7;
}; };
keybindings = { keybindings = let
prefix = "kitty_mod+space";
in {
"alt+c" = "copy_to_clipboard"; "alt+c" = "copy_to_clipboard";
"kitty_mod+c" = "copy_to_clipboard"; "kitty_mod+c" = "copy_to_clipboard";
"alt+v" = "paste_from_clipboard"; "alt+v" = "paste_from_clipboard";
"kitty_mod+v" = "paste_from_clipboard"; "kitty_mod+v" = "paste_from_clipboard";
"kitty_mod+s>c" = "show_scrollback"; "${prefix}>s>c" = "show_scrollback";
"kitty_mod+s>down" = "scroll_line_down"; "${prefix}>s>down" = "scroll_line_down";
"kitty_mod+s>t" = "scroll_line_down"; "${prefix}>s>t" = "scroll_line_down";
"kitty_mod+s>up" = "scroll_line_up"; "${prefix}>s>up" = "scroll_line_up";
"kitty_mod+s>s" = "scroll_line_up"; "${prefix}>s>s" = "scroll_line_up";
"kitty_mod+s>end" = "scroll_end"; "${prefix}>s>end" = "scroll_end";
"kitty_mod+s>home" = "scroll_home"; "${prefix}>s>home" = "scroll_home";
"kitty_mod+s>page_down" = "scroll_page_down"; "${prefix}>s>page_down" = "scroll_page_down";
"kitty_mod+s>page_up" = "scroll_page_up"; "${prefix}>s>page_up" = "scroll_page_up";
"kitty_mod+enter" = "new_window"; "${prefix}>enter" = "new_window";
"kitty_mod+w>q" = "close_window"; "${prefix}>w>q" = "close_window";
"kitty_mod+w>p" = "next_window"; "${prefix}>w>p" = "next_window";
"kitty_mod+w>n" = "previous_window"; "${prefix}>w>n" = "previous_window";
"kitty_mod+w>f" = "move_window_forward"; "${prefix}>w>f" = "move_window_forward";
"kitty_mod+w>b" = "move_window_backward"; "${prefix}>w>b" = "move_window_backward";
"kitty_mod+w>t" = "move_window_to_top"; "${prefix}>w>t" = "move_window_to_top";
"kitty_mod+w>r" = "start_resizing_window"; "${prefix}>w>r" = "start_resizing_window";
"kitty_mod+w>1" = "first_window"; "${prefix}>w>1" = "first_window";
"kitty_mod+w>2" = "second_window"; "${prefix}>w>2" = "second_window";
"kitty_mod+w>3" = "third_window"; "${prefix}>w>3" = "third_window";
"kitty_mod+w>4" = "fourth_window"; "${prefix}>w>4" = "fourth_window";
"kitty_mod+w>5" = "fifth_window"; "${prefix}>w>5" = "fifth_window";
"kitty_mod+w>6" = "sixth_window"; "${prefix}>w>6" = "sixth_window";
"kitty_mod+w>7" = "seventh_window"; "${prefix}>w>7" = "seventh_window";
"kitty_mod+w>8" = "eighth_window"; "${prefix}>w>8" = "eighth_window";
"kitty_mod+w>9" = "ninth_window"; "${prefix}>w>9" = "ninth_window";
"kitty_mod+w>0" = "tenth_window"; "${prefix}>w>0" = "tenth_window";
"kitty_mod+tab>n" = "next_tab"; "${prefix}>tab>n" = "next_tab";
"kitty_mod+tab>p" = "previous_tab"; "${prefix}>tab>p" = "previous_tab";
"kitty_mod+tab>c" = "new_tab"; "${prefix}>tab>c" = "new_tab";
"kitty_mod+tab>q" = "close_tab"; "${prefix}>tab>q" = "close_tab";
"kitty_mod+tab>shift+n" = "move_tab_backward"; "${prefix}>tab>shift+n" = "move_tab_backward";
"kitty_mod+tab>shift+p" = "move_tab_forward"; "${prefix}>tab>shift+p" = "move_tab_forward";
"kitty_mod+tab>t" = "set_tab_title"; "${prefix}>tab>t" = "set_tab_title";
"kitty_mod+l" = "next_layout"; "${prefix}>l" = "next_layout";
"kitty_mod+f>equal" = "change_font_size all 0"; "${prefix}>f>equal" = "change_font_size all 0";
"kitty_mod+f>kp_add" = "change_font_size all +2.0"; "${prefix}>f>kp_add" = "change_font_size all +2.0";
"kitty_mod+f>plus" = "change_font_size all +2.0"; "${prefix}>f>plus" = "change_font_size all +2.0";
"kitty_mod+f>kp_subtract" = "change_font_size all -2.0"; "${prefix}>f>kp_subtract" = "change_font_size all -2.0";
"kitty_mod+f>minus" = "change_font_size all -2.0"; "${prefix}>f>minus" = "change_font_size all -2.0";
"kitty_mod+shift+h" = "kitten hints"; "${prefix}>shift+h" = "kitten hints";
"kitty_mod+h>p" = "kitten hints --type path --program -"; "${prefix}>h>p" = "kitten hints --type path --program -";
"kitty_mod+h>shift+p" = "kitten hints --type path"; "${prefix}>h>shift+p" = "kitten hints --type path";
"kitty_mod+h>l" = "kitten hints --type line --program -"; "${prefix}>h>l" = "kitten hints --type line --program -";
"kitty_mod+h>w" = "kitten hints --type word --program -"; "${prefix}>h>w" = "kitten hints --type word --program -";
"kitty_mod+h>h" = "kitten hints --type hash --program -"; "${prefix}>h>h" = "kitten hints --type hash --program -";
"kitty_mod+h>n" = "kitten hints --type linenum"; "${prefix}>h>n" = "kitten hints --type linenum";
"kitty_mod+h>y" = "kitten hints --type hyperlink"; "${prefix}>h>y" = "kitten hints --type hyperlink";
"kitty_mod+f10" = "toggle_maximized"; "${prefix}>f10" = "toggle_maximized";
"kitty_mod+f11" = "toggle_fullscreen"; "${prefix}>f11" = "toggle_fullscreen";
"kitty_mod+a>equal" = "set_background_opacity 1"; "${prefix}>a>equal" = "set_background_opacity 1";
"kitty_mod+a>d" = "set_background_opacity default"; "${prefix}>a>d" = "set_background_opacity default";
"kitty_mod+a>plus" = "set_background_opacity +0.1"; "${prefix}>a>plus" = "set_background_opacity +0.1";
"kitty_mod+a>up" = "set_background_opacity +0.1"; "${prefix}>a>up" = "set_background_opacity +0.1";
"kitty_mod+a>kp_add" = "set_background_opacity +0.1"; "${prefix}>a>kp_add" = "set_background_opacity +0.1";
"kitty_mod+a>minus" = "set_background_opacity -0.1"; "${prefix}>a>minus" = "set_background_opacity -0.1";
"kitty_mod+a>down" = "set_background_opacity -0.1"; "${prefix}>a>down" = "set_background_opacity -0.1";
"kitty_mod+a>kp_substract" = "set_background_opacity -0.1"; "${prefix}>a>kp_substract" = "set_background_opacity -0.1";
"kitty_mod+delete" = "clear_terminal reset active"; "${prefix}>delete" = "clear_terminal reset active";
"kitty_mod+escape" = "kitty_shell window"; "${prefix}>escape" = "kitty_shell window";
"kitty_mod+f2" = "edit_config_file"; "${prefix}>f2" = "edit_config_file";
"kitty_mod+n" = "new_os_window"; "${prefix}>n" = "new_os_window";
"kitty_mod+o" = "pass_selection_to_program"; "${prefix}>o" = "pass_selection_to_program";
"kitty_mod+u" = "kitten unicode_input"; "${prefix}>u" = "kitten unicode_input";
}; };
}; };
} }
users/modules/dev/vcs/jujutsu.nix
+6
View File
@@ -40,6 +40,12 @@ in {
enable = mkEnableOption "Enables jj-cz"; enable = mkEnableOption "Enables jj-cz";
alias = mkEnableOption "Enable `jj cz` as an alias to `jj-cz`"; alias = mkEnableOption "Enable `jj cz` as an alias to `jj-cz`";
}; };
# used in my shell .nix files
shellCompletion = mkOption {
description = "Enable Jujutsu shell completion";
type = types.bool;
default = true;
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
users/modules/shell/bash.nix
+1
View File
@@ -36,6 +36,7 @@ in {
concatLines concatLines
[ [
(strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/bash"'') (strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/bash"'')
(strings.optionalString config.home.dev.vcs.jj.shellCompletion "source <(jj util completion bash)")
cfg.bashrcExtra cfg.bashrcExtra
]; ];
enableCompletion = cfg.autocompletion; enableCompletion = cfg.autocompletion;
users/modules/shell/default.nix
+3 -3
View File
@@ -97,15 +97,15 @@ in {
config.home.shell = { config.home.shell = {
enableShellIntegration = cfg.bash.enable or cfg.zsh.enable or cfg.fish.enable; enableShellIntegration = cfg.bash.enable or cfg.zsh.enable or cfg.fish.enable;
bash = { bash = {
aliases = cfg.aliases // defaultAliases; aliases = defaultAliases // cfg.aliases;
enable = mkDefault cfg.fullDesktop; enable = mkDefault cfg.fullDesktop;
}; };
fish = { fish = {
abbrs = cfg.aliases // defaultAliases; abbrs = defaultAliases // cfg.aliases;
enable = mkDefault cfg.fullDesktop; enable = mkDefault cfg.fullDesktop;
}; };
zsh = { zsh = {
abbrs = cfg.aliases // defaultAliases; abbrs = defaultAliases // cfg.aliases;
enable = mkDefault cfg.fullDesktop; enable = mkDefault cfg.fullDesktop;
}; };
}; };
users/modules/shell/fish.nix
+1
View File
@@ -41,6 +41,7 @@ in {
__fish_default_command_not_found_handler $argv __fish_default_command_not_found_handler $argv
end end
'' ''
(strings.optionalString config.home.dev.vcs.jj.shellCompletion "jj util completion fish | source")
cfg.extraShellInit cfg.extraShellInit
]; ];
plugins = [ plugins = [
users/modules/shell/zsh.nix
+5
View File
@@ -62,6 +62,11 @@ in {
zstyle ':fzf-tab:complete:cd:*' fzf-preview '${pkgs.eza}/bin/eza $realpath' zstyle ':fzf-tab:complete:cd:*' fzf-preview '${pkgs.eza}/bin/eza $realpath'
'' ''
(strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/zsh"'') (strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/zsh"'')
(strings.optionalString config.home.dev.vcs.jj.shellCompletion ''
autoload -U compinit
compinit
source <(jj util completion zsh)
'')
cfg.zshrcExtra cfg.zshrcExtra
]; ];
oh-my-zsh = { oh-my-zsh = {
users/phundrak/packages.nix
-1
View File
@@ -40,7 +40,6 @@ in {
# Misc # Misc
# gplates # gplates
kicad-small
qgis qgis
handy handy
libnotify libnotify