From 3add923d5e2869ba4bcf5baa4050b80181a43b36 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 24 Feb 2021 23:25:17 +0100 Subject: Updated downloads -> dl, Added README programs, Try to fix moc with XDG dirs --- README.md | 30 ++++++++++++++++++++---------- config/moc/config | 12 +++--------- config/qutebrowser/config.py | 2 +- config/xmonad/xmonad.hs | 2 +- local/bin/cacharle-sync | 28 ---------------------------- local/bin/clout | 28 ++++++++++++++++++++++++++++ 6 files changed, 53 insertions(+), 49 deletions(-) delete mode 100755 local/bin/cacharle-sync create mode 100755 local/bin/clout diff --git a/README.md b/README.md index 8daca94..d1ee98a 100644 --- a/README.md +++ b/README.md @@ -2,19 +2,29 @@ ## Installation -1. Backup your current configuration files, they will be overwritten -2. `cd` in this repo -3. Run the `install` script +Make sure to backup your current configuration files, they will be overwritten. + +``` +$ git clone --recursive git://git.cacharle.xyz/dotfiles +$ cd dotfiles +$ ./install +``` ## Tools I use -* [vim](https://github.com/vim/vim) - terminal text editor -* [zsh](https://www.zsh.org/) - interactive shell -* [xmonad](https://xmonad.org) - window manager -* [redshift](http://jonls.dk/redshift/) - change screen color temperature -* [mutt](http://www.mutt.org/) - email client -* [newsboat](https://newsboat.org/) - RSS feed reader -* [moc](https://moc.daper.net/) - music player +| Name | Link | Description | +|-------------|------------------------------------|---------------------------------| +| vim | https://github.com/vim/vim | Terminal text editor | +| zsh | https://www.zsh.org/ | Interactive shell | +| xmonad | https://xmonad.org | Window manager | +| qutebrowser | https://www.qutebrowser.org | Vim like browser | +| mutt | http://www.mutt.org/ | Email client | +| newsboat | https://newsboat.org/ | RSS feed reader | +| zathura | https://pwmt.org/projects/zathura/ | PDF viewer with vim keybindings | +| sxiv | https://github.com/muennich/sxiv | Simple image viewer | +| mpv | https://mpv.io/ | Simple video player | +| moc | https://moc.daper.net/ | Music player | +| redshift | http://jonls.dk/redshift/ | Change screen color temperature | ## School 19 Config diff --git a/config/moc/config b/config/moc/config index 37af912..7ff5cf2 100644 --- a/config/moc/config +++ b/config/moc/config @@ -216,10 +216,7 @@ HideFileExtension = yes # Theme file to use. This can be absolute path or relative to # /usr/share/moc/themes/ (depends on installation prefix) or # ~/.moc/themes/ . -# -# Example: Theme = laras_theme -# -Theme = solarized +Theme = /home/cacharle/.config/moc/themes/solarized # The theme used when running on an xterm. # @@ -234,7 +231,7 @@ Theme = solarized # MOC directory (where pid file, socket and state files are stored). # You can use ~ at the beginning. -#MOCDir = ~/.moc +MOCDir = ~/.local/share/moc # Use mmap() to read files. mmap() is much slower on NFS. #UseMMap = no @@ -278,10 +275,7 @@ Theme = solarized # Choose a keymap file (relative to '~/.moc/' or using an absolute path). # An annotated example keymap file is included ('keymap.example'). -# -# Example: Keymap = my_keymap -# -Keymap = keymap +Keymap = /home/cacharle/.config/moc/keymap # Use ASCII rather than graphic characters for drawing lines. This # helps on some terminals. diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py index bcbdc5a..83d7ae7 100644 --- a/config/qutebrowser/config.py +++ b/config/qutebrowser/config.py @@ -72,7 +72,7 @@ c.session.lazy_restore = True home_path = os.environ.get('HOME') if home_path is not None: - download_path = os.path.join(home_path, "downloads") + download_path = os.path.join(home_path, "dl") if not os.path.exists(download_path): os.mkdir(download_path) c.downloads.location.directory = download_path diff --git a/config/xmonad/xmonad.hs b/config/xmonad/xmonad.hs index b1655ef..43017c7 100644 --- a/config/xmonad/xmonad.hs +++ b/config/xmonad/xmonad.hs @@ -56,7 +56,7 @@ myKeys = [ ("", spawn "pulseaudio-ctl down") , ("", spawn "touchpad-toggle") , ("M-o", spawn "project-open") - , ("M-m", spawn "st -e mocp") + , ("M-m", spawn "st -e mocp -C /home/cacharle/.config/moc/config") , ("M-S-d", spawn "notify-send -i x-office-calendar \"$(date +\"%H:%M %A %d/%m/%Y %B\")\"") , ("M-S-b", spawn "notify-send \"battery: $(cat /sys/class/power_supply/BAT0/capacity)\"") , ("M-q", spawn "notify-send 'Restarting xmonad'" >> spawn restartCmd) diff --git a/local/bin/cacharle-sync b/local/bin/cacharle-sync deleted file mode 100755 index 80f19bb..0000000 --- a/local/bin/cacharle-sync +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -usage() { - echo "Usage: $0 push/pull [rsync args...]" -} - -[ -z "$1" ] && usage && exit 1 - -RSYNC_ARGS="$(echo "$*" | cut -d ' ' -f 2-)" -RSYNC_CMD="rsync -avh --progress --compress $RSYNC_ARGS" - -REMOTE_USER=charles -REMOTE_HOST=cacharle.xyz - -SYNC_DIR="cacharle-sync/" -SYNC_PATH="$HOME/$SYNC_DIR" - -case "$1" in - push) - $RSYNC_CMD "$SYNC_PATH" "$REMOTE_USER@$REMOTE_HOST:$SYNC_DIR" - ;; - pull) - $RSYNC_CMD "$REMOTE_USER@$REMOTE_HOST:$SYNC_DIR" "$SYNC_PATH" - ;; - *) - usage && exit 1 - ;; -esac diff --git a/local/bin/clout b/local/bin/clout new file mode 100755 index 0000000..80f19bb --- /dev/null +++ b/local/bin/clout @@ -0,0 +1,28 @@ +#!/bin/sh + +usage() { + echo "Usage: $0 push/pull [rsync args...]" +} + +[ -z "$1" ] && usage && exit 1 + +RSYNC_ARGS="$(echo "$*" | cut -d ' ' -f 2-)" +RSYNC_CMD="rsync -avh --progress --compress $RSYNC_ARGS" + +REMOTE_USER=charles +REMOTE_HOST=cacharle.xyz + +SYNC_DIR="cacharle-sync/" +SYNC_PATH="$HOME/$SYNC_DIR" + +case "$1" in + push) + $RSYNC_CMD "$SYNC_PATH" "$REMOTE_USER@$REMOTE_HOST:$SYNC_DIR" + ;; + pull) + $RSYNC_CMD "$REMOTE_USER@$REMOTE_HOST:$SYNC_DIR" "$SYNC_PATH" + ;; + *) + usage && exit 1 + ;; +esac -- cgit