Switch to 4 space indentation

This commit is contained in:
SebastianStork 2024-03-17 13:15:01 +01:00
parent a4cc33577c
commit d7aed49725
32 changed files with 796 additions and 783 deletions

View file

@ -1,12 +1,12 @@
{
imports = [
./qtile
./vscode.nix
./shell.nix
./theming.nix
./ssh-client.nix
./git.nix
./neovim.nix
./kitty.nix
];
imports = [
./qtile
./vscode.nix
./shell.nix
./theming.nix
./ssh-client.nix
./git.nix
./neovim.nix
./kitty.nix
];
}

View file

@ -1,22 +1,22 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.git.enable = lib.mkEnableOption "";
options.myConfig.git.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.git.enable {
programs.git = {
enable = true;
config = lib.mkIf config.myConfig.git.enable {
programs.git = {
enable = true;
userName = "SebastianStork";
userEmail = "sebastian.stork@pm.me";
userName = "SebastianStork";
userEmail = "sebastian.stork@pm.me";
extraConfig = {
init.defaultBranch = "main";
};
extraConfig = {
init.defaultBranch = "main";
};
};
programs.lazygit.enable = true;
};
programs.lazygit.enable = true;
};
}

View file

@ -1,22 +1,22 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.kitty.enable = lib.mkEnableOption "";
options.myConfig.kitty.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.kitty.enable {
programs.kitty = {
enable = true;
settings = {
font_family = "JetBrainsMono Nerd Font";
confirm_os_window_close = 0;
background_opacity = "0.7";
scrollback_lines = 10000;
enable_audio_bell = false;
update_check_interval = 0;
};
config = lib.mkIf config.myConfig.kitty.enable {
programs.kitty = {
enable = true;
settings = {
font_family = "JetBrainsMono Nerd Font";
confirm_os_window_close = 0;
background_opacity = "0.7";
scrollback_lines = 10000;
enable_audio_bell = false;
update_check_interval = 0;
};
};
};
};
}

View file

@ -1,17 +1,17 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.neovim.enable = lib.mkEnableOption "";
options.myConfig.neovim.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.neovim.enable {
programs.neovim = {
enable = true;
defaultEditor = true;
viAlias = true;
vimAlias = true;
vimdiffAlias = true;
config = lib.mkIf config.myConfig.neovim.enable {
programs.neovim = {
enable = true;
defaultEditor = true;
viAlias = true;
vimAlias = true;
vimdiffAlias = true;
};
};
};
}

View file

