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

Gen 275:

Browse Source
This commit is contained in:
pagedMov
2024-10-10 18:25:19 -04:00
parent bd31255f04
commit 3d2fd69704
17 changed files with 163 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.zsh_history Normal file
View File

@@ -0,0 +1,14 @@
: 1728597114:0;nix flake update
: 1728597126:0;git add .
: 1728597129:0;nixswitch
: 1728597159:0;runbg
: 1728597162:0;runbg aplay ~/sound/sys/login.wav
: 1728597168:0;runbg zsh
: 1728597175:0;kill $!
: 1728597184:0;runbg kitty zsh
: 1728597192:0;runbg kitty zsh && kitty @ close-window
: 1728597196:0;zrc
: 1728597207:0;nixswitch
: 1728597285:0;zsr
: 1728598374:0;typeset -f cd
: 1728598390:0;cd ~/dots

10
flake.lock generated
View File

@@ -330,11 +330,11 @@
]
},
"locked": {
"lastModified": 1728588172,
"narHash": "sha256-wCLcOMOyiFHa4MfAT1SR8jj47GcmCXiR93kgFs38bVY=",
"lastModified": 1728598744,
"narHash": "sha256-sSfvyO5xH3HObHHmh6lp/hcvo7tMjFKd/HXpxyrRnoE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8bb5d53c5847d9a9b2ad1bda49f9aa9df0de282a",
"rev": "342a1d682386d3a1d74f9555cb327f2f311dda6e",
"type": "github"
},
"original": {
@@ -838,8 +838,8 @@
"pre-commit-hooks": "pre-commit-hooks_2"
},
"locked": {
"lastModified": 1728587838,
"narHash": "sha256-PmRJCfpY1PoJ3YP5IjCsQL1vc5zElFowAWJLjUwvlJc=",
"lastModified": 1728598473,
"narHash": "sha256-wjTRdFhPV1iLYDIUqRc+8tnr1qR57YJL21JJMijQVQU=",
"path": "/home/pagedmov/sysflakes/glasshouse-desktop/home/nixvim",
"type": "path"
},

1
glasshouse-desktop/.zsh_history Normal file
View File

@@ -0,0 +1 @@
: 1728598368:0;cd ..

53
glasshouse-desktop/home/.zsh_history Normal file
View File

@@ -0,0 +1,53 @@
typeset -f nixswitch
builtin ls
nixswitch
ls
exa
type _ksi_zle_keymap_select
/usr/local/bin/starship
/nixbin/starship
nvim zsh/zshell.nix
nixswitch && sr
iiii
nvim ~/.zshrc
nvim starship.nix
asdasd
aaaaaa
sr
aaaa
zsh
: 1728597003:0;cat default.nix
: 1728597016:0;nvim default.nix
: 1728597028:0;nixswitch
: 1728597037:0;nvim default.nix
: 1728597071:0;mv scripts/scripts.nix scripts/default.nix
: 1728597074:0;nixswitch
: 1728597081:0;ls scripts
: 1728597095:0;..
: 1728597321:0;cd zshell
: 1728597323:0;cd zsh
: 1728598229:0;nvim zsh/zshell.nix
: 1728598255:0;nixswitch
: 1728598281:0;nvim zsh/zshell.nix
: 1728598299:0;ls
: 1728598301:0;cd ..
: 1728598331:0;eza
: 1728598335:0;ls
: 1728598337:0;exa
: 1728598339:0;eza
: 1728598344:0;nvim zsh/zshell.nix
: 1728598355:0;zsr
: 1728598357:0;cd dots
: 1728598359:0;ls
: 1728598364:0;..
: 1728598404:0;nvim zsh/zshell.nix
: 1728598416:0;nixswitch
: 1728598444:0;zsr
: 1728598446:0;ls
: 1728598449:0;cd nixvim
: 1728598474:0;nvim zsh/zshell.nix
: 1728598481:0;nixswitch
: 1728598509:0;ls
: 1728598513:0;zsr
: 1728598515:0;cd scripts
: 1728598553:0;cd zsh

1
glasshouse-desktop/home/default.nix
View File

@@ -11,6 +11,7 @@
++ [ (import ./kitty.nix) ]
++ [ (import ./spicetify.nix) ]
++ [ (import ./starship.nix) ]
++ [ (import ./scripts) ]
++ [ (import ./swaync/swaync.nix)]
++ [ (import ./userpkgs.nix) ]
++ [ (import ./waybar) ]

2
glasshouse-desktop/home/eza.nix
View File

@@ -4,6 +4,8 @@
programs.eza = {
enable = true;
enableZshIntegration = true;
extraOptions = [ "-1" "-h" "--group-directories-first" ];
icons = true;
git = true;
};
}

1
glasshouse-desktop/home/kitty.nix
View File

@@ -17,6 +17,7 @@
window_padding_width = 10;
scrollback_lines = 10000;
enable_audio_bell = false;
allow_remote_control = true;
mouse_hide_wait = 60;
## Tabs

2
glasshouse-desktop/home/nixvim/.zsh_history Normal file
View File

@@ -0,0 +1,2 @@
: 1728598466:0;nvim zsh/zshell.nix
: 1728598473:0;..

1
glasshouse-desktop/home/scripts/.zsh_history Normal file
View File

@@ -0,0 +1 @@
: 1728598517:0;..

0
glasshouse-desktop/home/scripts/scripts.nix → glasshouse-desktop/home/scripts/default.nix
View File

15
glasshouse-desktop/home/waybar/.zsh_history Normal file
View File

@@ -0,0 +1,15 @@
: 1728597397:0;nvim settings.nix
: 1728597410:0;nixswitch
: 1728597470:0;nvim style.nix
: 1728597481:0;nvim settings.nix
: 1728597889:0;nvim style.nix
: 1728597913:0;nixswitch
: 1728597950:0;nvim style.nix
: 1728597974:0;nixswitch
: 1728598000:0;nvim style.nix
: 1728598037:0;nixswitch
: 1728598073:0;waybar
: 1728598077:0;nvim style.nix
: 1728598101:0;nixswitch
: 1728598123:0;runbg waybar
: 1728598223:0;..

3
glasshouse-desktop/home/waybar/settings.nix
View File

@@ -46,7 +46,7 @@
"3"= "三";
"4"= "四";
"5"= "五";
"6"= "六";
"6"= "六";
urgent= "";
default = "";
sort-by-number= true;
@@ -57,6 +57,7 @@
"3"= [];
"4"= [];
"5"= [];
"6"= [];
};
};
memory= {

10
glasshouse-desktop/home/waybar/style.nix
View File

@@ -5,10 +5,9 @@ let custom = {
font_size = "15px";
font_weight = "bold";
text_color = "#cdd6f4";
secondary_accent= "89b4fa";
tertiary_accent = "f5f5f5";
background = "11111B";
opacity = "0.98";
secondary_accent= "#89b4fa";
tertiary_accent = "#f5f5f5";
background = "#11111B";
};
in
{
@@ -22,11 +21,10 @@ in
min-height: 0px;
font-family: ${custom.font};
font-weight: ${custom.font_weight};
opacity: ${custom.opacity};
}
window#waybar {
background: none;
background: ${custom.background};
}
#workspaces {

47
glasshouse-desktop/home/zsh/.zsh_history Normal file
View File

@@ -0,0 +1,47 @@
: 1728596017:0;sr
: 1728596034:0;nixswitch
: 1728596102:0;sr
: 1728596103:0;a
: 1728596110:0;sr
: 1728596156:0;nixswitch && sr
: 1728596183:0;aa
: 1728596186:0;aaaaa
: 1728596216:0;nixswitch && sr
: 1728596245:0;aaa
: 1728596251:0;aaaa
: 1728596252:0;sr
: 1728596273:0;nvim ~/.zshrc
: 1728597329:0;gt eza-style.nix
: 1728597334:0;gt
: 1728597341:0;gt put eza-style.nix
: 1728597345:0;gt summary
: 1728597362:0;gt s
: 1728597393:0;cd ../waybar
: 1728598239:0;ls
: 1728598246:0;alias ls
: 1728598557:0;cat zkbd
: 1728598574:0;nvim zkbd
: 1728598589:0;nvim zshell
: 1728598593:0;nvim zshell.nix
: 1728598612:0;nixswitch
: 1728598640:0;zsr
: 1728598661:0;source zkbd
: 1728598666:0;cat zkbd
: 1728598678:0;echo $ZSH_AUTO_SUGGEST_ACCEPT_WIDGETS
: 1728598684:0;echo $ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
: 1728598740:0;ls
: 1728598745:0;cat zsh-style
: 1728598777:0;rm zsh-style
: 1728598783:0;nvim zshell.nix
: 1728598795:0;nixswitch
: 1728598826:0;zsr
: 1728598838:0;aaaa
: 1728598846:0;ls
: 1728598852:0;gt p zkbd
: 1728598860:0;ls
: 1728598878:0;nvim zshell.nix
: 1728598950:0;nixswitch
: 1728598976:0;nvim zshell.nix
: 1728599083:0;nixswitch
: 1728599116:0;zsr
: 1728599118:0;nixcommit

