From 5d9efe2ce64c6f702f3b3f3efc43b0ba590c9c19 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Thu, 4 Aug 2022 10:57:08 +0200 Subject: [PATCH] Various bits and cleanups --- .bash_aliases | 1 + .../kitty.desktop##hostname.elephant | 1 - .config/yadm/unignore | 1 - .zshenv | 11 +++++---- README.org | 23 ------------------- 5 files changed, 8 insertions(+), 29 deletions(-) delete mode 120000 .config/autostart/kitty.desktop##hostname.elephant diff --git a/.bash_aliases b/.bash_aliases index 796a0a4..21093e7 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -8,6 +8,7 @@ if test -f /etc/bash_completion && ! shopt -oq posix then . /etc/bash_completion fi +alias scs="sudo systemctl status" alias scr="sudo systemctl reload-or-restart" difr() { diff --color=always --unified=1 --recursive "$@" | less --RAW-CONTROL-CHARS --quit-on-intr --quit-if-one-screen; } diff --git a/.config/autostart/kitty.desktop##hostname.elephant b/.config/autostart/kitty.desktop##hostname.elephant deleted file mode 120000 index 4b67763..0000000 --- a/.config/autostart/kitty.desktop##hostname.elephant +++ /dev/null @@ -1 +0,0 @@ -/usr/share/applications/kitty.desktop \ No newline at end of file diff --git a/.config/yadm/unignore b/.config/yadm/unignore index 9b5c31a..f47da36 100644 --- a/.config/yadm/unignore +++ b/.config/yadm/unignore @@ -1,4 +1,3 @@ -$XDG_CONFIG_HOME/kitty $XDG_CONFIG_HOME/yadm $XDG_CONFIG_HOME/doom $XDG_CONFIG_HOME/git diff --git a/.zshenv b/.zshenv index be86f64..4f42d83 100644 --- a/.zshenv +++ b/.zshenv @@ -2,7 +2,7 @@ export DATA="$(test -d $HOME/daten && echo $HOME/daten || echo $HOME/data)" export MUSIC="$DATA/4-media/music" export BORG_REPO="/mnt/backup/borg" -export BORG_PASSCOMMAND='pass service/devices/borg/backup' +export BORG_PASSCOMMAND='pass service/device/borg/backup' # xdg export XDG_DATA_HOME="$HOME/.local/share" @@ -31,10 +31,13 @@ export WINEPREFIX="$XDG_DATA_HOME"/wine ## Development tools export GOPATH="$XDG_STATE_HOME"/go +export KREW_ROOT="$XDG_DATA_HOME"/krew + export CARGO_HOME="$XDG_DATA_HOME"/cargo export RUSTUP_HOME="$XDG_DATA_HOME"/rustup + export NVM_DIR="$XDG_DATA_HOME"/nvm -export KREW_ROOT="$XDG_DATA_HOME"/krew +export N_PREFIX="$XDG_STATE_HOME"/n export CABAL_CONFIG="$XDG_CONFIG_HOME"/cabal/config export CABAL_DIR="$XDG_CACHE_HOME"/cabal @@ -51,7 +54,7 @@ export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java" export GRADLE_USER_HOME="$XDG_STATE_HOME"/gradle export ANDROID_PREFS_ROOT="$XDG_CONFIG_HOME"/android export ANDROID_EMULATOR_HOME="$XDG_STATE_HOME"/android/emulator -export ANDROID_SDK_ROOT="/opt/android-sdk" +export ANDROID_SDK_ROOT="/opt/android/sdk" # taskwarrior & timewarrior export TIMEWARRIORDB="$XDG_DATA_HOME"/timewarrior export TASKRC="$XDG_CONFIG_HOME"/task/taskrc @@ -66,7 +69,7 @@ mkdir -p "$XDG_STATE_HOME/zsh" # environment BIN="$HOME/.local/bin" -export PATH="$BIN/scripts:$BIN:$PATH:$XDG_CONFIG_HOME/emacs/bin:$GOPATH/bin:$XDG_DATA_HOME/gem/ruby/3.0.0/bin:$ANDROID_SDK_ROOT/platform-tools:$CARGO_HOME/bin:$KREW_ROOT/bin" +export PATH="$BIN/scripts:$BIN:$PATH:$XDG_CONFIG_HOME/emacs/bin:$N_PREFIX:$GOPATH/bin:$XDG_DATA_HOME/gem/ruby/3.0.0/bin:$ANDROID_SDK_ROOT/platform-tools:$CARGO_HOME/bin:$KREW_ROOT/bin" export ALTERNATE_EDITOR="$( if which nvim >/dev/null then echo nvim diff --git a/README.org b/README.org index e74d08e..6d9ce91 100644 --- a/README.org +++ b/README.org @@ -28,15 +28,10 @@ and configuration for ~less~ and ~fzf~. including many essential git scripts * Packages : pacman -Qe | cut -d\ -f1 | xclip -selection clipboard -# Use org-yank-visible -- essentials :: curl git zsh bat neovim man-db -- basic tools :: tree wget texinfo fzf expect zoxide mlocate -- arch basics :: fd ripgrep zsh-completions python-pynvim unrar man-pages base-devel topgrade - dotfiles :: yadm : yadm clone --bootstrap git@git.jfischer.org:xeruf/dotfiles.git : yadm clone --bootstrap https://git.jfischer.org/xeruf/dotfiles.git Run ~bootstrap~ after starting ZSH -- Server :: sudo apt install cargo && cargo install diffr #zoxide ** Applications - utilities :: youtube-dl dos2unix rlwrap - powertools :: hexedit hexyl [[https://lftp.yar.ru/][lftp]] glances zsh-doc pacman-contrib @@ -62,18 +57,12 @@ makepkg -si - needs extra setup :: rdictcc-git - experiments :: kakoune ** Graphical -- office :: libreoffice-fresh zathura zathura-pdf-poppler zathura-djvu zathura-ps - fonts :: fontpreview noto-fonts noto-fonts-emoji ttf-dejavu adobe-source-code-pro-fonts texlive-myriadpro-git -- video :: [[https://github.com/phw/peek][peek]] vlc obs-studio kdenlive - music management :: puddletag beets picard ffmpegthumbnailer sox : sudo npm install -g bpm -- music production :: lilypond lilypond-docs timidity++ chordpro-git musescore mixxx-beta-git soundfont-fluid -- communication :: zulip-desktop-bin ferdi-bin -- hacking :: etcher-bin - health :: stretchly-xeruf-git redshift acpilight light : scu enable --now redshift -> https://www.reddit.com/r/linuxquestions/comments/pm1bxn/setting_brightness_on_amd_ryzen_7_5800h_with -- games :: opendungeons 0ad mindustry-bin minetest sauerbraten teeworlds *** Desktop - xorg :: xorg-xserver xorg-xkill xorg-setxkbmap xorg-xinit xterm xclip xprintidle light - wayland :: sway azote dex @@ -97,18 +86,6 @@ https://addons.mozilla.org/firefox/addon/passff https://addons.mozilla.org/firefox/addon/masterpassword-firefox **** [[https://addons.mozilla.org/en-US/firefox/collections/15727735/integration?collection_sort=-popularity][System Integration]] **** [[https://addons.mozilla.org/en-US/firefox/collections/15727735/privacy?collection_sort=-popularity][Privacy]] -*** Dev -#+begin_source sh -yays intellij-idea-ultimate-edition intellij-idea-ultimate-edition-jre \ -jdk-openjdk java-openjfx jdk8-openjdk java8-openjfx -archlinux-java set jdk8-openjdk -yays clion clion-jre cmake gdb python-pre-commit -#+end_source -**** Android -: yays android-udev android-tools adbfs-rootless-git android-studio -After running android-studio setup, accept licenses: -: $ANDROID_SDK_ROOT/tools/bin/sdkmanager --licenses - * Setup Tools ** Ansible :PROPERTIES: