package changes

This commit is contained in:
Kyle Brown 2023-08-24 21:28:02 -07:00
parent bf01f7f5f7
commit a18aeba8ab
10 changed files with 47 additions and 19 deletions

View file

@ -1,5 +1,13 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
#nix = {
# package = pkgs.nixFlakes;
# extraOptions = ''
# experimental-features = nix-command flakes
# '';
#};
{ {
# Home Manager needs a bit of information about you and the # Home Manager needs a bit of information about you and the
# paths it should manage. # paths it should manage.

View file

@ -14,12 +14,14 @@
bat # modern cat bat # modern cat
colordiff # gimme my colours colordiff # gimme my colours
du-dust # modern du du-dust # modern du
exa # modern ls eza # modern ls
fd # way faster find fd # way faster find
ripgrep # faster grep ripgrep # faster grep
thefuck # Can't type? fuck thefuck # Can't type? fuck
zoxide # cd is just too slow zoxide # cd is just too slow
fzf # fuzzy finding fzf # fuzzy finding
sd # sed, but rusty
tealdeer # tldr, but rusty
# multiplexers # multiplexers
tmux # just for me tmux # just for me
@ -76,6 +78,7 @@
ispell # doom emacs ispell # doom emacs
iotop # disk top iotop # disk top
iftop # network top iftop # network top
bandwhich # bandwidth utility
]; ];

View file

@ -6,7 +6,7 @@
nim nim
rustup rustup
# devel # docs
pandoc pandoc
# microcontrollers # microcontrollers
@ -14,7 +14,8 @@
gnumake gnumake
# Useful utils # Useful utils
grex grex # regex made easy
git-cliff # useful commit messages
]; ];
} }

View file

@ -1,3 +1,3 @@
coreaudio-change-physical-format=yes #coreaudio-change-physical-format=yes
audio-display=no audio-display=no

View file

@ -56,7 +56,7 @@
(evil +everywhere) ; come to the dark side, we have cookies (evil +everywhere) ; come to the dark side, we have cookies
file-templates ; auto-snippets for empty files file-templates ; auto-snippets for empty files
;;fold ; (nigh) universal code folding ;;fold ; (nigh) universal code folding
(format +onsave) ; automated prettiness ;;(format +onsave) ; automated prettiness
;;god ; run Emacs commands without modifier keys ;;god ; run Emacs commands without modifier keys
;;lispy ; vim for lisp, for people who don't like vim ;;lispy ; vim for lisp, for people who don't like vim
;;multiple-cursors ; editing in many places at once ;;multiple-cursors ; editing in many places at once

View file

@ -6,3 +6,4 @@ zplug "zsh-users/zsh-syntax-highlighting", defer:2
zplug "MichaelAquilina/zsh-auto-notify", depth:1, from:github, if:"(($+commands[notify-send])) || [[$OSTYPE == *darwin*]]" zplug "MichaelAquilina/zsh-auto-notify", depth:1, from:github, if:"(($+commands[notify-send])) || [[$OSTYPE == *darwin*]]"
zplug "laggardkernel/zsh-thefuck", depth:1, from:github, if:"(($+commands[fuck]))" zplug "laggardkernel/zsh-thefuck", depth:1, from:github, if:"(($+commands[fuck]))"
zplug "joshskidmore/zsh-fzf-history-search", depth:1, from:github, if:"(($+commands[fzf]))" zplug "joshskidmore/zsh-fzf-history-search", depth:1, from:github, if:"(($+commands[fzf]))"
zplug "spwhitt/nix-zsh-completions", depth:1, from:github, if:"(($+commands[nix]))"

View file

@ -122,6 +122,7 @@ if (( $+commands[home-manager] )); then
alias hmc='home-manager expire-generations -7days' alias hmc='home-manager expire-generations -7days'
alias hme='home-manager edit' alias hme='home-manager edit'
alias hm='home-manager ' alias hm='home-manager '
alias hsearch='nix search nixpkgs'
fi fi
# Docker shortcuts # Docker shortcuts
@ -188,10 +189,20 @@ else
alias diff="diff -Nuar" alias diff="diff -Nuar"
fi fi
if (( $+commands[fx] )); then if (( !$+commands[tldr] )); then
alias ranger="fx": MISSING_PACKAGES+=('tealdeer')
fi
if (( $+commands[sd] )); then
alias sed="sd":
else else
MISSING_PACKAGES+=('felix') MISSING_PACKAGES+=('sd')
fi
if (( $+commands[bandwhich] )); then
alias bmon="bandwhich":
else
MISSING_PACKAGES+=('bandwhich')
fi fi
if (( $+commands[rg] )); then if (( $+commands[rg] )); then
@ -207,11 +218,11 @@ else
MISSING_PACKAGES+=('bat') MISSING_PACKAGES+=('bat')
fi fi
if (( $+commands[exa] )); then if (( $+commands[eza] )); then
alias ls='exa --icons' alias ls='eza --icons'
alias l='exa -al --icons' alias l='eza -al --icons'
else else
MISSING_PACKAGES+=('exa') MISSING_PACKAGES+=('eza')
alias l='ls -al' alias l='ls -al'
fi fi
@ -281,6 +292,9 @@ fi
alias zplug-install='curl -sL --proto-redir -all,https https://raw.githubusercontent.com/zplug/installer/master/installer.zsh | zsh' alias zplug-install='curl -sL --proto-redir -all,https https://raw.githubusercontent.com/zplug/installer/master/installer.zsh | zsh'
# Sprunge replacement
alias -g sprunge=" curl -F 'f:1=<-' ix.io"
# Changing dirs with just dots. # Changing dirs with just dots.
alias .='cd ../' alias .='cd ../'
alias ..='cd ../../' alias ..='cd ../../'