52
glasshouse-desktop/home/zsh/zkbd
View File

@@ -1,52 +0,0 @@
#function left-beep {
# [[ $CURSOR -eq 0 ]] && return
# zle vi-backward-char
# (aplay /home/pagedmov/sound/sys/move_h.wav > /dev/null 2>&1 &)
#}
#function right-beep {
# zle autosuggest-accept
# [[ $CURSOR -eq ${#BUFFER} ]] && return
# zle vi-forward-char
# (aplay /home/pagedmov/sound/sys/move_h.wav > /dev/null 2>&1 &)
#}
#function up-beep {
# zle up-line-or-history
# (aplay /home/pagedmov/sound/sys/move_v.wav > /dev/null 2>&1 &)
#}
#function down-beep {
# zle down-line-or-history
# (aplay /home/pagedmov/sound/sys/move_v.wav > /dev/null 2>&1 &)
#}
#zle -N left-beep
#zle -N right-beep
#zle -N up-beep
#zle -N down-beep
bindkey -v
#bindkey -M viins "^[OD" left-beep
#bindkey -M viins "^[OC" right-beep
#bindkey -M viins "^[OB" down-beep
#bindkey -M viins "^[OA" up-beep
#bindkey -M vicmd "h" left-beep
#bindkey -M vicmd "l" right-beep
#bindkey -M vicmd "j" down-beep
#bindkey -M vicmd "k" up-beep
#ZSH_AUTOSUGGEST_ACCEPT_WIDGETS+=("right-beep")
function zle-keymap-select {
if [[ ${KEYMAP} == vicmd ]] ||
[[ $1 = 'block' ]]; then
echo -ne "\e[1 q" # Change the cursor to a block (normal mode)
else
echo -ne "\e[5 q" # Change the cursor to a line (insert mode)
fi
}
zle -N zle-keymap-select
zle-line-init() {
zle-keymap-select 'insert'
}
zle -N zle-line-init

68
glasshouse-desktop/home/zsh/zsh-style
View File

