From a18aeba8abf572d3bd5d3fcb8180f0eee1cedf18 Mon Sep 17 00:00:00 2001 From: Kyle Brown Date: Thu, 24 Aug 2023 21:28:02 -0700 Subject: [PATCH] package changes --- .config/home-manager/machines/farnsworth.nix | 8 ++++++ .config/home-manager/modules/common.nix | 5 +++- .config/home-manager/modules/devel.nix | 5 ++-- .config/mpv/mpv.conf | 2 +- .doom.d/init.el | 2 +- .zpackages.zsh | 1 + .zsh_aliases | 28 ++++++++++++++----- .zshrc | 3 +- .../OrcaSlicer/OrcaSlicer.conf | 6 ++-- .../SuperSlicer/SuperSlicer.ini | 6 ++-- 10 files changed, 47 insertions(+), 19 deletions(-) diff --git a/.config/home-manager/machines/farnsworth.nix b/.config/home-manager/machines/farnsworth.nix index 5fa0c01..2d93266 100644 --- a/.config/home-manager/machines/farnsworth.nix +++ b/.config/home-manager/machines/farnsworth.nix @@ -1,5 +1,13 @@ { config, pkgs, lib, ... }: + +#nix = { +# package = pkgs.nixFlakes; +# extraOptions = '' +# experimental-features = nix-command flakes +# ''; +#}; + { # Home Manager needs a bit of information about you and the # paths it should manage. diff --git a/.config/home-manager/modules/common.nix b/.config/home-manager/modules/common.nix index a7414bf..11bf68e 100644 --- a/.config/home-manager/modules/common.nix +++ b/.config/home-manager/modules/common.nix @@ -14,12 +14,14 @@ bat # modern cat colordiff # gimme my colours du-dust # modern du - exa # modern ls + eza # modern ls fd # way faster find ripgrep # faster grep thefuck # Can't type? fuck zoxide # cd is just too slow fzf # fuzzy finding + sd # sed, but rusty + tealdeer # tldr, but rusty # multiplexers tmux # just for me @@ -76,6 +78,7 @@ ispell # doom emacs iotop # disk top iftop # network top + bandwhich # bandwidth utility ]; diff --git a/.config/home-manager/modules/devel.nix b/.config/home-manager/modules/devel.nix index 7f85985..f245858 100644 --- a/.config/home-manager/modules/devel.nix +++ b/.config/home-manager/modules/devel.nix @@ -6,7 +6,7 @@ nim rustup - # devel + # docs pandoc # microcontrollers @@ -14,7 +14,8 @@ gnumake # Useful utils - grex + grex # regex made easy + git-cliff # useful commit messages ]; } diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index af07543..93a5001 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,3 +1,3 @@ -coreaudio-change-physical-format=yes +#coreaudio-change-physical-format=yes audio-display=no diff --git a/.doom.d/init.el b/.doom.d/init.el index e194d4e..7480c4d 100644 --- a/.doom.d/init.el +++ b/.doom.d/init.el @@ -56,7 +56,7 @@ (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 ;;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 diff --git a/.zpackages.zsh b/.zpackages.zsh index 8af0f64..c557e94 100644 --- a/.zpackages.zsh +++ b/.zpackages.zsh @@ -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 "laggardkernel/zsh-thefuck", depth:1, from:github, if:"(($+commands[fuck]))" 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]))" diff --git a/.zsh_aliases b/.zsh_aliases index aedd8ff..7aeaf7b 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -122,6 +122,7 @@ if (( $+commands[home-manager] )); then alias hmc='home-manager expire-generations -7days' alias hme='home-manager edit' alias hm='home-manager ' + alias hsearch='nix search nixpkgs' fi # Docker shortcuts @@ -188,10 +189,20 @@ else alias diff="diff -Nuar" fi -if (( $+commands[fx] )); then - alias ranger="fx": +if (( !$+commands[tldr] )); then + MISSING_PACKAGES+=('tealdeer') +fi + +if (( $+commands[sd] )); then + alias sed="sd": else - MISSING_PACKAGES+=('felix') + MISSING_PACKAGES+=('sd') +fi + +if (( $+commands[bandwhich] )); then + alias bmon="bandwhich": +else + MISSING_PACKAGES+=('bandwhich') fi if (( $+commands[rg] )); then @@ -207,11 +218,11 @@ else MISSING_PACKAGES+=('bat') fi -if (( $+commands[exa] )); then - alias ls='exa --icons' - alias l='exa -al --icons' +if (( $+commands[eza] )); then + alias ls='eza --icons' + alias l='eza -al --icons' else - MISSING_PACKAGES+=('exa') + MISSING_PACKAGES+=('eza') alias l='ls -al' 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' +# Sprunge replacement +alias -g sprunge=" curl -F 'f:1=<-' ix.io" + # Changing dirs with just dots. alias .='cd ../' alias ..='cd ../../' diff --git a/.zshrc b/.zshrc index 214c0a5..1f785b3 100755 --- a/.zshrc +++ b/.zshrc @@ -19,14 +19,15 @@ trysource ${HOME}/.nix-profile/etc/profile.d/hm-session-vars.sh trysource ${HOME}/.zplug/init.zsh # Install plugins if there are plugins that have not been installed +trysource ${HOME}/.zpackages.zsh if ! zplug check; then printf "Install? [y/N]: " if read -q; then echo; zplug install fi fi -trysource ${HOME}/.zpackages.zsh zplug load + ZSH_THEME="powerlevel10k/powerlevel10k" trysource "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" diff --git a/Library/Application Support/OrcaSlicer/OrcaSlicer.conf b/Library/Application Support/OrcaSlicer/OrcaSlicer.conf index 0ee0748..83edd31 100644 --- a/Library/Application Support/OrcaSlicer/OrcaSlicer.conf +++ b/Library/Application Support/OrcaSlicer/OrcaSlicer.conf @@ -13,7 +13,7 @@ "installed_networking": "1", "iot_environment": "3", "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", "max_recent_count": "18", "mouse_supported": "mouse left/mouse middle/mouse right", @@ -63,7 +63,7 @@ "arrange": { "allow_multi_materials_on_same_plate": false, "enable_rotation_fff": false, - "min_object_distance_fff": "0.1" + "min_object_distance_fff": "0.5" }, "filaments": [ "Arena ABS @Arena X1C", @@ -129,7 +129,7 @@ "timelapse": "1" }, "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": "", "settings_folder": "/Users/kdb424/printers/Doom Micron 180" }, diff --git a/Library/Application Support/SuperSlicer/SuperSlicer.ini b/Library/Application Support/SuperSlicer/SuperSlicer.ini index 5d2d164..e85e3c2 100644 --- a/Library/Application Support/SuperSlicer/SuperSlicer.ini +++ b/Library/Application Support/SuperSlicer/SuperSlicer.ini @@ -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 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 = 10; 34; 1705; 1396; 0 +window_mainframe = 9; 34; 3420; 1396; 0 window_settings_dialog = 0; 25; 3440; 1415; 1 [arrange] @@ -97,7 +97,7 @@ sla_print = [recent] printhost_path = -skein_directory = /Users/kdb424/printers/Doom Micron 180/panels +skein_directory = /Users/kdb424/Downloads [recent_projects] 1 = /Users/kdb424/Downloads/SkirtsParametric.3mf