update
This commit is contained in:
parent
69923254b9
commit
05c5b0201d
11 changed files with 59 additions and 31 deletions
|
|
@ -40,10 +40,4 @@
|
|||
../modules/devel.nix
|
||||
|
||||
];
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "Kyle Brown";
|
||||
userEmail = "kdb424@gmail.com";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,10 +23,4 @@
|
|||
../modules/devel.nix
|
||||
|
||||
];
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "Kyle Brown";
|
||||
userEmail = "kdb424@gmail.com";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,5 +82,11 @@
|
|||
];
|
||||
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "Kyle Brown";
|
||||
userEmail = "kdb424@gmail.com";
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,12 @@
|
|||
# Bring in flakes
|
||||
experimental-features = nix-command flakes
|
||||
|
||||
# Use all the cores
|
||||
max-jobs = auto
|
||||
|
||||
# Save some space
|
||||
auto-optimise-store = true
|
||||
|
||||
# Keep direnv stuff not cleaned up
|
||||
keep-outputs = true
|
||||
keep-derivations = true
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@
|
|||
doom ; what makes DOOM look the way it does
|
||||
doom-dashboard ; a nifty splash screen for Emacs
|
||||
;;doom-quit ; DOOM quit-message prompts when you quit Emacs
|
||||
;;(emoji +unicode) ; 🙂
|
||||
(emoji +unicode) ; 🙂
|
||||
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
|
||||
;;hydra
|
||||
;;indent-guides ; highlighted indent columns
|
||||
indent-guides ; highlighted indent columns
|
||||
;;ligatures ; ligatures and symbols to make your code pretty again
|
||||
;;minimap ; show a map of the code on the side
|
||||
modeline ; snazzy, Atom-inspired modeline, plus API
|
||||
|
|
@ -56,7 +56,8 @@
|
|||
(evil +everywhere) ; come to the dark side, we have cookies
|
||||
file-templates ; auto-snippets for empty files
|
||||
;;fold ; (nigh) universal code folding
|
||||
;;(format +onsave) ; automated prettiness
|
||||
;;(format +onsave) ; automated prettiness
|
||||
(format) ; automated prettiness
|
||||
;;god ; run Emacs commands without modifier keys
|
||||
;;lispy ; vim for lisp, for people who don't like vim
|
||||
;;multiple-cursors ; editing in many places at once
|
||||
|
|
@ -80,15 +81,15 @@
|
|||
;;vterm ; the best terminal emulation in Emacs
|
||||
|
||||
:checkers
|
||||
syntax ; tasing you for every semicolon you forget
|
||||
(spell +flyspell) ; tasing you for misspelling mispelling
|
||||
grammar ; tasing grammar mistake every you make
|
||||
syntax ; teasing you for every semicolon you forget
|
||||
(spell +flyspell) ; teasing you for misspelling mispelling
|
||||
;;grammar ; teasing grammar mistake every you make
|
||||
|
||||
:tools
|
||||
;;ansible
|
||||
;;biblio ; Writes a PhD for you (citation needed)
|
||||
;;debugger ; FIXME stepping through code, to help you add bugs
|
||||
;;direnv
|
||||
direnv
|
||||
;;docker
|
||||
;;editorconfig ; let someone else argue about tabs vs spaces
|
||||
;;ein ; tame Jupyter notebooks with emacs
|
||||
|
|
|
|||
5
.yabairc
5
.yabairc
|
|
@ -89,11 +89,8 @@ yabai -m rule --add label="mpv" app="^mpv$" manage=off
|
|||
yabai -m rule --add app="^Kodi$" manage=off
|
||||
yabai -m rule --add label="Software Update" title="Software Update" manage=off
|
||||
yabai -m rule --add label="About This Mac" app="System Information" title="About This Mac" manage=off
|
||||
yabai -m rule --add app="^Discord$" space=main
|
||||
yabai -m rule --add app="^Schildi$" space=main
|
||||
yabai -m rule --add app="^Fusion$" space=secondary
|
||||
yabai -m rule --add app="^QTView$" space=secondary
|
||||
yabai -m rule --add app="^iTerm$" title="Preferences" manage=off
|
||||
yabai -m rule --add label="^System Settings" app="^System Settings$" manage=off
|
||||
|
||||
set +x
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,5 @@ if [[ $EUID != 0 ]]; then
|
|||
typeset -xT SUDO_PATH sudo_path
|
||||
typeset -U sudo_path
|
||||
sudo_path=({,/usr/local,/usr}/sbin(N-/))
|
||||
alias sudo="sudo env PATH=\"SUDO_PATH:$PATH\""
|
||||
alias sudo="sudo env PATH=\"SUDO_PATH:$PATH\" "
|
||||
fi
|
||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||
|
|
|
|||
32
.zsh_aliases
32
.zsh_aliases
|
|
@ -123,6 +123,7 @@ if (( $+commands[home-manager] )); then
|
|||
alias hme='home-manager edit'
|
||||
alias hm='home-manager '
|
||||
alias hsearch='nix search nixpkgs'
|
||||
alias nso='nix-store --optimise'
|
||||
fi
|
||||
|
||||
# Docker shortcuts
|
||||
|
|
@ -142,7 +143,7 @@ fi
|
|||
|
||||
function prune () {
|
||||
if (( $+commands[home-manager] )); then
|
||||
nix-collect-garbage -d
|
||||
nix-collect-garbage --delete-older-than 7d
|
||||
nix-store --optimise
|
||||
fi
|
||||
if (( $+commands[nixos-rebuild] )); then
|
||||
|
|
@ -307,8 +308,8 @@ alias mv='mv -i -v'
|
|||
alias mkdir='mkdir -p -v'
|
||||
alias df='df -h'
|
||||
alias dd='dd status=progress bs=4M conv=fdatasync '
|
||||
alias sudo='sudo env "PATH=$PATH" ' # Makes sudo work with aliases and saves path
|
||||
alias ncdu='ncdu -x' # Don't cross filesystem boundries
|
||||
alias sudo='sudo env "PATH=$PATH" ' # Makes sudo work with aliases and saves path
|
||||
|
||||
# Shortcuts to edit common files
|
||||
alias reload='source ${HOME}/.zshrc'
|
||||
|
|
@ -396,3 +397,30 @@ mktgz() { tar cvzf "${1%%/}.tar.gz" "${1%%/}/"; }
|
|||
mktbz() { tar cvjf "${1%%/}.tar.bz2" "${1%%/}/"; }
|
||||
mkzip() { 7z a -r "${1%%/}.zip" "${1%%/}/"; }
|
||||
mk7zip() { 7z a -r "${1%%/}.7z" "${1%%/}/"; }
|
||||
|
||||
nixify() {
|
||||
if [ ! -e ./.envrc ]; then
|
||||
echo "use nix" > .envrc
|
||||
direnv allow
|
||||
fi
|
||||
if [[ ! -e shell.nix ]] && [[ ! -e default.nix ]]; then
|
||||
cat > default.nix <<'EOF'
|
||||
with import <nixpkgs> {};
|
||||
mkShell {
|
||||
nativeBuildInputs = [
|
||||
bashInteractive
|
||||
];
|
||||
}
|
||||
EOF
|
||||
${EDITOR:-vim} default.nix
|
||||
fi
|
||||
}
|
||||
flakify() {
|
||||
if [ ! -e flake.nix ]; then
|
||||
nix flake new -t github:nix-community/nix-direnv .
|
||||
elif [ ! -e .envrc ]; then
|
||||
echo "use flake" > .envrc
|
||||
direnv allow
|
||||
fi
|
||||
${EDITOR:-vim} flake.nix
|
||||
}
|
||||
|
|
|
|||
1
.zshenv
1
.zshenv
|
|
@ -75,4 +75,3 @@ if [[ $(hostname) == "amy" ]] || [[ $(hostname) == "cubert" ]] ; then
|
|||
TMUX_AUTOSTART=false
|
||||
fi
|
||||
|
||||
if [ -e /home/kdb424/.nix-profile/etc/profile.d/nix.sh ]; then . /home/kdb424/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
|
||||
|
|
|
|||
3
.zshrc
3
.zshrc
|
|
@ -124,12 +124,13 @@ bindkey "^?" backward-delete-char
|
|||
|
||||
(( $+commands[thefuck] )) && eval $(thefuck --alias)
|
||||
(( $+commands[direnv] )) && eval "$(direnv hook zsh)"
|
||||
[[ -f /opt/homebrew/bin/brew ]] && eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||
|
||||
# Add local tools to PATH
|
||||
trypath ${HOME}/.scripts
|
||||
trypath ${HOME}/bin
|
||||
trypath ${HOME}/.local/bin
|
||||
trypath ${HOME}/.emacs.d/bin
|
||||
trypath ${HOME}/.config/emacs/bin
|
||||
trypath ${HOME}/src/klipper_estimator/target/release
|
||||
|
||||
# Dev tools to PATH
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# generated by SuperSlicer 2.5.59 on 2023-08-23 at 08:24:40 UTC
|
||||
# generated by SuperSlicer 2.5.59 on 2023-08-31 at 02:18:33 UTC
|
||||
allow_ip_resolve = 1
|
||||
auto_switch_preview = 2
|
||||
auto_toolbar_size = 100
|
||||
|
|
@ -71,7 +71,7 @@ use_rich_tooltip = 0
|
|||
version = 2.5.59.2
|
||||
version_check = 1
|
||||
view_mode = expert
|
||||
window_mainframe = 9; 34; 3420; 1396; 0
|
||||
window_mainframe = 10; 34; 3420; 1396; 0
|
||||
window_settings_dialog = 0; 25; 3440; 1415; 1
|
||||
|
||||
[arrange]
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue