jordan/nix-config
1
1
Fork 0
Code Issues 10 Pull Requests Actions Projects 3 Wiki Activity

treewide: update to NixOS 25.05
All checks were successful
Check flake / build-amd64-linux (push) Successful in 1m33s
Details

Browse Source
This commit is contained in:
Jordan Holt
2025-05-24 11:55:47 +01:00
parent dc1b485276
commit 0aecdd6b87
9 changed files with 69 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
users/jordan/common/optional/graphical/firefox.nix
View File

@ -13,8 +13,8 @@
enable = true;
profiles.Default = {
search = {
default = "DuckDuckGo";
privateDefault = "DuckDuckGo";
default = "ddg";
privateDefault = "ddg";
force = true;
};
settings = {

2
users/jordan/common/optional/graphical/gnome.nix
View File

@ -239,5 +239,5 @@ in
[ ]
);
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
}

2
users/jordan/common/optional/graphical/hyprland/default.nix
View File

@ -298,5 +298,5 @@ in
unclutter.enable = true;
};
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
}

96
users/jordan/common/shell.nix
View File

@ -1,8 +1,14 @@
{
lib,
pkgs,
...
}:
let
inherit (lib)
mkMerge
mkOrder
;
in
{
programs = {
zsh = {
@ -27,56 +33,62 @@
size = 1000000;
};
initExtra = ''
## Colors
autoload -U colors && colors
initContent =
let
zshConfigBeforeCompInit = mkOrder 550 ''
setopt HASH_LIST_ALL
'';
zshConfig = mkOrder 1000 ''
## Colors
autoload -U colors && colors
## Directories
setopt AUTO_PUSHD
setopt CDABLE_VARS
setopt PUSHD_IGNORE_DUPS
setopt PUSHD_SILENT
setopt PUSHD_TO_HOME
## Directories
setopt AUTO_PUSHD
setopt CDABLE_VARS
setopt PUSHD_IGNORE_DUPS
setopt PUSHD_SILENT
setopt PUSHD_TO_HOME
## Expansion and globbing
setopt EXTENDED_GLOB
unsetopt GLOB_DOTS
unsetopt NOMATCH
## Expansion and globbing
setopt EXTENDED_GLOB
unsetopt GLOB_DOTS
unsetopt NOMATCH
## History
setopt BANG_HIST
setopt HIST_VERIFY
setopt INC_APPEND_HISTORY_TIME
## History
setopt BANG_HIST
setopt HIST_VERIFY
setopt INC_APPEND_HISTORY_TIME
## I/O
setopt INTERACTIVE_COMMENTS
setopt MULTIOS
unsetopt CLOBBER
## I/O
setopt INTERACTIVE_COMMENTS
setopt MULTIOS
unsetopt CLOBBER
## Jobs
setopt LONG_LIST_JOBS
setopt AUTO_RESUME
unsetopt BG_NICE
unsetopt NOTIFY
unsetopt HUP
unsetopt CHECK_JOBS
## Jobs
setopt LONG_LIST_JOBS
setopt AUTO_RESUME
unsetopt BG_NICE
unsetopt NOTIFY
unsetopt HUP
unsetopt CHECK_JOBS
## Shell emulation
setopt APPEND_CREATE
## Shell emulation
setopt APPEND_CREATE
## Prompt
PS1="%B%{$fg[magenta]%}%~%{$reset_color%} $%b "
## Prompt
PS1="%B%{$fg[magenta]%}%~%{$reset_color%} $%b "
## Vi mode
export KEYTIMEOUT=1
## Vi mode
export KEYTIMEOUT=1
## Zsh line editor
unsetopt BEEP
'';
initExtraBeforeCompInit = ''
setopt HASH_LIST_ALL
'';
## Zsh line editor
unsetopt BEEP
'';
in
mkMerge [
zshConfigBeforeCompInit
zshConfig
];
localVariables = {
# Prevent zsh-vi-mode overriding other keybinds