@ -1,44 +1,44 @@
{
config,
pkgs,
lib,
osConfig,
...
config,
pkgs,
lib,
osConfig,
...
}: {
options.myConfig.qtile.enable = lib.mkEnableOption "";
options.myConfig.qtile.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.qtile.enable {
assertions = [
{
assertion = osConfig.services.xserver.windowManager.qtile.enable;
message = "Qtile has to be enabled on the system level";
}
];
config = lib.mkIf config.myConfig.qtile.enable {
assertions = [
{
assertion = osConfig.services.xserver.windowManager.qtile.enable;
message = "Qtile has to be enabled on the system level";
}
];
home.file.".config/qtile/config.py".source = ./files/qtile.py;
home.file.".background-image".source = ./files/background-image;
home.file.".config/qtile/config.py".source = ./files/qtile.py;
home.file.".background-image".source = ./files/background-image;
home.packages = [
# Widget dependencies
pkgs.python311Packages.iwlib
pkgs.python311Packages.psutil
pkgs.lm_sensors
home.packages = [
# Widget dependencies
pkgs.python311Packages.iwlib
pkgs.python311Packages.psutil
pkgs.lm_sensors
# Hotkey dependencies
pkgs.playerctl
pkgs.brightnessctl
];
# Hotkey dependencies
pkgs.playerctl
pkgs.brightnessctl
];
programs.rofi = {
enable = true;
theme = ./files/rofi-theme.rasi;
programs.rofi = {
enable = true;
theme = ./files/rofi-theme.rasi;
};
services.picom = {
enable = true;
vSync = true;
};
services.dunst.enable = true;
};
services.picom = {
enable = true;
vSync = true;
};
services.dunst.enable = true;
};
}

View file

@ -1,70 +1,70 @@
{
config,
lib,
...
config,
lib,
...
}: let
cfg = config.myConfig.shell;
cfg = config.myConfig.shell;
in {
options.myConfig.shell = {
bash.enable = lib.mkEnableOption "";
zsh.enable = lib.mkEnableOption "";
starship.enable = lib.mkEnableOption "";
nixAliases.enable = lib.mkEnableOption "";
improvedCommands.enable = lib.mkEnableOption "";
direnv.enable = lib.mkEnableOption "";
};
options.myConfig.shell = {
bash.enable = lib.mkEnableOption "";
zsh.enable = lib.mkEnableOption "";
starship.enable = lib.mkEnableOption "";
nixAliases.enable = lib.mkEnableOption "";
improvedCommands.enable = lib.mkEnableOption "";
direnv.enable = lib.mkEnableOption "";
};
config = {
programs.bash.enable = cfg.bash.enable;
config = {
programs.bash.enable = cfg.bash.enable;
programs.zsh.enable = cfg.zsh.enable;
programs.zsh.enable = cfg.zsh.enable;
programs.starship = lib.mkIf cfg.starship.enable {
enable = true;
enableBashIntegration = cfg.bash.enable;
enableZshIntegration = cfg.zsh.enable;
settings = {
cmd_duration.disabled = true;
directory = {
truncation_length = 0;
truncation_symbol = "/";
truncate_to_repo = false;
programs.starship = lib.mkIf cfg.starship.enable {
enable = true;
enableBashIntegration = cfg.bash.enable;
enableZshIntegration = cfg.zsh.enable;
settings = {
cmd_duration.disabled = true;
directory = {
truncation_length = 0;
truncation_symbol = "/";
truncate_to_repo = false;
};
};
};
home.shellAliases = let
nixAliases = lib.mkIf cfg.nixAliases.enable {
nrs = "sudo nixos-rebuild switch";
nrb = "sudo nixos-rebuild boot";
nrrb = "nrb && reboot";
nrt = "sudo nixos-rebuild test";
nu = "sudo nix flake update";
};
commandAliases = lib.mkIf cfg.improvedCommands.enable {
cat = "bat -p";
};
in
lib.mkMerge [nixAliases commandAliases];
programs.lsd = lib.mkIf cfg.improvedCommands.enable {
enable = true;
enableAliases = true;
};
programs.bat.enable = cfg.improvedCommands.enable;
programs.fzf.enable = cfg.improvedCommands.enable;
programs.zoxide = lib.mkIf cfg.improvedCommands.enable {
enable = true;
options = ["--cmd cd"];
};
programs.direnv = lib.mkIf cfg.direnv.enable {
enable = true;
nix-direnv.enable = true;
config.global.hide_env_diff = true;
};
};
};
home.shellAliases = let
nixAliases = lib.mkIf cfg.nixAliases.enable {
nrs = "sudo nixos-rebuild switch";
nrb = "sudo nixos-rebuild boot";
nrrb = "nrb && reboot";
nrt = "sudo nixos-rebuild test";
nu = "sudo nix flake update";
};
commandAliases = lib.mkIf cfg.improvedCommands.enable {
cat = "bat -p";
};
in
lib.mkMerge [nixAliases commandAliases];
programs.lsd = lib.mkIf cfg.improvedCommands.enable {
enable = true;
enableAliases = true;
};
programs.bat.enable = cfg.improvedCommands.enable;
programs.fzf.enable = cfg.improvedCommands.enable;
programs.zoxide = lib.mkIf cfg.improvedCommands.enable {
enable = true;
options = ["--cmd cd"];
};
programs.direnv = lib.mkIf cfg.direnv.enable {
enable = true;
nix-direnv.enable = true;
config.global.hide_env_diff = true;
};
};
}

View file

@ -1,21 +1,21 @@
{
config,
lib,
...
config,
lib,
...
}: {
options.myConfig.ssh-client.enable = lib.mkEnableOption "";
options.myConfig.ssh-client.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.ssh-client.enable {
programs.ssh = {
enable = true;
config = lib.mkIf config.myConfig.ssh-client.enable {
programs.ssh = {
enable = true;
matchBlocks.kluebero-vm1 = {
hostname = "10.5.251.175";
user = "seb";
identitiesOnly = true;
identityFile = ["~/.ssh/kluebero/id_ed25519"];
};
matchBlocks.kluebero-vm1 = {
hostname = "10.5.251.175";
user = "seb";
identitiesOnly = true;
identityFile = ["~/.ssh/kluebero/id_ed25519"];
};
};
services.ssh-agent.enable = true;
};
services.ssh-agent.enable = true;
};
}

View file

@ -1,45 +1,45 @@
{
config,
pkgs,
lib,
...
config,
pkgs,
lib,
...
}: {
options.myConfig.theming.enable = lib.mkEnableOption "";
options.myConfig.theming.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.theming.enable {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
config = lib.mkIf config.myConfig.theming.enable {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
gtk = {
enable = true;
gtk = {
enable = true;
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
theme.name = "Adwaita-dark";
theme.package = pkgs.gnome.gnome-themes-extra;
theme.name = "Adwaita-dark";
theme.package = pkgs.gnome.gnome-themes-extra;
iconTheme.name = "Adwaita";
iconTheme.package = pkgs.gnome.adwaita-icon-theme;
iconTheme.name = "Adwaita";
iconTheme.package = pkgs.gnome.adwaita-icon-theme;
font.name = "Open Sans";
font.package = pkgs.open-sans;
font.name = "Open Sans";
font.package = pkgs.open-sans;
};
qt = {
enable = true;
platformTheme = "gnome";
style.name = "adwaita-dark";
style.package = pkgs.adwaita-qt;
};
home.pointerCursor = {
name = "Bibata-Original-Classic";
package = pkgs.bibata-cursors;
size = 24;
x11.enable = true;
x11.defaultCursor = "X_cursor";
gtk.enable = true;
};
fonts.fontconfig.enable = true;
};
qt = {
enable = true;
platformTheme = "gnome";
style.name = "adwaita-dark";
style.package = pkgs.adwaita-qt;
};
home.pointerCursor = {
name = "Bibata-Original-Classic";
package = pkgs.bibata-cursors;
size = 24;
x11.enable = true;
x11.defaultCursor = "X_cursor";
gtk.enable = true;
};
fonts.fontconfig.enable = true;
};
}

View file

@ -1,50 +1,63 @@
{
config,
pkgs,
lib,
...
config,
pkgs,
lib,
...
}: {
options.myConfig.vscode.enable = lib.mkEnableOption "";
options.myConfig.vscode.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.vscode.enable {
home.packages = [pkgs.nil];
config = lib.mkIf config.myConfig.vscode.enable {
home.packages = let
alejandra4 = pkgs.alejandra.overrideAttrs {
passthru.tests.version = lib.mkForce {};
postPatch = ''
substituteInPlace src/alejandra/src/builder.rs \
--replace '2 * build_ctx.indentation' '4 * build_ctx.indentation'
substituteInPlace src/alejandra/src/rules/string.rs \
--replace 'format!(" {}", line)' 'format!(" {}", line)'
rm -r src/alejandra/tests
'';
};
in [
pkgs.nil
alejandra4
];
programs.vscode = {
enable = true;
package = pkgs.vscodium;
programs.vscode = {
enable = true;
package = pkgs.vscodium;
mutableExtensionsDir = false;
extensions = [
pkgs.vscode-extensions.jnoortheen.nix-ide
pkgs.vscode-extensions.kamadorueda.alejandra
pkgs.vscode-extensions.pkief.material-icon-theme
pkgs.vscode-extensions.mkhl.direnv
];
mutableExtensionsDir = false;
extensions = [
pkgs.vscode-extensions.jnoortheen.nix-ide
pkgs.vscode-extensions.pkief.material-icon-theme
pkgs.vscode-extensions.mkhl.direnv
];
};
systemd.user.tmpfiles.rules = let
settings = builtins.replaceStrings ["\n"] ["\\n"] ''
{
"editor.fontFamily": "JetBrainsMono Nerd Font",
"explorer.confirmDelete": false,
"explorer.confirmDragAndDrop": false,
"extensions.autoCheckUpdates": false,
"files.autoSave": "afterDelay",
"git.autofetch": true,
"git.confirmSync": false,
"nix.enableLanguageServer": true,
"nix.serverPath": "nil",
"update.mode": "none",
"git.suggestSmartCommit": false,
"workbench.sideBar.location": "right",
"editor.renderWhitespace": "none",
"workbench.iconTheme": "material-icon-theme",
"editor.minimap.enabled": false
}
'';
in [
"f+ %h/.config/VSCodium/User/settings.json - - - - ${settings}"
"f+ %h/.config/VSCodium/User/settings-default.json - - - - ${settings}"
];
};
systemd.user.tmpfiles.rules = let
settings = builtins.replaceStrings ["\n"] ["\\n"] ''
{
"editor.fontFamily": "JetBrainsMono Nerd Font",
"explorer.confirmDelete": false,
"explorer.confirmDragAndDrop": false,
"extensions.autoCheckUpdates": false,
"files.autoSave": "afterDelay",
"git.autofetch": true,
"git.confirmSync": false,
"nix.enableLanguageServer": true,
"nix.serverPath": "nil",
"update.mode": "none",
"git.suggestSmartCommit": false,
"workbench.sideBar.location": "right",
"editor.renderWhitespace": "none",
"workbench.iconTheme": "material-icon-theme",
"editor.minimap.enabled": false
}
'';
in [
"f+ %h/.config/VSCodium/User/settings.json - - - - ${settings}"
"f+ %h/.config/VSCodium/User/settings-default.json - - - - ${settings}"
];
};
}