summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/seth/default.nix59
-rw-r--r--users/seth/desktop/default.nix37
-rw-r--r--users/seth/desktop/gnome.nix54
-rw-r--r--users/seth/desktop/plasma.nix4
-rw-r--r--users/seth/home.nix6
-rw-r--r--users/seth/programs/default.nix46
-rw-r--r--users/seth/programs/git.nix32
-rw-r--r--users/seth/programs/mangohud.nix17
-rw-r--r--users/seth/programs/mangohud/MangoHud.conf9
-rw-r--r--users/seth/programs/mangohud/default.nix7
-rw-r--r--users/seth/programs/starship.nix12
-rw-r--r--users/seth/programs/vim.nix36
-rw-r--r--users/seth/shell/bash.nix60
-rw-r--r--users/seth/shell/default.nix46
-rw-r--r--users/seth/shell/fish.nix38
-rw-r--r--users/seth/shell/zsh/default.nix169
16 files changed, 327 insertions, 305 deletions
diff --git a/users/seth/default.nix b/users/seth/default.nix
index be8302e..6e3e8d9 100644
--- a/users/seth/default.nix
+++ b/users/seth/default.nix
@@ -1,32 +1,35 @@
-{
- config,
- pkgs,
- home-manager,
- desktop,
- ...
+{ config
+, pkgs
+, home-manager
+, desktop
+, ...
}: {
- users.users.seth = {
- extraGroups = ["wheel"];
- isNormalUser = true;
- hashedPassword = "***REMOVED***";
- shell = pkgs.bash;
- };
+ users.users.seth = {
+ extraGroups = [ "wheel" ];
+ isNormalUser = true;
+ hashedPassword = "***REMOVED***";
+ shell = pkgs.bash;
+ };
- home-manager.users.seth = {
- imports =
- [
- ./home.nix
- ./shell
- ]
- ++ (
- if (desktop != "")
- then [./desktop]
- else []
- );
+ home-manager = {
+ useGlobalPkgs = true;
+ useUserPackages = true;
+ users.seth = {
+ imports =
+ [
+ ./home.nix
+ ./shell
+ ]
+ ++ (
+ if (desktop != "")
+ then [ ./desktop ]
+ else [ ]
+ );
- home.stateVersion = config.system.stateVersion;
- nixpkgs.config.allowUnfree = true;
- programs.home-manager.enable = true;
- systemd.user.startServices = true;
- };
+ home.stateVersion = config.system.stateVersion;
+ nixpkgs.config.allowUnfree = true;
+ programs.home-manager.enable = true;
+ systemd.user.startServices = true;
+ };
+ };
}
diff --git a/users/seth/desktop/default.nix b/users/seth/desktop/default.nix
index d8a0e74..7ad6434 100644
--- a/users/seth/desktop/default.nix
+++ b/users/seth/desktop/default.nix
@@ -1,22 +1,21 @@
-{
- pkgs,
- desktop,
- ...
+{ pkgs
+, desktop
+, ...
}: {
- imports =
- [
- ../programs/mangohud
- ]
- ++ (
- if (desktop == "gnome")
- then [./gnome.nix]
- else [./plasma.nix]
- );
+ imports =
+ [
+ ../programs/mangohud.nix
+ ]
+ ++ (
+ if (desktop == "gnome")
+ then [ ./gnome.nix ]
+ else [ ./plasma.nix ]
+ );
- home.packages = with pkgs; [
- discord
- element-desktop
- spotify
- steam
- ];
+ home.packages = with pkgs; [
+ discord
+ element-desktop
+ spotify
+ steam
+ ];
}
diff --git a/users/seth/desktop/gnome.nix b/users/seth/desktop/gnome.nix
index 482dae6..6b80e14 100644
--- a/users/seth/desktop/gnome.nix
+++ b/users/seth/desktop/gnome.nix
@@ -1,30 +1,30 @@
-{pkgs, ...}: {
- home.packages = with pkgs; [adw-gtk3] ++ (with pkgs.gnomeExtensions; [appindicator blur-my-shell caffeine]);
+{ pkgs, ... }: {
+ home.packages = with pkgs; [ adw-gtk3 ] ++ (with pkgs.gnomeExtensions; [ appindicator blur-my-shell caffeine ]);
- dconf.settings = {
- "org/gnome/shell" = {
- disable-user-extensions = false;
- enabled-extensions = [
- "[email protected]"
- "[email protected]"
- "[email protected]"
- ];
- favorite-apps = [
- "firefox.desktop"
- "org.gnome.Nautilus.desktop"
- "discord.desktop"
- ];
- };
- "org/gnome/desktop/interface" = {
- color-scheme = "prefer-dark";
- };
- };
+ dconf.settings = {
+ "org/gnome/shell" = {
+ disable-user-extensions = false;
+ enabled-extensions = [
+ "[email protected]"
+ "[email protected]"
+ "[email protected]"
+ ];
+ favorite-apps = [
+ "firefox.desktop"
+ "org.gnome.Nautilus.desktop"
+ "discord.desktop"
+ ];
+ };
+ "org/gnome/desktop/interface" = {
+ color-scheme = "prefer-dark";
+ };
+ };
- gtk = {
- enable = true;
- theme = {
- name = "adw-gtk3";
- package = pkgs.adw-gtk3;
- };
- };
+ gtk = {
+ enable = true;
+ theme = {
+ name = "adw-gtk3";
+ package = pkgs.adw-gtk3;
+ };
+ };
}
diff --git a/users/seth/desktop/plasma.nix b/users/seth/desktop/plasma.nix
index 97e427f..dea84c2 100644
--- a/users/seth/desktop/plasma.nix
+++ b/users/seth/desktop/plasma.nix
@@ -1,3 +1,3 @@
-{pkgs, ...}: {
- home.packages = with pkgs; [catppuccin-kde];
+{ pkgs, ... }: {
+ home.packages = with pkgs; [ catppuccin-kde ];
}
diff --git a/users/seth/home.nix b/users/seth/home.nix
index fb75b61..f5dec19 100644
--- a/users/seth/home.nix
+++ b/users/seth/home.nix
@@ -1,5 +1,5 @@
_: {
- imports = [
- ./programs
- ];
+ imports = [
+ ./programs
+ ];
}
diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix
index 5394515..a3471af 100644
--- a/users/seth/programs/default.nix
+++ b/users/seth/programs/default.nix
@@ -1,26 +1,26 @@
-{pkgs, ...}: {
- imports = [
- ./git.nix
- ./neovim
- ./starship.nix
- ./vim.nix
- ];
+{ pkgs, ... }: {
+ imports = [
+ ./git.nix
+ ./neovim.nix
+ ./starship.nix
+ ./vim.nix
+ ];
- home.packages = with pkgs; [
- alejandra
- bat
- clang
- deadnix
- eclint
- exa
- fd
- gh
- lld
- rclone
- restic
- ripgrep
- statix
- ];
+ home.packages = with pkgs; [
+ alejandra
+ bat
+ clang
+ deadnix
+ eclint
+ exa
+ fd
+ gh
+ lld
+ rclone
+ restic
+ ripgrep
+ statix
+ ];
- xdg.enable = true;
+ xdg.enable = true;
}
diff --git a/users/seth/programs/git.nix b/users/seth/programs/git.nix
index 8daa18c..e4ddfa1 100644
--- a/users/seth/programs/git.nix
+++ b/users/seth/programs/git.nix
@@ -1,18 +1,18 @@
_: {
- programs.git = {
- enable = true;
- extraConfig = {
- init = {defaultBranch = "main";};
- safe = {directory = "/etc/nixos";};
- };
- signing = {
- key = "D31BD0D494BBEE86";
- signByDefault = true;
- };
- userEmail = "[email protected]";
- userName = "seth";
- };
- services.gpg-agent.extraConfig = ''
- pinentry-program /run/current-system/sw/bin/pinentry
- '';
+ programs.git = {
+ enable = true;
+ extraConfig = {
+ init = { defaultBranch = "main"; };
+ safe = { directory = "/etc/nixos"; };
+ };
+ signing = {
+ key = "D31BD0D494BBEE86";
+ signByDefault = true;
+ };
+ userEmail = "[email protected]";
+ userName = "seth";
+ };
+ services.gpg-agent.extraConfig = ''
+ pinentry-program /run/current-system/sw/bin/pinentry
+ '';
}
diff --git a/users/seth/programs/mangohud.nix b/users/seth/programs/mangohud.nix
new file mode 100644
index 0000000..2b33471
--- /dev/null
+++ b/users/seth/programs/mangohud.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }: {
+ home.packages = with pkgs; [ mangohud ];
+
+ xdg.configFile."MangoHud.conf" = {
+ text = ''
+ legacy_layout=false
+ cpu_stats
+ cpu_temp
+ gpu_stats
+ gpu_temp
+ fps
+ frametime
+ media_player
+ media_player_name = spotify
+ '';
+ };
+}
diff --git a/users/seth/programs/mangohud/MangoHud.conf b/users/seth/programs/mangohud/MangoHud.conf
deleted file mode 100644
index 8e02a99..0000000
--- a/users/seth/programs/mangohud/MangoHud.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-legacy_layout=false
-cpu_stats
-cpu_temp
-gpu_stats
-gpu_temp
-fps
-frametime
-media_player
-media_player_name = spotify
diff --git a/users/seth/programs/mangohud/default.nix b/users/seth/programs/mangohud/default.nix
deleted file mode 100644
index 21dde0f..0000000
--- a/users/seth/programs/mangohud/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{pkgs, ...}: {
- home.packages = with pkgs; [mangohud];
-
- xdg.configFile.MangoHud = {
- source = ./MangoHud.conf;
- };
-}
diff --git a/users/seth/programs/starship.nix b/users/seth/programs/starship.nix
index 5c50b4b..7c213cf 100644
--- a/users/seth/programs/starship.nix
+++ b/users/seth/programs/starship.nix
@@ -1,8 +1,8 @@
_: {
- programs.starship = {
- enable = false;
- settings = {
- format = "" "
+ programs.starship = {
+ enable = false;
+ settings = {
+ format = "" "
$username\
$hostname\
$directory\
@@ -24,6 +24,6 @@ _: {
$shell\
$character
" "";
- };
- };
+ };
+ };
}
diff --git a/users/seth/programs/vim.nix b/users/seth/programs/vim.nix
index b3dc52c..8a4c784 100644
--- a/users/seth/programs/vim.nix
+++ b/users/seth/programs/vim.nix
@@ -1,10 +1,30 @@
_: {
- programs.vim = {
- enable = true;
- settings = {
- expandtab = false;
- shiftwidth = 2;
- tabstop = 2;
- };
- };
+ programs.vim = {
+ enable = true;
+ settings = {
+ expandtab = false;
+ shiftwidth = 2;
+ tabstop = 2;
+ };
+ extraConfig = ''
+ " https://wiki.archlinux.org/title/XDG_Base_Directory
+ set runtimepath^=$XDG_CONFIG_HOME/vim
+ set runtimepath+=$XDG_DATA_HOME/vim
+ set runtimepath+=$XDG_CONFIG_HOME/vim/after
+
+ set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim
+ set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after
+ set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim
+ set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after
+
+ let g:netrw_home = $XDG_DATA_HOME."/vim"
+ call mkdir($XDG_DATA_HOME."/vim/spell", 'p')
+
+ set backupdir=$XDG_STATE_HOME/vim/backup | call mkdir(&backupdir, 'p')
+ set directory=$XDG_STATE_HOME/vim/swap | call mkdir(&directory, 'p')
+ set undodir=$XDG_STATE_HOME/vim/undo | call mkdir(&undodir, 'p')
+ set viewdir=$XDG_STATE_HOME/vim/view | call mkdir(&viewdir, 'p')
+ set viminfofile=$XDG_STATE_HOME/vim/viminfo
+ '';
+ };
}
diff --git a/users/seth/shell/bash.nix b/users/seth/shell/bash.nix
index 0dfb717..031542b 100644
--- a/users/seth/shell/bash.nix
+++ b/users/seth/shell/bash.nix
@@ -1,31 +1,31 @@
-{config, ...}: {
- programs.bash = {
- enable = true;
- bashrcExtra = ''
- if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z "$BASH_EXECUTION_STRING" ]]
- then
- exec fish
- fi
- '';
- historyFile = "${config.xdg.stateHome}/bash/history";
- historyFileSize = 1000;
- historySize = 100;
- sessionVariables = {
- EDITOR = "nvim";
- VISUAL = "nvim";
- CARGO_HOME = "${config.xdg.dataHome}/cargo";
- RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
- LESSHISTFILE = "${config.xdg.stateHome}/less/history";
- NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
- };
- shellOptions = [
- "cdspell"
- "checkjobs"
- "checkwinsize"
- "dirspell"
- "globstar"
- "histappend"
- "no_empty_cmd_completion"
- ];
- };
+{ config, ... }: {
+ programs.bash = {
+ enable = true;
+ bashrcExtra = ''
+ if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z "$BASH_EXECUTION_STRING" ]]
+ then
+ exec fish
+ fi
+ '';
+ historyFile = "${config.xdg.stateHome}/bash/history";
+ historyFileSize = 1000;
+ historySize = 100;
+ sessionVariables = {
+ EDITOR = "nvim";
+ VISUAL = "nvim";
+ CARGO_HOME = "${config.xdg.dataHome}/cargo";
+ RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
+ LESSHISTFILE = "${config.xdg.stateHome}/less/history";
+ NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
+ };
+ shellOptions = [
+ "cdspell"
+ "checkjobs"
+ "checkwinsize"
+ "dirspell"
+ "globstar"
+ "histappend"
+ "no_empty_cmd_completion"
+ ];
+ };
}
diff --git a/users/seth/shell/default.nix b/users/seth/shell/default.nix
index ae0afa8..2529a48 100644
--- a/users/seth/shell/default.nix
+++ b/users/seth/shell/default.nix
@@ -1,26 +1,26 @@
-{config, ...}: {
- imports = [
- ./bash.nix
- ./fish.nix
- ./zsh
- ];
+{ config, ... }: {
+ imports = [
+ ./bash.nix
+ ./fish.nix
+ ./zsh
+ ];
- home.sessionVariables = {
- EDITOR = "nvim";
- VISUAL = "nvim";
- CARGO_HOME = "${config.xdg.dataHome}/cargo";
- RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
- LESSHISTFILE = "${config.xdg.stateHome}/less/history";
- NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
- };
+ home.sessionVariables = {
+ EDITOR = "nvim";
+ VISUAL = "nvim";
+ CARGO_HOME = "${config.xdg.dataHome}/cargo";
+ RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
+ LESSHISTFILE = "${config.xdg.stateHome}/less/history";
+ NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
+ };
- home.shellAliases = {
- ls = "exa --icons";
- la = "ls -a";
- diff = "diff --color=auto";
- g = "git";
- gs = "g status";
- nixsw = "sudo nixos-rebuild switch";
- nixup = "nixsw --upgrade";
- };
+ home.shellAliases = {
+ ls = "exa --icons";
+ la = "ls -a";
+ diff = "diff --color=auto";
+ g = "git";
+ gs = "g status";
+ nixsw = "sudo nixos-rebuild switch";
+ nixup = "nixsw --upgrade";
+ };
}
diff --git a/users/seth/shell/fish.nix b/users/seth/shell/fish.nix
index a5f9480..f00174f 100644
--- a/users/seth/shell/fish.nix
+++ b/users/seth/shell/fish.nix
@@ -1,21 +1,21 @@
-{pkgs, ...}: {
- programs.fish = {
- enable = true;
- plugins = [
- {
- name = "autopair-fish";
- src = pkgs.fishPlugins.autopair-fish;
- }
+{ pkgs, ... }: {
+ programs.fish = {
+ enable = true;
+ plugins = [
+ {
+ name = "autopair-fish";
+ src = pkgs.fishPlugins.autopair-fish;
+ }
- {
- name = "puffer-fish";
- src = pkgs.fetchFromGitHub {
- owner = "nickeb96";
- repo = "puffer-fish";
- rev = "fd0a9c95da59512beffddb3df95e64221f894631";
- sha256 = "sha256-aij48yQHeAKCoAD43rGhqW8X/qmEGGkg8B4jSeqjVU0=";
- };
- }
- ];
- };
+ {
+ name = "puffer-fish";
+ src = pkgs.fetchFromGitHub {
+ owner = "nickeb96";
+ repo = "puffer-fish";
+ rev = "fd0a9c95da59512beffddb3df95e64221f894631";
+ sha256 = "sha256-aij48yQHeAKCoAD43rGhqW8X/qmEGGkg8B4jSeqjVU0=";
+ };
+ }
+ ];
+ };
}
diff --git a/users/seth/shell/zsh/default.nix b/users/seth/shell/zsh/default.nix
index 8f78bcd..eb9145a 100644
--- a/users/seth/shell/zsh/default.nix
+++ b/users/seth/shell/zsh/default.nix
@@ -1,95 +1,94 @@
-{
- config,
- pkgs,
- ...
+{ config
+, pkgs
+, ...
}: {
- programs.zsh = {
- enable = false;
- enableAutosuggestions = true;
- enableSyntaxHighlighting = true;
- enableVteIntegration = true;
- completionInit = ''
- autoload -Uz bashcompinit compinit
- local zdump="${config.xdg.cacheHome}/zsh/zdump"
- bashcompinit
- compinit -d "$zdump"
- if [[ ! "$zdump.zwc" -nt "$zdump" ]]
- then
- zcompile "$zdump"
- fi
- unset zdump
- '';
- defaultKeymap = "emacs";
- dotDir = ".config/zsh";
- initExtra = ''
- autoload -Uz promptinit
- prompt walters
+ programs.zsh = {
+ enable = false;
+ enableAutosuggestions = true;
+ enableSyntaxHighlighting = true;
+ enableVteIntegration = true;
+ completionInit = ''
+ autoload -Uz bashcompinit compinit
+ local zdump="${config.xdg.cacheHome}/zsh/zdump"
+ bashcompinit
+ compinit -d "$zdump"
+ if [[ ! "$zdump.zwc" -nt "$zdump" ]]
+ then
+ zcompile "$zdump"
+ fi
+ unset zdump
+ '';
+ defaultKeymap = "emacs";
+ dotDir = ".config/zsh";
+ initExtra = ''
+ autoload -Uz promptinit
+ prompt walters
- zmodload zsh/zutil
- zmodload zsh/complist
- zstyle ":completion::*" group-name ""
- zstyle ":completion:*" menu "select"
- zstyle ":completion:*" squeeze-slashes "true"
- zstyle ":completion::*" use-cache "true"
- zstyle ":completion::*" cache-path "$zdump"
+ zmodload zsh/zutil
+ zmodload zsh/complist
+ zstyle ":completion::*" group-name ""
+ zstyle ":completion:*" menu "select"
+ zstyle ":completion:*" squeeze-slashes "true"
+ zstyle ":completion::*" use-cache "true"
+ zstyle ":completion::*" cache-path "$zdump"
- unsetopt beep
- unsetopt hist_beep
- unsetopt ignore_braces
- unsetopt list_beep
- setopt always_to_end
- setopt prompt_subst
- setopt share_history
+ unsetopt beep
+ unsetopt hist_beep
+ unsetopt ignore_braces
+ unsetopt list_beep
+ setopt always_to_end
+ setopt prompt_subst
+ setopt share_history
- # clear backbuffer with ctrl-l
- function clear-screen-and-scrollback() {
- echoti civis >"$TTY"
- printf '%b' '\e[H\e[2J' >"$TTY"
- zle .reset-prompt
- zle -R
- printf '%b' '\e[3J' >"$TTY"
- echoti cnorm >"$TTY"
- }
+ # clear backbuffer with ctrl-l
+ function clear-screen-and-scrollback() {
+ echoti civis >"$TTY"
+ printf '%b' '\e[H\e[2J' >"$TTY"
+ zle .reset-prompt
+ zle -R
+ printf '%b' '\e[3J' >"$TTY"
+ echoti cnorm >"$TTY"
+ }
- zle -N clear-screen-and-scrollback
- bindkey '^L' clear-screen-and-scrollback
- '';
- history = {
- expireDuplicatesFirst = true;
- path = "${config.xdg.stateHome}/zsh/zsh_history";
- save = 1000;
- size = 100;
- };
- plugins = [
- # {
- # name = "powerlevel10k";
- # src = pkgs.zsh-powerlevel10k;
- # file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
- # }
+ zle -N clear-screen-and-scrollback
+ bindkey '^L' clear-screen-and-scrollback
+ '';
+ history = {
+ expireDuplicatesFirst = true;
+ path = "${config.xdg.stateHome}/zsh/zsh_history";
+ save = 1000;
+ size = 100;
+ };
+ plugins = [
+ # {
+ # name = "powerlevel10k";
+ # src = pkgs.zsh-powerlevel10k;
+ # file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
+ # }
- {
- name = "zsh-completions";
- src = pkgs.zsh-completions;
- file = "share/zsh-completions/zsh-completions.plugin.zsh";
- }
+ {
+ name = "zsh-completions";
+ src = pkgs.zsh-completions;
+ file = "share/zsh-completions/zsh-completions.plugin.zsh";
+ }
- {
- name = "cattppuccin-zsh-syntax-highlighting";
- src = pkgs.fetchFromGitHub {
- owner = "catppuccin";
- repo = "zsh-syntax-highlighting";
- rev = "06d519c20798f0ebe275fc3a8101841faaeee8ea";
- sha256 = "sha256-Q7KmwUd9fblprL55W0Sf4g7lRcemnhjh4/v+TacJSfo=";
- };
+ {
+ name = "cattppuccin-zsh-syntax-highlighting";
+ src = pkgs.fetchFromGitHub {
+ owner = "catppuccin";
+ repo = "zsh-syntax-highlighting";
+ rev = "06d519c20798f0ebe275fc3a8101841faaeee8ea";
+ sha256 = "sha256-Q7KmwUd9fblprL55W0Sf4g7lRcemnhjh4/v+TacJSfo=";
+ };
- file = "themes/catppuccin_mocha-zsh-syntax-highlighting.zsh";
- }
+ file = "themes/catppuccin_mocha-zsh-syntax-highlighting.zsh";
+ }
- # {
- # name = "powerlevel10k-config";
- # src = ./files;
- # file = ".p10k.zsh";
- # }
- ];
- };
+ # {
+ # name = "powerlevel10k-config";
+ # src = ./files;
+ # file = ".p10k.zsh";
+ # }
+ ];
+ };
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 15:30:36 +0000