3
.zshrc
View file

@ -19,14 +19,15 @@ trysource ${HOME}/.nix-profile/etc/profile.d/hm-session-vars.sh
trysource ${HOME}/.zplug/init.zsh trysource ${HOME}/.zplug/init.zsh
# Install plugins if there are plugins that have not been installed # Install plugins if there are plugins that have not been installed
trysource ${HOME}/.zpackages.zsh
if ! zplug check; then if ! zplug check; then
printf "Install? [y/N]: " printf "Install? [y/N]: "
if read -q; then if read -q; then
echo; zplug install echo; zplug install
fi fi
fi fi
trysource ${HOME}/.zpackages.zsh
zplug load zplug load
ZSH_THEME="powerlevel10k/powerlevel10k" ZSH_THEME="powerlevel10k/powerlevel10k"
trysource "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" trysource "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"

View file

@ -13,7 +13,7 @@
"installed_networking": "1", "installed_networking": "1",
"iot_environment": "3", "iot_environment": "3",
"keyboard_supported": "none/alt/control/shift", "keyboard_supported": "none/alt/control/shift",
"last_backup_path": "/var/folders/9x/mjvqdwwj2gb9j1jz_f_wn0k80000gn/T/orcaslicer_model/Sat_Aug_05/11_55_26#30870#47", "last_backup_path": "/var/folders/9x/mjvqdwwj2gb9j1jz_f_wn0k80000gn/T/orcaslicer_model/Sun_Aug_20/11_53_40#41080#47",
"last_export_path": "/Users/kdb424/printers/Doom Micron 180", "last_export_path": "/Users/kdb424/printers/Doom Micron 180",
"max_recent_count": "18", "max_recent_count": "18",
"mouse_supported": "mouse left/mouse middle/mouse right", "mouse_supported": "mouse left/mouse middle/mouse right",
@ -63,7 +63,7 @@
"arrange": { "arrange": {
"allow_multi_materials_on_same_plate": false, "allow_multi_materials_on_same_plate": false,
"enable_rotation_fff": false, "enable_rotation_fff": false,
"min_object_distance_fff": "0.1" "min_object_distance_fff": "0.5"
}, },
"filaments": [ "filaments": [
"Arena ABS @Arena X1C", "Arena ABS @Arena X1C",
@ -129,7 +129,7 @@
"timelapse": "1" "timelapse": "1"
}, },
"recent": { "recent": {
"last_opened_folder": "/Users/kdb424/src/voron/V0/Rapid_Burner/Old_Versions/v6/STLs/v0_2/Volcano", "last_opened_folder": "/Users/kdb424/src/voron/V0/Rapid_Burner/STLs/v0.2",
"printhost_path": "", "printhost_path": "",
"settings_folder": "/Users/kdb424/printers/Doom Micron 180" "settings_folder": "/Users/kdb424/printers/Doom Micron 180"
}, },

View file

@ -1,4 +1,4 @@
# generated by SuperSlicer 2.5.59 on 2023-07-29 at 02:41:54 UTC # generated by SuperSlicer 2.5.59 on 2023-08-23 at 08:24:40 UTC
allow_ip_resolve = 1 allow_ip_resolve = 1
auto_switch_preview = 2 auto_switch_preview = 2
auto_toolbar_size = 100 auto_toolbar_size = 100
@ -71,7 +71,7 @@ use_rich_tooltip = 0
version = 2.5.59.2 version = 2.5.59.2
version_check = 1 version_check = 1
view_mode = expert view_mode = expert
window_mainframe = 10; 34; 1705; 1396; 0 window_mainframe = 9; 34; 3420; 1396; 0
window_settings_dialog = 0; 25; 3440; 1415; 1 window_settings_dialog = 0; 25; 3440; 1415; 1
[arrange] [arrange]
@ -97,7 +97,7 @@ sla_print =
[recent] [recent]
printhost_path = printhost_path =
skein_directory = /Users/kdb424/printers/Doom Micron 180/panels skein_directory = /Users/kdb424/Downloads
[recent_projects] [recent_projects]
1 = /Users/kdb424/Downloads/SkirtsParametric.3mf 1 = /Users/kdb424/Downloads/SkirtsParametric.3mf