@@ -1,68 +0,0 @@
# set the terminal mode when entering or exiting zle, otherwise terminfo keys are not loaded
if (( ${+terminfo[smkx]} && ${+terminfo[rmkx]} )); then
zle-line-init() { echoti smkx; }; zle -N zle-line-init
zle-line-finish() { echoti rmkx; }; zle -N zle-line-finish
fi
# History
zshAddHistory() {
whence ${${(z)1}[1]} >| /dev/null || return 1
}
# ---| Correction and Autocompletion |--- #
zstyle ':completion:*:correct:*' original true
zstyle ':completion:*:correct:*' insert-unambiguous true
zstyle ':completion:*:approximate:*' max-errors 'reply=($(( ($#PREFIX + $#SUFFIX) / 3 )) numeric)'
# completion
zstyle ':completion:*' use-cache on
zstyle ':completion:*' cache-path "$comppath"
zstyle ':completion:*' rehash true
zstyle ':completion:*' verbose true
zstyle ':completion:*' insert-tab false
zstyle ':completion:*' accept-exact '*(N)'
zstyle ':completion:*' squeeze-slashes true
zstyle ':completion:*:*:*:*:*' menu select
zstyle ':completion:*:match:*' original only
zstyle ':completion:*:-command-:*:' verbose false
zstyle ':completion::complete:*' gain-privileges 1
zstyle ':completion:*:manuals.*' insert-sections true
zstyle ':completion:*:manuals' separate-sections true
zstyle ':completion:*' completer _complete _match _approximate _ignored
zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
# labels and categories
zstyle ':completion:*' group-name ''
zstyle ':completion:*:matches' group 'yes'
zstyle ':completion:*:options' description 'yes'
zstyle ':completion:*:options' auto-description '%d'
zstyle ':completion:*:default' list-prompt '%S%M matches%s'
zstyle ':completion:*' format ' %F{green}->%F{yellow} %d%f'
zstyle ':completion:*:messages' format ' %F{green}->%F{purple} %d%f'
zstyle ':completion:*:descriptions' format ' %F{green}->%F{yellow} %d%f'
zstyle ':completion:*:warnings' format ' %F{green}->%F{red} no matches%f'
zstyle ':completion:*:corrections' format ' %F{green}->%F{green} %d: %e%f'
# menu colours
eval "$(dircolors)"
zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=36=0=01'
# command parameters
zstyle ':completion:*:functions' ignored-patterns '(prompt*|_*|*precmd*|*preexec*)'
zstyle ':completion::*:(-command-|export):*' fake-parameters ${${${_comps[(I)-value-*]#*,}%%,*}:#-*-}
zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
zstyle ':completion:*:processes-names' command 'ps c -u ${USER} -o command | uniq'
zstyle ':completion:*:(vim|nvim|vi|nano):*' ignored-patterns '*.(wav|mp3|flac|ogg|mp4|avi|mkv|iso|so|o|7z|zip|tar|gz|bz2|rar|deb|pkg|gzip|pdf|png|jpeg|jpg|gif)'
# hostnames and addresses
zstyle ':completion:*:ssh:*' tag-order 'hosts:-host:host hosts:-domain:domain hosts:-ipaddr:ip\ address *'
zstyle ':completion:*:ssh:*' group-order users hosts-domain hosts-host users hosts-ipaddr
zstyle ':completion:*:(scp|rsync):*' tag-order 'hosts:-host:host hosts:-domain:domain hosts:-ipaddr:ip\ address *'
zstyle ':completion:*:(scp|rsync):*' group-order users files all-files hosts-domain hosts-host hosts-ipaddr
zstyle ':completion:*:(ssh|scp|rsync):*:hosts-host' ignored-patterns '*(.|:)*' loopback ip6-loopback localhost ip6-localhost broadcasthost
zstyle ':completion:*:(ssh|scp|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*'
zstyle ':completion:*:(ssh|scp|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.0.<->' '255.255.255.255' '::1' 'fe80::*'
zstyle -e ':completion:*:hosts' hosts 'reply=( ${=${=${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) 2>/dev/null)"}%%[#| ]*}//\]:[0-9]*/ }//,/ }//\[/ } ${=${(f)"$(cat /etc/hosts(|)(N) <<(ypcat hosts 2>/dev/null))"}%%\#*} ${=${${${${(@M)${(f)"$(cat ~/.ssh/config 2>/dev/null)"}:#Host *}#Host }:#*\**}:#*\?*}})'
ttyctl -f

25
glasshouse-desktop/home/zsh/zshell.nix
View File

@@ -54,19 +54,21 @@
hmconf = "nvim $HOME/sysflakes/glasshouse-desktop/home";
viflake = "nvim flake.nix";
nvimcfg = "nvim $HOME/dots/nixvim/config";
zsr = "runbg kitty zsh && kitty @ close-window";
};
initExtraFirst = ''
s_check() { [ $SOUNDS_ENABLED -eq 1 ] }
unalias ls
ls() {
command ls --group-directories-first --color=always -F1 "$@" | sort -f -k1
s_check && (aplay ~/sound/sys/ls.wav > /dev/null 2>&1 &)
eza -1 --group-directories-first --icons "@"
s_check && runbg aplay ~/sound/sys/ls.wav
}
cd() {
export SOUNDS_ENABLED=0
ls "$@"
eza -1 --group-directories-first --icons "$@"
builtin cd "$@"
export SOUNDS_ENABLED=1
s_check && (aplay ~/sound/sys/cd.wav > /dev/null 2>&1 &)
@@ -93,14 +95,18 @@ nixcommit() {
git diff --quiet
if [ $? -eq 1 ]; then
git add .
git commit -m "Commit for generation $gen"
git commit -m "Gen $gen: $@"
git push
fi
sudo nixos-rebuild switch --flake "$HOME/sysflakes#glasshouse"
if [ $? -eq 0 ]; then
s_check && (aplay ~/sound/sys/update.wav > /dev/null 2>&1 &)
else
s_check && (aplay ~/sound/sys/error.wav > /dev/null 2>&1 &)
read -p "Rebuild? y/n" confirm
if [ confirm = "y" ]; then
sudo nixos-rebuild switch --flake "$HOME/sysflakes#glasshouse"
if [ $? -eq 0 ]; then
s_check && (aplay ~/sound/sys/update.wav > /dev/null 2>&1 &)
else
s_check && (aplay ~/sound/sys/error.wav > /dev/null 2>&1 &)
fi
fi
builtin cd $OLDPWD
}
@@ -163,7 +169,6 @@ nsp() { nix-shell -p "$@" --run zsh }
clear
splash
eval "$(starship init zsh)" 2>/dev/null
s_check && (aplay ~/sound/sys/sh-source.wav > /dev/null 2>&1 &)
'';
};