From fa1b564d7cb27438e718e0d43daff02c14f1629b Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 3 Dec 2018 07:57:10 -0200 Subject: macOS: prefer local bin over system bin. --- bash/bashrc.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bash/bashrc.sh b/bash/bashrc.sh index 9ddaf6f..037083c 100644 --- a/bash/bashrc.sh +++ b/bash/bashrc.sh @@ -35,6 +35,7 @@ export PATH="$HOME/.perl6/bin:$PATH" isMac && { PATH="/usr/local/opt/make/libexec/gnubin:$PATH" + PATH="/usr/local/bin:$PATH" } export PATH="$HOME/tmp/rakudobrew/bin:$PATH" -- cgit v1.2.3 From a9c64c33f01e67af1c83cbbe893b7142fae266ef Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 3 Dec 2018 07:58:44 -0200 Subject: Restrict autojump hack to Linux. --- bash/bashrc.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bash/bashrc.sh b/bash/bashrc.sh index 037083c..d06692b 100644 --- a/bash/bashrc.sh +++ b/bash/bashrc.sh @@ -27,8 +27,9 @@ env > ~/.spacemacs.env export PATH="$HOME/annex/dev/code/songbooks/cli:$PATH" alias sb="songbooks" -source "$(dirname $(readlink $(which autojump)))/../share/autojump/autojump.bash" - +isLinux && { + source "$(dirname $(readlink $(which autojump)))/../share/autojump/autojump.bash" +} export PATH="$HOME/.perl6/bin:$PATH" -- cgit v1.2.3 From 3e7f6f2382a6d01835389d8ac2ba64bfeead6f7e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 3 Dec 2018 12:19:23 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 11764 -> 11817 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index 3b4295a..0fdf351 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From e161fa9a0936e64d519a4164e9643735959b8efa Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 3 Dec 2018 12:20:56 -0200 Subject: Add inkscape package. --- nixos/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index ba986e4..5a4a52d 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -256,6 +256,7 @@ ## GUI programs + inkscape calibre rhythmbox gpodder -- cgit v1.2.3 From b584329740ab8453852cad6176558d4af4079b7c Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 6 Dec 2018 12:18:16 -0200 Subject: Add mail files to GC routine. --- scripts/gc.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/gc.sh b/scripts/gc.sh index 9670149..ac1b412 100755 --- a/scripts/gc.sh +++ b/scripts/gc.sh @@ -45,14 +45,15 @@ docker rm $(docker ps -a -q) echo y | docker volume prune echo y | docker container prune + +# Source: https://www.reddit.com/r/emacs/comments/6wqfp3/notmuch_delete_mail/ +yellow "Clean up deleted email files" +notmuch search --output=files --exclude=false tag:deleted | xargs -I{} rm "{}" +notmuch new + after=$(disk_space) green "Done." green "Disk space before and after:" blue " before: ${before}" blue " after: ${after}" - -# Clean up deleted email files: -# Source: https://www.reddit.com/r/emacs/comments/6wqfp3/notmuch_delete_mail/ -# notmuch search --output=files --exclude=false tag:deleted | xargs -I{} rm "{}" -# notmuch new -- cgit v1.2.3 From f2cc7b046501ebbf4c3b26018d0f964625e16d1a Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 6 Dec 2018 12:18:48 -0200 Subject: WIP: add custom version of Node.js. --- nixos/configuration.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 5a4a52d..e94b782 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -73,12 +73,23 @@ url = "https://github.com/NixOS/nixpkgs/archive/18.03.zip"; sha256 = "0hk4y2vkgm1qadpsm4b0q1vxq889jhxzjx3ragybrlwwg54mzp4f"; }) {}; + timidityWithEvenMoreFormats = with pkgs; timidity.overrideAttrs (oldAttrs: { configureFlags = oldAttrs.configureFlags ++ [ "--enable-audio=vorbis,flac" ]; buildInputs = oldAttrs.buildInputs ++ [ libogg libvorbis flac ]; }); + + # https://github.com/nixos/nixpkgs/blob/0d202221f98e500f1df79112dc464d013eefcdae/pkgs/development/web/nodejs/v10.nix#L4 + buildNodejs = pkgs.callPackage {}; + nodejs-10_14_1 = buildNodejs { + enableNpm = true; + version = "10.14.1"; + sha256 = "0d5hg8hf4c1sshh77a6hy944bzm3q3ipqggbyim61q3r2szngvrx"; + # Uses HTTPS (https://github.com/nixos/nixpkgs/blob/0d202221f98e500f1df79112dc464d013eefcdae/pkgs/development/web/nodejs/nodejs.nix#L45), safer to trust the hash (unless it's already compromised :shrug:) + }; in with pkgs; [ - pkgsUnstable.nodejs-10_x + pkgsUnstable.nodejs-10_x + # nodejs-10_14_1 ## Personal data tools -- cgit v1.2.3 From b560c85f4d8815121147cc113830993c0a414717 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 6 Dec 2018 12:27:16 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 11817 -> 11964 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index 0fdf351..3745d0e 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From 09c089d68d20759e5dd3d68c290717027f774415 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 7 Dec 2018 07:04:33 -0200 Subject: Add custom alias for =copy= on macOS. --- bash/aliases.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bash/aliases.sh b/bash/aliases.sh index 07c46ea..c8fa2b3 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -7,7 +7,12 @@ alias ros="rlwrap ros -l ~/.sbclrc" alias l="ls -lahp" alias ll="ls -lhp" alias yt-dl="youtube-dl -o '$YT_TEMPLATE'" -alias copy="tr -d '\n' | xclip -sel clip" +isLinux && { + alias copy="tr -d '\n' | xclip -sel clip" +} +isMac && { + alias copy="tr -d '\n' | pbcopy" +} alias pia-vpn="sudo openvpn --config $DOTFILES/VPN/euandreh.ovpn" # Source: https://unix.stackexchange.com/questions/25327/watch-command-alias-expansion#25329 alias watch="watch " -- cgit v1.2.3 From 42b98a3369b501f06602c79b1dacf323847e1dce Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 7 Dec 2018 07:04:49 -0200 Subject: Add =lower= alias. --- bash/aliases.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bash/aliases.sh b/bash/aliases.sh index c8fa2b3..5e38c35 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -13,6 +13,7 @@ isLinux && { isMac && { alias copy="tr -d '\n' | pbcopy" } +alias lower="tr [:upper:] [:lower:]" alias pia-vpn="sudo openvpn --config $DOTFILES/VPN/euandreh.ovpn" # Source: https://unix.stackexchange.com/questions/25327/watch-command-alias-expansion#25329 alias watch="watch " -- cgit v1.2.3 From 705f3b755d8e9b735ae9045ede9b3f386ac13e68 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 9 Dec 2018 11:42:41 -0200 Subject: Add trim bash alias. --- bash/aliases.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bash/aliases.sh b/bash/aliases.sh index 5e38c35..b9a9218 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -13,6 +13,7 @@ isLinux && { isMac && { alias copy="tr -d '\n' | pbcopy" } +alias trim="tr -d '\n'" alias lower="tr [:upper:] [:lower:]" alias pia-vpn="sudo openvpn --config $DOTFILES/VPN/euandreh.ovpn" # Source: https://unix.stackexchange.com/questions/25327/watch-command-alias-expansion#25329 -- cgit v1.2.3 From 81cb475993f312a5945bda1330dcc6643efddf68 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 9 Dec 2018 22:36:59 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 11964 -> 11975 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index 3745d0e..216beb1 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From 6dc8a0dcba5ac44e56c451a622aca67d716822eb Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 10 Dec 2018 05:37:51 -0200 Subject: video-feed.sh. --- encrypted/scripts/video-feed.sh | Bin 3074 -> 3051 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/encrypted/scripts/video-feed.sh b/encrypted/scripts/video-feed.sh index 38d6252..793e6cc 100755 Binary files a/encrypted/scripts/video-feed.sh and b/encrypted/scripts/video-feed.sh differ -- cgit v1.2.3 From 7b7fa5d425437a7efa4eef3aaa820798bfb9acaa Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 10 Dec 2018 05:38:04 -0200 Subject: Disable IPFS for now. --- nixos/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index e94b782..cea2ca3 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -375,9 +375,9 @@ # https://nixos.org/nixos/options.html#ipfs ipfs = { - enable = true; - enableGC = true; - autoMount = true; + enable = false; + enableGC = false; + autoMount = false; }; }; -- cgit v1.2.3 From 68c4dcdf7ee36693a6129ff3f000ad999cb46ca4 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 10 Dec 2018 05:38:58 -0200 Subject: WIP: set nautilus as the opener of directories. --- bash/x.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bash/x.sh b/bash/x.sh index 0759fc2..e0700e3 100644 --- a/bash/x.sh +++ b/bash/x.sh @@ -15,4 +15,6 @@ isLinux && { xdg-settings set default-web-browser firefox.desktop xdg-mime default firefox.desktop text/html xdg-mime default firefox.desktop text/xml + + xdg-mime default nautilus.desktop inode/directory # FIXME } -- cgit v1.2.3 From bdf65952685224824539ecf1aa3232ed54281486 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 10 Dec 2018 05:41:54 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 11975 -> 11831 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index 216beb1..ec51012 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From f4f7ddd0a70acf9ec2a40c6532ce256eca01d54e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 10 Dec 2018 06:19:40 -0200 Subject: Make yt-dl an exported function. --- bash/aliases.sh | 1 - bash/env.sh | 1 - bash/youtube.sh | 9 ++++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bash/aliases.sh b/bash/aliases.sh index b9a9218..772cded 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -6,7 +6,6 @@ alias open="xdg-open" alias ros="rlwrap ros -l ~/.sbclrc" alias l="ls -lahp" alias ll="ls -lhp" -alias yt-dl="youtube-dl -o '$YT_TEMPLATE'" isLinux && { alias copy="tr -d '\n' | xclip -sel clip" } diff --git a/bash/env.sh b/bash/env.sh index c81cba2..a2e4785 100644 --- a/bash/env.sh +++ b/bash/env.sh @@ -32,7 +32,6 @@ export PATH=~/.local/bin:$PATH export EDITOR=vi export PATH="$DOTFILES/scripts/:$PATH" export PATH="$DOTFILES/encrypted/scripts/:$PATH" -export YT_TEMPLATE="~/Downloads/yt-dl/%(uploader)s/%(upload_date)s %(title)s.%(ext)s" export INPUTRC=~/.inputrc export CACHE_DIR="~/Nextcloud/cache" diff --git a/bash/youtube.sh b/bash/youtube.sh index c732e26..3c5b56e 100644 --- a/bash/youtube.sh +++ b/bash/youtube.sh @@ -2,14 +2,20 @@ export DEFAULT_PLAYLIST_END=15 export DEFAULT_INC_STEP=10 +export YT_TEMPLATE="~/Downloads/yt-dl/%(uploader)s/%(upload_date)s %(title)s.%(ext)s" +# Always downloads video, doesn't look at the download-archive +yt-dl() { + youtube-dl "$1" -o "$YT_TEMPLATE" +} +export -f yt-dl download() { youtube-dl "$1" \ --download-archive ~/Nextcloud/cache/youtube-dl-seen.conf \ --prefer-free-formats \ --playlist-end $2 \ - --output "~/Downloads/yt-dl/%(uploader)s/%(upload_date)s - %(title)s.%(ext)s" + --output "$YT_TEMPLATE" } export -f download @@ -38,6 +44,7 @@ inc_download() { local step="${3-$DEFAULT_INC_STEP}" local file="$HOME/.yt-db/$id" + mkdir -p "$HOME/.yt-db" local n_count="$(cat $file 2> /dev/null || printf 10)" local n_count_new="$(($n_count + $step))" -- cgit v1.2.3 From 0d780c19821b9a261b5b5dc56f2104b01326b2d1 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 10 Dec 2018 06:58:51 -0200 Subject: Make yt-dl alias for yt_dl. --- bash/aliases.sh | 1 + bash/youtube.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bash/aliases.sh b/bash/aliases.sh index 772cded..a8205d7 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -6,6 +6,7 @@ alias open="xdg-open" alias ros="rlwrap ros -l ~/.sbclrc" alias l="ls -lahp" alias ll="ls -lhp" +alias yt-dl="yt_dl" isLinux && { alias copy="tr -d '\n' | xclip -sel clip" } diff --git a/bash/youtube.sh b/bash/youtube.sh index 3c5b56e..584d09b 100644 --- a/bash/youtube.sh +++ b/bash/youtube.sh @@ -5,10 +5,10 @@ export DEFAULT_INC_STEP=10 export YT_TEMPLATE="~/Downloads/yt-dl/%(uploader)s/%(upload_date)s %(title)s.%(ext)s" # Always downloads video, doesn't look at the download-archive -yt-dl() { +yt_dl() { youtube-dl "$1" -o "$YT_TEMPLATE" } -export -f yt-dl +export -f yt_dl download() { youtube-dl "$1" \ -- cgit v1.2.3 From 4bae6ab8738556d57975ba0965974940c9e342f8 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 11 Dec 2018 21:34:20 -0200 Subject: Add gnome-control-center alias. --- bash/aliases.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bash/aliases.sh b/bash/aliases.sh index a8205d7..c56375f 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -24,6 +24,8 @@ alias du="ncdu --color dark" alias perl6="rlwrap perl6" alias m="mail.sh" +alias gnome-control-center="XDG_CURRENT_DESKTOP=GNOME gnome-control-center" + alias fim="play $DOTFILES/bash/Positive.ogg &> /dev/null" alias mux="tmuxinator" -- cgit v1.2.3 From 53eb8b2c1d447cf8f2b483489cec413e59a78a34 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 12 Dec 2018 09:53:00 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 11831 -> 11853 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index ec51012..56b3181 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From 782af14a03364a4ab32a6c0451a8c0f7fa0fba91 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 13 Dec 2018 08:01:50 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 11853 -> 11914 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index 56b3181..8e21c68 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From 5cb67aa36151fc8ca4e8789ce8fd1c42edde2935 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 16 Dec 2018 13:52:31 -0200 Subject: profiles.clj. --- lein/profiles.clj | Bin 1124 -> 1185 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lein/profiles.clj b/lein/profiles.clj index 3d52f93..5ead478 100644 Binary files a/lein/profiles.clj and b/lein/profiles.clj differ -- cgit v1.2.3 From dd3608c72459b5508bd183d79d0be041bf45e13e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 16 Dec 2018 13:52:50 -0200 Subject: Replace rust packages with rustup. --- nixos/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index cea2ca3..f9137c1 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -224,8 +224,7 @@ openjdk solc bundler - rustc - rustfmt + rustup cargo clojure # =clj= visualvm # JVM profiling tool -- cgit v1.2.3 From 031846b97f4727afda5ee103886c76863d387733 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 16 Dec 2018 16:30:32 -0200 Subject: video-feed.sh. --- encrypted/scripts/video-feed.sh | Bin 3051 -> 3061 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/encrypted/scripts/video-feed.sh b/encrypted/scripts/video-feed.sh index 793e6cc..6efa22d 100755 Binary files a/encrypted/scripts/video-feed.sh and b/encrypted/scripts/video-feed.sh differ -- cgit v1.2.3 From 11084a9940dde6c3f0647d671c9e69db8af46824 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 20 Dec 2018 08:51:03 -0200 Subject: Run reload after starting annex tmuxinator template. --- bash/aliases.sh | 1 + tmux/projects/annex.yml | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bash/aliases.sh b/bash/aliases.sh index c56375f..fef53cc 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -49,4 +49,5 @@ alias ,s="git status" alias ,d="git diff" alias ,ds="git diff --staged" +alias reload="source $DOTFILES/bash/tests.sh && locked_init && source ~/.bashrc" alias ,r="source $DOTFILES/bash/tests.sh && locked_init && source ~/.bashrc" diff --git a/tmux/projects/annex.yml b/tmux/projects/annex.yml index 92acafe..50d34bc 100644 --- a/tmux/projects/annex.yml +++ b/tmux/projects/annex.yml @@ -5,6 +5,11 @@ windows: - annex+dotfiles: layout: main-vertical panes: - - cd - - j dotfiles && git status - - git status + - misc: + - cd + - dotfiles: + - j dotfiles && git status + - sleep 10 + - reload + - annex: + - git status -- cgit v1.2.3 From f163ca2351fe798cc1e50623ef274080b9cf91b6 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 21 Dec 2018 16:05:50 -0200 Subject: Add save-exact=true to npmrc configuration. --- nixos/npmrc.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/npmrc.sh b/nixos/npmrc.sh index 2bc28dc..326ac0b 100644 --- a/nixos/npmrc.sh +++ b/nixos/npmrc.sh @@ -1 +1,4 @@ prefix="~/.npm-packages" +# Taken from: +# http://www.tomsquest.com/blog/2018/10/better-npm-ing/ +save-exact=true -- cgit v1.2.3 From df04ecc16f653ed2fcf86e2099d21630354a000f Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 21 Dec 2018 16:06:14 -0200 Subject: Add --write-description to youtube-dl scripts. --- bash/youtube.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bash/youtube.sh b/bash/youtube.sh index 584d09b..6ffb2da 100644 --- a/bash/youtube.sh +++ b/bash/youtube.sh @@ -6,15 +6,16 @@ export YT_TEMPLATE="~/Downloads/yt-dl/%(uploader)s/%(upload_date)s %(title)s.%(e # Always downloads video, doesn't look at the download-archive yt_dl() { - youtube-dl "$1" -o "$YT_TEMPLATE" + youtube-dl "$1" -o "$YT_TEMPLATE" --write-description } export -f yt_dl download() { youtube-dl "$1" \ --download-archive ~/Nextcloud/cache/youtube-dl-seen.conf \ - --prefer-free-formats \ - --playlist-end $2 \ + --prefer-free-formats \ + --playlist-end $2 \ + --write-description \ --output "$YT_TEMPLATE" } export -f download -- cgit v1.2.3 From 322e126d4326366d18797243ea69e410fb8bbab2 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 21 Dec 2018 16:06:48 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 11914 -> 11901 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index 8e21c68..f120008 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From d4e6648afd61205136c98fdc56cf151eb437a078 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 22 Dec 2018 18:19:29 -0200 Subject: Move external scripts to bin/. --- bin/git-blame-someone-else | 21 +++++++++++++++++++++ bin/sl | 13 +++++++++++++ bin/sleepsort | 20 ++++++++++++++++++++ scripts/bump.sh | 21 --------------------- scripts/git-blame-someone-else | 21 --------------------- scripts/sl | 13 ------------- scripts/sleepsort | 20 -------------------- 7 files changed, 54 insertions(+), 75 deletions(-) create mode 100755 bin/git-blame-someone-else create mode 100755 bin/sl create mode 100755 bin/sleepsort delete mode 100755 scripts/bump.sh delete mode 100755 scripts/git-blame-someone-else delete mode 100755 scripts/sl delete mode 100755 scripts/sleepsort diff --git a/bin/git-blame-someone-else b/bin/git-blame-someone-else new file mode 100755 index 0000000..dd71826 --- /dev/null +++ b/bin/git-blame-someone-else @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +# Taken from https://github.com/jayphelps/git-blame-someone-else/ + +if [ $# -ne 2 ]; then + >&2 echo "Usage: $0 " + exit 1 +fi + +AUTHOR=$1 +AUTHOR_NAME=$(echo $AUTHOR | perl -wlne '/^(.*?)\s*<.*>$/ and print $1') +AUTHOR_EMAIL=$(echo $AUTHOR | perl -wlne '/^.*\s*<(.*)>$/ and print $1') +COMMIT=$(git rev-parse --short $2) + +{ + GIT_SEQUENCE_EDITOR="sed -i -e 's/^pick $COMMIT/edit $COMMIT/'" git rebase -i $COMMIT~1^^ + GIT_COMMITTER_NAME="$AUTHOR_NAME" GIT_COMMITTER_EMAIL="$AUTHOR_EMAIL" git commit --amend --no-edit --author="$AUTHOR" + # git rebase --continue +} &> /dev/null + +echo "$AUTHOR_NAME is now the author of $COMMIT. You're officially an asshole."; diff --git a/bin/sl b/bin/sl new file mode 100755 index 0000000..2333462 --- /dev/null +++ b/bin/sl @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +# Taken from: +# https://gir.st/blog/sl-alt.htm + +# sl - prints a mirror image of ls. (C) 2017 Tobias Girstmair, https://gir.st/, GPLv3 + +LEN=$(ls "$@" |wc -L) # get the length of the longest line + +ls "$@" | rev | while read -r line +do + printf "%${LEN}.${LEN}s\\n" "$line" | sed 's/^\(\s\+\)\(\S\+\)/\2\1/' +done \ No newline at end of file diff --git a/bin/sleepsort b/bin/sleepsort new file mode 100755 index 0000000..ea20fcb --- /dev/null +++ b/bin/sleepsort @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Taken from: +# https://www.quora.com/What-is-the-strangest-sorting-algorithm/answer/Nipun-Ramakrishnan + +function f() { + sleep "$1" + echo "$1" +} + +while [ -n "$1" ] +do + f "$1" & + shift +done + +wait + +# example usage: +# sleepsort 5 3 6 3 6 3 1 4 7 diff --git a/scripts/bump.sh b/scripts/bump.sh deleted file mode 100755 index 86eed54..0000000 --- a/scripts/bump.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -function latest_version() { - git tag | sort -V | tail -n 1 -} - -function overflow_bump() { - IFS=".$IFS" - read a b c - if [[ "$b" == 999 ]]; then - echo $((a + 1)).0.0 - elif [[ "$c" == 999 ]]; then - echo $a.$((b + 1)).0 - else - echo $a.$b.$((c + 1)) - fi -} - -latest_version | overflow_bump - -echo "$1" | overflow_bump diff --git a/scripts/git-blame-someone-else b/scripts/git-blame-someone-else deleted file mode 100755 index dd71826..0000000 --- a/scripts/git-blame-someone-else +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# Taken from https://github.com/jayphelps/git-blame-someone-else/ - -if [ $# -ne 2 ]; then - >&2 echo "Usage: $0 " - exit 1 -fi - -AUTHOR=$1 -AUTHOR_NAME=$(echo $AUTHOR | perl -wlne '/^(.*?)\s*<.*>$/ and print $1') -AUTHOR_EMAIL=$(echo $AUTHOR | perl -wlne '/^.*\s*<(.*)>$/ and print $1') -COMMIT=$(git rev-parse --short $2) - -{ - GIT_SEQUENCE_EDITOR="sed -i -e 's/^pick $COMMIT/edit $COMMIT/'" git rebase -i $COMMIT~1^^ - GIT_COMMITTER_NAME="$AUTHOR_NAME" GIT_COMMITTER_EMAIL="$AUTHOR_EMAIL" git commit --amend --no-edit --author="$AUTHOR" - # git rebase --continue -} &> /dev/null - -echo "$AUTHOR_NAME is now the author of $COMMIT. You're officially an asshole."; diff --git a/scripts/sl b/scripts/sl deleted file mode 100755 index 2333462..0000000 --- a/scripts/sl +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Taken from: -# https://gir.st/blog/sl-alt.htm - -# sl - prints a mirror image of ls. (C) 2017 Tobias Girstmair, https://gir.st/, GPLv3 - -LEN=$(ls "$@" |wc -L) # get the length of the longest line - -ls "$@" | rev | while read -r line -do - printf "%${LEN}.${LEN}s\\n" "$line" | sed 's/^\(\s\+\)\(\S\+\)/\2\1/' -done \ No newline at end of file diff --git a/scripts/sleepsort b/scripts/sleepsort deleted file mode 100755 index ea20fcb..0000000 --- a/scripts/sleepsort +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Taken from: -# https://www.quora.com/What-is-the-strangest-sorting-algorithm/answer/Nipun-Ramakrishnan - -function f() { - sleep "$1" - echo "$1" -} - -while [ -n "$1" ] -do - f "$1" & - shift -done - -wait - -# example usage: -# sleepsort 5 3 6 3 6 3 1 4 7 -- cgit v1.2.3 From 09d0598347522ce376d9c1be13795e7179896de9 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 22 Dec 2018 18:20:41 -0200 Subject: Remove autotime script. --- scripts/autotime | 76 -------------------------------------------------------- 1 file changed, 76 deletions(-) delete mode 100755 scripts/autotime diff --git a/scripts/autotime b/scripts/autotime deleted file mode 100755 index fb01392..0000000 --- a/scripts/autotime +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env perl6 - -# FIXME: stdin support with lines() -# FIXME: --help and -h support - -sub from-timestamp(Int \timestamp) { - sub formatter($_) { - sprintf '%04d-%02d-%02d %02d:%02d:%02d', - .year, .month, .day, - .hour, .minute, .second, - } - given DateTime.new(+timestamp, :&formatter) { - when .Date.DateTime == $_ { return .Date } - default { return $_ } - } -} - -sub from-date-string(Str $date, Str $time?) { - my $d = Date.new($date); - if $time { - my ( $hour, $minute, $second ) = $time.split(':'); - return DateTime.new(date => $d, :$hour, :$minute, :$second); - } else { - return $d.DateTime; - } -} - -# FIXME: add test -multi sub convert(Int \timestamp) { - from-timestamp(+timestamp); -} - -# FIXME: add test -multi sub convert(Str $date where { try Date.new($_) }, Str $time?) { - from-date-string($date, $time).posix; -} - -# FIXME: add test -#| Convert timestamp to ISO date -multi sub MAIN(Int \timestamp) { - say convert(+timestamp); -} - -# FIXME: add test -#| Convert ISO date to timestamp -multi sub MAIN(Str $date where { try Date.new($_) }, Str $time?) { - say convert($date, $time); -} - -# multi sub MAIN() { -# for lines() -> $line { - -# } -# } - -#| Run internal tests -multi sub MAIN('test') is hidden-from-USAGE { - use Test; - plan 2; - subtest 'timestamp', { - plan 2; - is-deeply from-timestamp(1450915200), Date.new('2015-12-24'), - 'Date';; - my $dt = from-timestamp(1450915201); - is $dt, "2015-12-24 00:00:01", - 'DateTime with string formatting'; - }; - subtest 'from-date-string', { - plan 2; - is from-date-string('2015-12-24').posix, 1450915200, - 'one argument'; - is from-date-string('2015-12-24', '00:00:01').posix, - 1450915201, - 'two arguments'; - }; -} -- cgit v1.2.3 From 58eb3754ce258a7a1fe2f8d399aa15310e92c8ec Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 22 Dec 2018 18:20:48 -0200 Subject: Install languagetool package. --- nixos/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index f9137c1..36e2cb1 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -196,6 +196,7 @@ ## Spell checking (aspellWithDicts (ps : with ps; [ en eo fr pt_BR ])) + languagetool ## NixOS -- cgit v1.2.3 From b920331c39434dc5b801e8bdcaa339bed6692070 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 28 Dec 2018 09:25:18 -0200 Subject: Add ssh_config.conf file with a symlink at ~/.ssh/config pointing to it. --- .gitattributes | 1 + bash/symlinks.sh | 4 ++++ ssh_config.conf | Bin 0 -> 50 bytes 3 files changed, 5 insertions(+) create mode 100644 ssh_config.conf diff --git a/.gitattributes b/.gitattributes index a2fa862..76d2343 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,3 +7,4 @@ git/gitconfig.ini filter=git-crypt diff=git-crypt emacs/gnus.el filter=git-crypt diff=git-crypt emacs/not-much.el filter=git-crypt diff=git-crypt lein/deps.edn filter=git-crypt diff=git-crypt +ssh_config.conf filter=git-crypt diff=git-crypt diff --git a/bash/symlinks.sh b/bash/symlinks.sh index 335189a..6425557 100644 --- a/bash/symlinks.sh +++ b/bash/symlinks.sh @@ -23,6 +23,10 @@ isLinux && { ln -fs $DOTFILES/nixos/npmrc.sh ~/.npmrc } +## SSH config +mkdir -p ~/.ssh +ln -fs $DOTFILES/ssh_config.conf ~/.ssh/config + ln -fs $DOTFILES/git/mrconfig.ini ~/.mrconfig upsert_dir_symlink $MEDIA_PREFIX/UTCLOUD ~/UTCLOUD diff --git a/ssh_config.conf b/ssh_config.conf new file mode 100644 index 0000000..01d3196 Binary files /dev/null and b/ssh_config.conf differ -- cgit v1.2.3 From 6cba09e456c39a74a6e1d0cc4a00f80c79de98f1 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 28 Dec 2018 21:36:09 -0200 Subject: Add fireplace additional Spacemacs package. --- spacemacs.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spacemacs.el b/spacemacs.el index e15981b..c28ddf0 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -106,6 +106,7 @@ This function should only modify configuration layer settings." dotspacemacs-additional-packages '(paredit interleave debbugs + fireplace ;; emacs-guix ) ;; A list of packages that cannot be updated. @@ -757,7 +758,7 @@ This function is called at the very end of Spacemacs initialization." ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (writeroom-mode visual-fill-column yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell)))) + (fireplace writeroom-mode visual-fill-column yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. -- cgit v1.2.3 From b89385e035b0fe55edb9afc05496a639d5c4664e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 28 Dec 2018 21:38:11 -0200 Subject: Add cp-todos.sh. --- scripts/cp-todos.sh | 1 + 1 file changed, 1 insertion(+) create mode 100755 scripts/cp-todos.sh diff --git a/scripts/cp-todos.sh b/scripts/cp-todos.sh new file mode 100755 index 0000000..4ec8962 --- /dev/null +++ b/scripts/cp-todos.sh @@ -0,0 +1 @@ +cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/Notes/org.txt" -- cgit v1.2.3 From 5fb50dc53a1bfdcda9083d1121709bdfde5d8eb9 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 06:27:07 -0200 Subject: Add cp-todos.sh cronJob. --- nixos/configuration.nix | 8 +++++++- scripts/cp-todos.sh | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 36e2cb1..ba0054f 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -311,7 +311,13 @@ services = { cron.enable = true; # We can see the actual generated crontab at /etc/crontab - cron.systemCronJobs = ["0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh -s"]; + cron.systemCronJobs = [ + # Sync emails with mbsync every hour + "0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh -s" + + # Make read-only copy of TODOs.org every hour + "0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/cp-todos.sh -s" + ]; xserver = { enable = true; diff --git a/scripts/cp-todos.sh b/scripts/cp-todos.sh index 4ec8962..5ec5a0f 100755 --- a/scripts/cp-todos.sh +++ b/scripts/cp-todos.sh @@ -1 +1,2 @@ cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/Notes/org.txt" +cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/cache/TODOs.org" -- cgit v1.2.3 From 6ce89ab1bab8e5e356d3750b5adef38ae17956fe Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 06:28:44 -0200 Subject: Add android_sdk_accept_license Nix configuration. --- nixos/configuration.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index ba0054f..a662943 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -299,7 +299,11 @@ chromium ]; - nixpkgs.config.allowUnfree = true; # Require for slack (unfree) derivation + nixpkgs.config = { + android_sdk.accept_license = true; + allowUnfree = true; # Require for slack (unfree) derivation + }; + # Look at # https://www.vivaolinux.com.br/topico/Off-Code-Cafe/Me-apresente-sua-distro -- cgit v1.2.3 From 4cddd5ae3bbfa21ba3b80b08831efe81a34a7dc0 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 17:24:54 -0200 Subject: Comment removed autotime tests. --- bash/tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/tests.sh b/bash/tests.sh index 1fdfd79..6941614 100644 --- a/bash/tests.sh +++ b/bash/tests.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -autotime test > /dev/null +# autotime test > /dev/null -- cgit v1.2.3 From 3957ed0e16c3a2f224b7dc74dc5476ce188fe2de Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 17:26:12 -0200 Subject: Add website executable to $PATH. --- bash/env.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bash/env.sh b/bash/env.sh index a2e4785..8ac8a25 100644 --- a/bash/env.sh +++ b/bash/env.sh @@ -34,6 +34,7 @@ export PATH="$DOTFILES/scripts/:$PATH" export PATH="$DOTFILES/encrypted/scripts/:$PATH" export INPUTRC=~/.inputrc export CACHE_DIR="~/Nextcloud/cache" +export PATH="$HOME/dev/libre/website/:$PATH" -- cgit v1.2.3 From b91e79d3a4c8b5a8737aa3828d2ef3e97d35cdbb Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 17:26:32 -0200 Subject: Add vi tmp files to global gitignore. --- git/gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git/gitignore b/git/gitignore index 371fd16..12daa17 100644 --- a/git/gitignore +++ b/git/gitignore @@ -1,3 +1,4 @@ playground.clj req.http -.postman-ns \ No newline at end of file +.postman-ns +*.swp \ No newline at end of file -- cgit v1.2.3 From f939de99759d03609cfddfefd23720095478f35f Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 17:26:42 -0200 Subject: Explicitly add Perl as an OS dependency. --- nixos/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index a662943..a0fcd01 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -235,6 +235,7 @@ rakudo bats ledger + perl ## Containers and VMs -- cgit v1.2.3 From 5da03439de70f1441c19d7354bec204783805654 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 17:26:54 -0200 Subject: Add =slugify= command. --- nixos/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index a0fcd01..85de39c 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -178,6 +178,7 @@ ncdu fd nnn + python36Packages.python-slugify diffoscope # poppler_utils # used by diffoscope for comparing PDF files -- cgit v1.2.3 From 73e02164cc78eca1b6e52aa4802972d681bab439 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 18:05:14 -0200 Subject: Set Perl indentation to 2 spaces. --- nixos/configuration.nix | 1 + spacemacs.el | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 85de39c..c7de036 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -170,6 +170,7 @@ gitlab-runner sshpass zathura # for viewing Emacs PDF files + nvi cacert gtypist pandoc diff --git a/spacemacs.el b/spacemacs.el index c28ddf0..d8493b2 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -689,6 +689,7 @@ This is the place where most of your configurations should be done. Unless it is sh-basic-offset 2 sh-indentation 2 smie-indent-basic 2 + perl-indent-level 2 ;; Clojure cljr-warn-on-eval nil -- cgit v1.2.3 From 0714b19150de94debcfa94211e9d08cfdf02d8d7 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 18:19:20 -0200 Subject: Make scripts/startx executable. --- scripts/startx | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/startx diff --git a/scripts/startx b/scripts/startx old mode 100644 new mode 100755 -- cgit v1.2.3 From aa5ef73235823c1e91195cec0905a45424af95b2 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 19:33:21 -0200 Subject: Generate .build.yml files on fake-symlinks. --- bash/fake-symlinks.sh | 8 ++++++++ templates/sr-ht-build.yaml | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 templates/sr-ht-build.yaml diff --git a/bash/fake-symlinks.sh b/bash/fake-symlinks.sh index b61e798..9361354 100644 --- a/bash/fake-symlinks.sh +++ b/bash/fake-symlinks.sh @@ -10,3 +10,11 @@ for repo in ${repos[@]}; do cp "$DOTFILES/git/gitlab-ci.yml" "$DOTFILES/../$repo/.gitlab-ci.yml" cp "$DOTFILES/git/default.nix" "$DOTFILES/../$repo/default.nix" done + + +SRHT_REPOS=("website" "mentat" "cement" "pouchdb-materialized-view") +SRHT_REPOS_PATH="$HOME/dev/libre" + +for repo in ${SRHT_REPOS[@]}; do + cat $DOTFILES/templates/sr-ht-build.yaml | REPO="$repo" envsubst > "$SRHT_REPOS_PATH/$repo/.build.yml" +done diff --git a/templates/sr-ht-build.yaml b/templates/sr-ht-build.yaml new file mode 100644 index 0000000..8c55df6 --- /dev/null +++ b/templates/sr-ht-build.yaml @@ -0,0 +1,23 @@ +image: debian/stretch +packages: + - curl +triggers: + - condition: failure + action: email + to: EuAndreh +sources: + - https://git.sr.ht/~euandreh/$REPO +secrets: + - 7159f943-811f-402d-bb6d-37cd764dc728 +tasks: + - setup: | + curl https://nixos.org/nix/install | sh + echo '. ~/.nix-profile/etc/profile.d/nix.sh' >> ~/.buildenv + - tests: | + cd $REPO/ + nix-build -A test + - docs: | + cd $REPO/ + nix-build -A publishScript + source env.sh + ./result/bin/publish.sh -- cgit v1.2.3 From 2b71ececcdac6e0d659309636da2b07aa768e69e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 19:33:38 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 11901 -> 11973 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index f120008..284dc59 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From 633d152b776b1311e749ca387a0aed4ae9d12e9e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 29 Dec 2018 19:33:46 -0200 Subject: Enable color to =watch= alias. --- bash/aliases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/aliases.sh b/bash/aliases.sh index fef53cc..4f97cfa 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -17,7 +17,7 @@ alias trim="tr -d '\n'" alias lower="tr [:upper:] [:lower:]" alias pia-vpn="sudo openvpn --config $DOTFILES/VPN/euandreh.ovpn" # Source: https://unix.stackexchange.com/questions/25327/watch-command-alias-expansion#25329 -alias watch="watch " +alias watch="watch --color " alias mr="mr -s" alias sbcl="rlwrap sbcl" alias du="ncdu --color dark" -- cgit v1.2.3 From e611d1019db163c35daa0b8ee2021943313f55d9 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 30 Dec 2018 15:02:30 -0200 Subject: Add pires repo to fake-symlinks.sh list. --- bash/fake-symlinks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/fake-symlinks.sh b/bash/fake-symlinks.sh index 9361354..687395a 100644 --- a/bash/fake-symlinks.sh +++ b/bash/fake-symlinks.sh @@ -12,7 +12,7 @@ for repo in ${repos[@]}; do done -SRHT_REPOS=("website" "mentat" "cement" "pouchdb-materialized-view") +SRHT_REPOS=("website" "mentat" "cement" "pouchdb-materialized-view" "pires") SRHT_REPOS_PATH="$HOME/dev/libre" for repo in ${SRHT_REPOS[@]}; do -- cgit v1.2.3 From 732b265063bdbeca9ad00cec4ad3a61f74412641 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 30 Dec 2018 15:02:54 -0200 Subject: Install vipe, bazel and graphviz packages. --- nixos/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index c7de036..125d452 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -180,6 +180,9 @@ fd nnn python36Packages.python-slugify + moreutils # =vipe= + bazel + graphviz # =dot= and others diffoscope # poppler_utils # used by diffoscope for comparing PDF files -- cgit v1.2.3 From 6b3fc22c1e84f86abdc9ee64865152526d818db0 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 30 Dec 2018 15:59:03 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 11973 -> 11938 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index 284dc59..75de085 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From 78195626c1d601eb9fb4e6f37992887f15454763 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 30 Dec 2018 22:36:43 -0200 Subject: Add shellcheck, github-backup and node2nix packages. --- nixos/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 125d452..657c37b 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -242,6 +242,9 @@ ledger perl + nodePackages.node2nix + shellcheck + (haskell.lib.justStaticExecutables haskellPackages.github-backup) ## Containers and VMs -- cgit v1.2.3 From 67e642010bebd95b133592fc81637360d8fae0f0 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 30 Dec 2018 22:37:39 -0200 Subject: Start playing with Dhall to generate yaml. --- dhall/dhall-gen.sh | 7 +++++++ dhall/repos.txt | 1 + dhall/sr-ht-build.dhall | 47 +++++++++++++++++++++++++++++++++++++++++++++++ nixos/configuration.nix | 3 ++- scripts/dhall-gen.sh | 1 + 5 files changed, 58 insertions(+), 1 deletion(-) create mode 100755 dhall/dhall-gen.sh create mode 100644 dhall/repos.txt create mode 100644 dhall/sr-ht-build.dhall create mode 120000 scripts/dhall-gen.sh diff --git a/dhall/dhall-gen.sh b/dhall/dhall-gen.sh new file mode 100755 index 0000000..9bba429 --- /dev/null +++ b/dhall/dhall-gen.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +REPOS_PATH="$HOME/dev/libre" + +for repo in $(cat repos.txt); do + dhall 2> /dev/null <<< "./sr-ht-build.dhall \"$repo\"" | dhall-to-json --pretty > "$REPOS_PATH/$repo/.build.yml" +done diff --git a/dhall/repos.txt b/dhall/repos.txt new file mode 100644 index 0000000..0154e4c --- /dev/null +++ b/dhall/repos.txt @@ -0,0 +1 @@ +website diff --git a/dhall/sr-ht-build.dhall b/dhall/sr-ht-build.dhall new file mode 100644 index 0000000..41b937b --- /dev/null +++ b/dhall/sr-ht-build.dhall @@ -0,0 +1,47 @@ +-- let buildTemplate = + λ ( repoName + : Text + ) + → { image = + "debian/stretch" + , packages = + [ "curl" ] + , triggers = + [ { condition = + "failure" + , action = + "email" + , to = + "EuAndreh " + } + ] + , sources = + [ "https://git.sr.ht/~euandreh/" ++ repoName ] + , secrets = + [ "7159f943-811f-402d-bb6d-37cd764dc728" ] + , tasks = + [ { mapKey = + "setup" + , mapValue = + '' + curl https://nixos.org/nix/install | sh + echo '. $HOME/.nix-profile/etc/profile.d/nix.sh' >> $HOME/.buildenv'' + }, + { mapKey = + "test" + , mapValue = + '' + cd ${repoName}/ + nix-build -A test'' + }, + { mapKey = + "publish" + , mapValue = + '' + cd ${repoName}/ + nix-build -A publishScript + source env.sh + ./result/bin/publish.sh'' + } + ] + } diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 657c37b..cfa4b02 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -241,7 +241,8 @@ bats ledger perl - + dhall + dhall-json nodePackages.node2nix shellcheck (haskell.lib.justStaticExecutables haskellPackages.github-backup) diff --git a/scripts/dhall-gen.sh b/scripts/dhall-gen.sh new file mode 120000 index 0000000..75b8290 --- /dev/null +++ b/scripts/dhall-gen.sh @@ -0,0 +1 @@ +../dhall/dhall-gen.sh \ No newline at end of file -- cgit v1.2.3 From ff4b73411dba6097b18266de204587279307be23 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 1 Jan 2019 17:36:26 -0200 Subject: Run shellcheck tests in srht builds. --- .build.yml | 18 ++++++++++++++++++ .gitignore | 1 + default.nix | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 .build.yml create mode 100644 default.nix diff --git a/.build.yml b/.build.yml new file mode 100644 index 0000000..33e6627 --- /dev/null +++ b/.build.yml @@ -0,0 +1,18 @@ +image: debian/stretch +packages: + - curl +triggers: + - condition: failure + action: email + to: EuAndreh +sources: + - https://git.sr.ht/~euandreh/dotfiles +secrets: + - 7159f943-811f-402d-bb6d-37cd764dc728 +tasks: + - setup: | + curl https://nixos.org/nix/install | sh + echo '. ~/.nix-profile/etc/profile.d/nix.sh' >> ~/.buildenv + - tests: | + cd dotfiles/ + nix-build -A test diff --git a/.gitignore b/.gitignore index 01e9f4e..e671f1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ mail/offlineimap.pyc tam_required +/result diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..8481db4 --- /dev/null +++ b/default.nix @@ -0,0 +1,32 @@ +let + pkgs = import {}; +in with pkgs; with pkgs.stdenv; rec { + subtasks = rec { + shellcheck = mkDerivation rec { + name = "dotfiles-shellcheck"; + src = ./.; + phases = "unpackPhase buildPhase"; + buildInputs = [ pkgs.shellcheck ]; + buildPhase = '' + find . -type f -name '*.sh' | xargs shellcheck + touch $out + ''; + }; + }; + test = mkDerivation rec { + name = "dotfiles-test"; + src = ./.; + phases = "unpackPhase buildPhase"; + buildInputs = [ + subtasks.shellcheck + ]; + buildPhase = '' + echo "Ran tests for:" + for d in ${builtins.toString buildInputs}; do + echo " $d" + done + echo "All tests passed!" + touch $out + ''; + }; +} -- cgit v1.2.3 From 349b888f365e83008c7a3401d13d67262cd6a2ad Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 1 Jan 2019 17:37:00 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 11938 -> 11998 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index 75de085..bac3414 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From 4e8c39da58d078167a0a1bc88c4f9248b76e8fed Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 1 Jan 2019 17:37:27 -0200 Subject: Lint some bash files with shellcheck. --- bash/agents.sh | 7 +++++-- bash/aliases.sh | 12 +++++------- bash/fake-symlinks.sh | 15 +++++++-------- bash/youtube.sh | 14 ++++++++------ templates/env.sh | 6 ++++++ 5 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 templates/env.sh diff --git a/bash/agents.sh b/bash/agents.sh index 7ce1fef..5dec196 100644 --- a/bash/agents.sh +++ b/bash/agents.sh @@ -2,7 +2,8 @@ eval "$(thefuck --alias f)" -export GPG_TTY=$(tty) +GPG_TTY=$(tty) +export GPG_TTY export SSH_ENV="$HOME/.ssh/environment" start_agent() { @@ -10,13 +11,15 @@ start_agent() { ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}" echo succeeded chmod 600 "${SSH_ENV}" + # shellcheck source=/dev/null . "${SSH_ENV}" > /dev/null ssh-add } [ -f "${SSH_ENV}" ] && { + # shellcheck source=/dev/null . "${SSH_ENV}" > /dev/null - ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || { + pgrep ^ssh-agent$ > /dev/null || { start_agent } } || start_agent diff --git a/bash/aliases.sh b/bash/aliases.sh index 4f97cfa..403709c 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -30,14 +30,12 @@ alias fim="play $DOTFILES/bash/Positive.ogg &> /dev/null" alias mux="tmuxinator" -isLinux && { - ,u() { - cd ~/annex; - git annex info --fast | grep available; - cd - > /dev/null; - } - export -f ,u +u() { + pushd ~/annex > /dev/null; + git annex info --fast | grep available; + popd > /dev/null; } +export -f u MY_PS1="$PS1" ps1() { diff --git a/bash/fake-symlinks.sh b/bash/fake-symlinks.sh index 687395a..336f0c5 100644 --- a/bash/fake-symlinks.sh +++ b/bash/fake-symlinks.sh @@ -4,17 +4,16 @@ if [[ -n "$GITHUB_TOKEN" ]]; then cat $DOTFILES/git/gitconfig.ini | envsubst > ~/.gitconfig fi -repos=("org.euandreh.misc" "org.euandreh.http") -for repo in ${repos[@]}; do - cp "$DOTFILES/git/gitlab-ci.yml" "$DOTFILES/../$repo/.gitlab-ci.yml" - cp "$DOTFILES/git/default.nix" "$DOTFILES/../$repo/default.nix" -done - - -SRHT_REPOS=("website" "mentat" "cement" "pouchdb-materialized-view" "pires") +SRHT_REPOS=("website" "mentat" "cement" "pouchdb-materialized-view" "pires" "superlogin" "superlogin-client") SRHT_REPOS_PATH="$HOME/dev/libre" for repo in ${SRHT_REPOS[@]}; do cat $DOTFILES/templates/sr-ht-build.yaml | REPO="$repo" envsubst > "$SRHT_REPOS_PATH/$repo/.build.yml" done + +for repo in ${SRHT_REPOS[@]}; do + if [[ "$repo" != "website" ]]; then + cat "$DOTFILES/templates/env.sh" | REPO="$repo" envsubst > "$SRHT_REPOS_PATH/$repo/env.sh" + fi +done diff --git a/bash/youtube.sh b/bash/youtube.sh index 6ffb2da..c40e0a7 100644 --- a/bash/youtube.sh +++ b/bash/youtube.sh @@ -14,7 +14,7 @@ download() { youtube-dl "$1" \ --download-archive ~/Nextcloud/cache/youtube-dl-seen.conf \ --prefer-free-formats \ - --playlist-end $2 \ + --playlist-end "$2" \ --write-description \ --output "$YT_TEMPLATE" } @@ -22,19 +22,19 @@ export -f download download_user() { - download "https://www.youtube.com/user/$1" ${2-$DEFAULT_PLAYLIST_END} + download "https://www.youtube.com/user/$1" "${2-$DEFAULT_PLAYLIST_END}" } export -f download_user download_channel() { - download "https://www.youtube.com/channel/$1" ${2-$DEFAULT_PLAYLIST_END} + download "https://www.youtube.com/channel/$1" "${2-$DEFAULT_PLAYLIST_END}" } export -f download_channel download_playlist() { - download "https://www.youtube.com/playlist?list=$1" ${2-$DEFAULT_PLAYLIST_END} + download "https://www.youtube.com/playlist?list=$1" "${2-$DEFAULT_PLAYLIST_END}" } export -f download_playlist @@ -46,8 +46,10 @@ inc_download() { local file="$HOME/.yt-db/$id" mkdir -p "$HOME/.yt-db" - local n_count="$(cat $file 2> /dev/null || printf 10)" - local n_count_new="$(($n_count + $step))" + n_count="$(cat "$file" 2> /dev/null || printf 10)" + local n_count + n_count_new="$((n_count + step))" + local n_count_new echo "$n_count_new" > "$file" diff --git a/templates/env.sh b/templates/env.sh new file mode 100644 index 0000000..4ff21f2 --- /dev/null +++ b/templates/env.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +export SERVER_URL=root@euandre.org +export DOCS_SERVER_PATH="/home/user-data/www/default/$REPO/" -- cgit v1.2.3 From ee75e6be5a958370c9a0f61589d5e35df78ecadc Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 2 Jan 2019 11:54:02 -0200 Subject: Enable followTags in gitconfig. --- git/gitconfig.ini | Bin 2122 -> 2142 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/gitconfig.ini b/git/gitconfig.ini index 879e156..2c06b8a 100644 Binary files a/git/gitconfig.ini and b/git/gitconfig.ini differ -- cgit v1.2.3 From cb04b68de762a75ce666943da29db6c4cdca5ee4 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 2 Jan 2019 11:54:17 -0200 Subject: Enable forward searches in bash. --- bash/config.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bash/config.sh b/bash/config.sh index ac9f7c2..37a4806 100644 --- a/bash/config.sh +++ b/bash/config.sh @@ -30,3 +30,5 @@ shopt -s checkwinsize isLinux && { shopt -s globstar } + +stty -ixon -- cgit v1.2.3 From fb9f7c38a140a7f0549f94b9f0370b6d87eb1430 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 2 Jan 2019 15:41:53 -0200 Subject: Add custom nu gitconfig options in nugitconfig.ini file. --- bash/symlinks.sh | 1 + encrypted/nugitconfig.ini | Bin 0 -> 85 bytes git/gitconfig.ini | Bin 2142 -> 2198 bytes 3 files changed, 1 insertion(+) create mode 100644 encrypted/nugitconfig.ini diff --git a/bash/symlinks.sh b/bash/symlinks.sh index 6425557..39d0a0b 100644 --- a/bash/symlinks.sh +++ b/bash/symlinks.sh @@ -16,6 +16,7 @@ ln -fs $DOTFILES/bash/bash_profile.sh ~/.bash_profile ln -fs $DOTFILES/git/gitattributes ~/.gitattributes ln -fs $DOTFILES/git/gitignore ~/.gitignore_global ln -fs $DOTFILES/git/bash_git.sh ~/.bash_git +ln -fs $DOTFILES/encrypted/nugitconfig.ini ~/.nugitconfig ln -fs $DOTFILES/sbclrc.lisp ~/.sbclrc ln -fs $DOTFILES/inputrc.conf ~/.inputrc ln -fs $DOTFILES/Xmodmap.conf ~/.Xmodmap diff --git a/encrypted/nugitconfig.ini b/encrypted/nugitconfig.ini new file mode 100644 index 0000000..53b0b86 Binary files /dev/null and b/encrypted/nugitconfig.ini differ diff --git a/git/gitconfig.ini b/git/gitconfig.ini index 2c06b8a..df83354 100644 Binary files a/git/gitconfig.ini and b/git/gitconfig.ini differ -- cgit v1.2.3 From b679e7d91f7af2d97bead966a17b715cdb020b1a Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 3 Jan 2019 06:12:39 -0200 Subject: Fix shellcheck ofsenses on bash scripts. --- bash/agents.sh | 3 +- bash/aliases.sh | 13 ++++--- bash/bash_profile.sh | 2 + bash/bashrc.sh | 5 ++- bash/colors.sh | 3 +- bash/env.sh | 2 +- bash/facepalm/rotten-apple.sh | 4 +- bash/fake-symlinks.sh | 26 ++++++++++--- bash/init.sh | 12 +++--- bash/npm.sh | 4 +- bash/platform.sh | 4 +- bash/symlinks.sh | 80 ++++++++++++++++++++-------------------- bash/tmuxinator-templates.sh | 9 ----- bash/util.sh | 32 ++++++++-------- bash/youtube.sh | 2 +- dhall/dhall-gen.sh | 7 ---- dhall/repos.txt | 1 - dhall/sr-ht-build.dhall | 47 ----------------------- encrypted/env.sh | Bin 3340 -> 3342 bytes encrypted/nu/nurc.sh | Bin 4124 -> 4240 bytes encrypted/scripts/video-feed.sh | Bin 3061 -> 3071 bytes nixos/npmrc.sh | 3 +- scripts/backup.sh | 12 +++--- scripts/cp-todos.sh | 2 + scripts/dhall-gen.sh | 1 - scripts/gc.sh | 12 +++--- scripts/mail.sh | 2 + scripts/once-only-nextcloud.sh | 2 +- scripts/single-monitor.sh | 2 +- scripts/startx | 2 +- scripts/three-monitors.sh | 2 +- templates/sr-ht-build.dhall | 47 +++++++++++++++++++++++ vps/push-receive-redeploy.sh | 4 +- xmonad/xsession.sh | 2 + 34 files changed, 178 insertions(+), 171 deletions(-) delete mode 100755 bash/tmuxinator-templates.sh delete mode 100755 dhall/dhall-gen.sh delete mode 100644 dhall/repos.txt delete mode 100644 dhall/sr-ht-build.dhall delete mode 120000 scripts/dhall-gen.sh create mode 100644 templates/sr-ht-build.dhall diff --git a/bash/agents.sh b/bash/agents.sh index 5dec196..d49757b 100644 --- a/bash/agents.sh +++ b/bash/agents.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# shellcheck disable=SC2015 eval "$(thefuck --alias f)" @@ -11,13 +12,11 @@ start_agent() { ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}" echo succeeded chmod 600 "${SSH_ENV}" - # shellcheck source=/dev/null . "${SSH_ENV}" > /dev/null ssh-add } [ -f "${SSH_ENV}" ] && { - # shellcheck source=/dev/null . "${SSH_ENV}" > /dev/null pgrep ^ssh-agent$ > /dev/null || { start_agent diff --git a/bash/aliases.sh b/bash/aliases.sh index 403709c..52d24b4 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -8,13 +8,14 @@ alias l="ls -lahp" alias ll="ls -lhp" alias yt-dl="yt_dl" isLinux && { - alias copy="tr -d '\n' | xclip -sel clip" + alias copy="tr -d '\\n' | xclip -sel clip" } isMac && { - alias copy="tr -d '\n' | pbcopy" + alias copy="tr -d '\\n' | pbcopy" } -alias trim="tr -d '\n'" -alias lower="tr [:upper:] [:lower:]" +alias trim="tr -d '\\n'" +alias lowercase="tr [:upper:] [:lower:]" +alias lc="tr [:upper:] [:lower:]" alias pia-vpn="sudo openvpn --config $DOTFILES/VPN/euandreh.ovpn" # Source: https://unix.stackexchange.com/questions/25327/watch-command-alias-expansion#25329 alias watch="watch --color " @@ -31,9 +32,9 @@ alias fim="play $DOTFILES/bash/Positive.ogg &> /dev/null" alias mux="tmuxinator" u() { - pushd ~/annex > /dev/null; + pushd ~/annex > /dev/null || exit 1; git annex info --fast | grep available; - popd > /dev/null; + popd > /dev/null || exit 1; } export -f u diff --git a/bash/bash_profile.sh b/bash/bash_profile.sh index 12ce7f9..41bc7e9 100644 --- a/bash/bash_profile.sh +++ b/bash/bash_profile.sh @@ -1 +1,3 @@ +#!/usr/bin/env bash + source ~/annex/dev/code/dotfiles/bash/bashrc.sh diff --git a/bash/bashrc.sh b/bash/bashrc.sh index d06692b..a895df1 100644 --- a/bash/bashrc.sh +++ b/bash/bashrc.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + export DOTFILES=~/annex/dev/code/dotfiles source $DOTFILES/bash/platform.sh @@ -10,7 +12,6 @@ source $DOTFILES/bash/agents.sh source $DOTFILES/bash/init.sh source $DOTFILES/bash/symlinks.sh source $DOTFILES/bash/youtube.sh -source $DOTFILES/bash/tmuxinator-templates.sh source $DOTFILES/bash/facepalm/rotten-apple.sh source $DOTFILES/bash/npm.sh source $DOTFILES/bash/x.sh @@ -28,7 +29,7 @@ export PATH="$HOME/annex/dev/code/songbooks/cli:$PATH" alias sb="songbooks" isLinux && { - source "$(dirname $(readlink $(which autojump)))/../share/autojump/autojump.bash" + source "$(dirname "$(readlink "$(command -v autojump)")")/../share/autojump/autojump.bash" } export PATH="$HOME/.perl6/bin:$PATH" diff --git a/bash/colors.sh b/bash/colors.sh index 90cabc4..68acb06 100644 --- a/bash/colors.sh +++ b/bash/colors.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# shellcheck disable=1117 disable=1004 disable=2034 disable=2154 # Customize BASH PS1 prompt to show current GIT repository and branch. # by Mike Stewart - http://MediaDoneRight.com @@ -208,7 +209,7 @@ function lightblueb { } export -f lightblueb -function ,colors { +function colors { black "black" blackb "blackb" white "white" diff --git a/bash/env.sh b/bash/env.sh index 8ac8a25..5a09663 100644 --- a/bash/env.sh +++ b/bash/env.sh @@ -33,7 +33,7 @@ export EDITOR=vi export PATH="$DOTFILES/scripts/:$PATH" export PATH="$DOTFILES/encrypted/scripts/:$PATH" export INPUTRC=~/.inputrc -export CACHE_DIR="~/Nextcloud/cache" +export CACHE_DIR="$HOME/Nextcloud/cache" export PATH="$HOME/dev/libre/website/:$PATH" diff --git a/bash/facepalm/rotten-apple.sh b/bash/facepalm/rotten-apple.sh index 50d85c8..222a2b0 100644 --- a/bash/facepalm/rotten-apple.sh +++ b/bash/facepalm/rotten-apple.sh @@ -6,8 +6,8 @@ isMac && { alias limpar-derived-data="rm -rf ~/Library/Developer/Xcode/DerivedData/" alias fim="afplay $DOTFILES/bash/facepalm/Positive.mp3" - if [ -f $(brew --prefix)/etc/bash_completion ]; then - . $(brew --prefix)/etc/bash_completion + if [ -f "$(brew --prefix)/etc/bash_completion" ]; then + . "$(brew --prefix)/etc/bash_completion" fi [ -f /usr/local/etc/bash_completion ] && . /usr/local/etc/bash_completion diff --git a/bash/fake-symlinks.sh b/bash/fake-symlinks.sh index 336f0c5..3927b0c 100644 --- a/bash/fake-symlinks.sh +++ b/bash/fake-symlinks.sh @@ -1,19 +1,33 @@ #!/usr/bin/env bash if [[ -n "$GITHUB_TOKEN" ]]; then - cat $DOTFILES/git/gitconfig.ini | envsubst > ~/.gitconfig + envsubst < "$DOTFILES/git/gitconfig.ini" > ~/.gitconfig fi -SRHT_REPOS=("website" "mentat" "cement" "pouchdb-materialized-view" "pires" "superlogin" "superlogin-client") +SRHT_REPOS=(website mentat cement pouchdb-materialized-view pires superlogin superlogin-client) SRHT_REPOS_PATH="$HOME/dev/libre" -for repo in ${SRHT_REPOS[@]}; do - cat $DOTFILES/templates/sr-ht-build.yaml | REPO="$repo" envsubst > "$SRHT_REPOS_PATH/$repo/.build.yml" +for repo in "${SRHT_REPOS[@]}"; do + REPO="$repo" envsubst < "$DOTFILES/templates/sr-ht-build.yaml" > "$SRHT_REPOS_PATH/$repo/.build.yml" done -for repo in ${SRHT_REPOS[@]}; do +for repo in "${SRHT_REPOS[@]}"; do if [[ "$repo" != "website" ]]; then - cat "$DOTFILES/templates/env.sh" | REPO="$repo" envsubst > "$SRHT_REPOS_PATH/$repo/env.sh" + REPO="$repo" envsubst < "$DOTFILES/templates/env.sh" > "$SRHT_REPOS_PATH/$repo/env.sh" fi done + +mkdir -p ~/.tmuxinator + +TMUXINATOR_TEMPLATES=(annex pires songbooks sosps) + +for template in "${TMUXINATOR_TEMPLATES[@]}"; do + cp "$DOTFILES/tmux/projects/$template.yml" "$HOME/.tmuxinator/$template.yml" +done + +# DHALL_BUILD_REPOS=(website) + +# for repo in "${DHALL_BUILD_REPOS[@]}"; do +# dhall 2> /dev/null <<< "./sr-ht-build.dhall \"$repo\"" | dhall-to-json --pretty > "$SRHT_REPOS_PATH/$repo/.build.yml" +# done diff --git a/bash/init.sh b/bash/init.sh index 777a322..4e0ee65 100644 --- a/bash/init.sh +++ b/bash/init.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash locked_init() { - pushd ~/ > /dev/null + pushd ~/ > /dev/null || exit 1 mkdir -p ~/.emacs.d/.cache/ - mkdir -p $(dirname "$AUTOJUMP_TXT") + mkdir -p "$(dirname "$AUTOJUMP_TXT")" touch "$AUTOJUMP_TXT" # clone all missing repos @@ -13,12 +13,12 @@ locked_init() { printf "" > /tmp/mr-repos mr inject > /dev/null - printf "(\n" > /tmp/mr-projectile + printf "(\\n" > /tmp/mr-projectile sed -E 's/\/home\/andreh/~/' /tmp/mr-repos | awk '{print "\""$1"/""\""}' >> /tmp/mr-projectile printf ")" >> /tmp/mr-projectile cp /tmp/mr-projectile ~/.emacs.d/.cache/projectile-bookmarks.eld - popd > /dev/null + popd > /dev/null || exit 1 } export -f locked_init @@ -32,7 +32,7 @@ export -f locked_init # Tests -pushd $DOTFILES > /dev/null +pushd "$DOTFILES" > /dev/null || exit 1 sizes=$(git diff-files --ignore-submodules | awk '{print $6}' | xargs du | awk '{print $1}') for size in $sizes; do @@ -42,4 +42,4 @@ for size in $sizes; do fi done -popd > /dev/null +popd > /dev/null || exit 1 diff --git a/bash/npm.sh b/bash/npm.sh index c23c074..7fbe4f7 100644 --- a/bash/npm.sh +++ b/bash/npm.sh @@ -2,9 +2,9 @@ # FIXME: port to NixOS npm_i() { - (which $1 &> /dev/null) || { + (command -v "$1" &> /dev/null) || { yellow "Installing $2" - npm i -g $2 + npm i -g "$2" } } diff --git a/bash/platform.sh b/bash/platform.sh index efa5061..eb262e9 100644 --- a/bash/platform.sh +++ b/bash/platform.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash isMac () { - [[ `uname` == 'Darwin' ]] + [[ "$(uname)" == 'Darwin' ]] } isLinux () { - [[ `uname` == 'Linux' ]] + [[ "$(uname)" == 'Linux' ]] } isMac && { diff --git a/bash/symlinks.sh b/bash/symlinks.sh index 39d0a0b..e56ee58 100644 --- a/bash/symlinks.sh +++ b/bash/symlinks.sh @@ -1,77 +1,77 @@ #!/usr/bin/env bash function upsert_dir_symlink() { - local readonly from="$1" - local readonly to="$2" - ([ -d "$to" ] || [ -L "$to" ]) || { + local from="$1" + local to="$2" + { [ -d "$to" ] || [ -L "$to" ]; } || { ln -s "$from" "$to" } } export -f upsert_dir_symlink -upsert_dir_symlink $DOTFILES/encrypted/borg ~/.config/borg +upsert_dir_symlink "$DOTFILES/encrypted/borg" ~/.config/borg -ln -fs $DOTFILES/bash/bashrc.sh ~/.bashrc -ln -fs $DOTFILES/bash/bash_profile.sh ~/.bash_profile -ln -fs $DOTFILES/git/gitattributes ~/.gitattributes -ln -fs $DOTFILES/git/gitignore ~/.gitignore_global -ln -fs $DOTFILES/git/bash_git.sh ~/.bash_git -ln -fs $DOTFILES/encrypted/nugitconfig.ini ~/.nugitconfig -ln -fs $DOTFILES/sbclrc.lisp ~/.sbclrc -ln -fs $DOTFILES/inputrc.conf ~/.inputrc -ln -fs $DOTFILES/Xmodmap.conf ~/.Xmodmap +ln -fs "$DOTFILES/bash/bashrc.sh" ~/.bashrc +ln -fs "$DOTFILES/bash/bash_profile.sh" ~/.bash_profile +ln -fs "$DOTFILES/git/gitattributes" ~/.gitattributes +ln -fs "$DOTFILES/git/gitignore" ~/.gitignore_global +ln -fs "$DOTFILES/git/bash_git.sh" ~/.bash_git +ln -fs "$DOTFILES/encrypted/nugitconfig.ini" ~/.nugitconfig +ln -fs "$DOTFILES/sbclrc.lisp" ~/.sbclrc +ln -fs "$DOTFILES/inputrc.conf" ~/.inputrc +ln -fs "$DOTFILES/Xmodmap.conf" ~/.Xmodmap isLinux && { - ln -fs $DOTFILES/nixos/npmrc.sh ~/.npmrc + ln -fs "$DOTFILES/nixos/npmrc.sh" ~/.npmrc } ## SSH config mkdir -p ~/.ssh -ln -fs $DOTFILES/ssh_config.conf ~/.ssh/config +ln -fs "$DOTFILES/ssh_config.conf" ~/.ssh/config -ln -fs $DOTFILES/git/mrconfig.ini ~/.mrconfig +ln -fs "$DOTFILES/git/mrconfig.ini" ~/.mrconfig -upsert_dir_symlink $MEDIA_PREFIX/UTCLOUD ~/UTCLOUD -upsert_dir_symlink $MEDIA_PREFIX/SNEAKER ~/SNEAKER +upsert_dir_symlink "$MEDIA_PREFIX/UTCLOUD" ~/UTCLOUD +upsert_dir_symlink "$MEDIA_PREFIX/SNEAKER" ~/SNEAKER ## Clojure mkdir -p ~/.lein ~/.clojure -ln -fs $DOTFILES/lein/profiles.clj ~/.lein/profiles.clj -ln -fs $DOTFILES/lein/deps.edn ~/.clojure/deps.edn +ln -fs "$DOTFILES/lein/profiles.clj" ~/.lein/profiles.clj +ln -fs "$DOTFILES/lein/deps.edn" ~/.clojure/deps.edn ## AWS mkdir -p ~/.aws -ln -fs $DOTFILES/encrypted/aws/config ~/.aws/config -ln -fs $DOTFILES/encrypted/aws/credentials ~/.aws/credentials +ln -fs "$DOTFILES/encrypted/aws/config" ~/.aws/config +ln -fs "$DOTFILES/encrypted/aws/credentials" ~/.aws/credentials ## tmux -ln -fs $DOTFILES/tmux/tmux.conf ~/.tmux.conf -ln -fs $DOTFILES/tmux/tmux-macos.conf ~/.tmux-macos.conf -ln -fs $DOTFILES/tmux/tmux-gnu-linux.conf ~/.tmux-gnu-linux.conf +ln -fs "$DOTFILES/tmux/tmux.conf" ~/.tmux.conf +ln -fs "$DOTFILES/tmux/tmux-macos.conf" ~/.tmux-macos.conf +ln -fs "$DOTFILES/tmux/tmux-gnu-linux.conf" ~/.tmux-gnu-linux.conf ## NixOS -ln -fs $DOTFILES/nixos/evince.destkop ~/.local/share/applications/evince.desktop -ln -fs $DOTFILES/nixos/firefox.destkop ~/.local/share/applications/firefox.desktop +ln -fs "$DOTFILES/nixos/evince.destkop" ~/.local/share/applications/evince.desktop +ln -fs "$DOTFILES/nixos/firefox.destkop" ~/.local/share/applications/firefox.desktop ## Emacs -mkdir -p $HOME/.emacs.d/private/layers/ -ln -fs $DOTFILES/spacemacs.el ~/.spacemacs -ln -fs $DOTFILES/emacs/gnus.el ~/.gnus.el -ln -fs $CACHE_DIR/euandreh-auto-save.el ~/.emacs.d/.cache/layouts/euandreh-auto-save +mkdir -p "$HOME/.emacs.d/private/layers/" +ln -fs "$DOTFILES/spacemacs.el" ~/.spacemacs +ln -fs "$DOTFILES/emacs/gnus.el" ~/.gnus.el +ln -fs "$CACHE_DIR/euandreh-auto-save.el" ~/.emacs.d/.cache/layouts/euandreh-auto-save ## xmonad mkdir -p ~/.xmonad -ln -fs $DOTFILES/xmonad/xsession.sh ~/.xsession -ln -fs $DOTFILES/xmonad/xmonad.hs ~/.xmonad/xmonad.hs -ln -fs $DOTFILES/xmonad/xmobar.hs ~/.xmobarrc +ln -fs "$DOTFILES/xmonad/xsession.sh" ~/.xsession +ln -fs "$DOTFILES/xmonad/xmonad.hs" ~/.xmonad/xmonad.hs +ln -fs "$DOTFILES/xmonad/xmobar.hs" ~/.xmobarrc ## Mail mkdir -p ~/mbsync/.notmuch/hooks ~/mbsync/EuAndreh ~/mbsync/Gmail ~/mbsync/Nubank -ln -fs $DOTFILES/mail/notmuch-post.sh ~/mbsync/.notmuch/hooks/post-new -ln -fs $DOTFILES/mail/mbsyncrc.ini ~/.mbsyncrc -ln -fs $DOTFILES/mail/notmuch.ini ~/.notmuch-config -ln -fs /tmp/mbsync.$(date +%Y-%m-%d).log /tmp/mbsync.log -ln -fs /tmp/notmuch.$(date +%Y-%m-%d).log /tmp/notmuch.log +ln -fs "$DOTFILES/mail/notmuch-post.sh" ~/mbsync/.notmuch/hooks/post-new +ln -fs "$DOTFILES/mail/mbsyncrc.ini" ~/.mbsyncrc +ln -fs "$DOTFILES/mail/notmuch.ini" ~/.notmuch-config +ln -fs /tmp/mbsync."$(date +%Y-%m-%d)".log /tmp/mbsync.log +ln -fs /tmp/notmuch."$(date +%Y-%m-%d)".log /tmp/notmuch.log ## GNUS -ln -fs $DOTFILES/encrypted/IMAP/authinfo.gpg ~/.authinfo.gpg +ln -fs "$DOTFILES/encrypted/IMAP/authinfo.gpg" ~/.authinfo.gpg diff --git a/bash/tmuxinator-templates.sh b/bash/tmuxinator-templates.sh deleted file mode 100755 index adbbb5c..0000000 --- a/bash/tmuxinator-templates.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -mkdir -p ~/.tmuxinator - -templates=(annex pires songbooks sosps) - -for template in ${templates[@]}; do - cp $DOTFILES/tmux/projects/$template.yml ~/.tmuxinator/$template.yml -done diff --git a/bash/util.sh b/bash/util.sh index 833bc9c..e29d02f 100644 --- a/bash/util.sh +++ b/bash/util.sh @@ -1,20 +1,20 @@ #!/usr/bin/env bash extract () { - if [ -f $1 ] ; then - case $1 in - *.tar.bz2) tar xvjf $1 ;; - *.tar.gz) tar xvzf $1 ;; - *.bz2) bunzip2 $1 ;; - *.rar) unrar x $1 ;; - *.gz) gunzip $1 ;; - *.tar) tar xvf $1 ;; - *.tbz2) tar xvjf $1 ;; - *.tgz) tar xvzf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1 ;; - *.7z) 7z x $1 ;; - *.xz) unxz $1 ;; + if [ -f "$1" ] ; then + case "$1" in + *.tar.bz2) tar xvjf "$1" ;; + *.tar.gz) tar xvzf "$1" ;; + *.bz2) bunzip2 "$1" ;; + *.rar) unrar x "$1" ;; + *.gz) gunzip "$1" ;; + *.tar) tar xvf "$1" ;; + *.tbz2) tar xvjf "$1" ;; + *.tgz) tar xvzf "$1" ;; + *.zip) unzip "$1" ;; + *.Z) uncompress "$1" ;; + *.7z) 7z x "$1" ;; + *.xz) unxz "$1" ;; *) echo "don't know how to extract '$1'..." ;; esac else @@ -24,11 +24,11 @@ extract () { merkle-tree () { dirname="${1-.}" - pushd "$dirname" > /dev/null + pushd "$dirname" > /dev/null || exit 1 find . -type f | \ sort | \ xargs -I{} sha256sum "{}" | \ sha256sum | \ awk '{print $1}' - popd > /dev/null + popd > /dev/null || exit 1 } diff --git a/bash/youtube.sh b/bash/youtube.sh index c40e0a7..19c9af0 100644 --- a/bash/youtube.sh +++ b/bash/youtube.sh @@ -2,7 +2,7 @@ export DEFAULT_PLAYLIST_END=15 export DEFAULT_INC_STEP=10 -export YT_TEMPLATE="~/Downloads/yt-dl/%(uploader)s/%(upload_date)s %(title)s.%(ext)s" +export YT_TEMPLATE="$HOME/Downloads/yt-dl/%(uploader)s/%(upload_date)s %(title)s.%(ext)s" # Always downloads video, doesn't look at the download-archive yt_dl() { diff --git a/dhall/dhall-gen.sh b/dhall/dhall-gen.sh deleted file mode 100755 index 9bba429..0000000 --- a/dhall/dhall-gen.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -REPOS_PATH="$HOME/dev/libre" - -for repo in $(cat repos.txt); do - dhall 2> /dev/null <<< "./sr-ht-build.dhall \"$repo\"" | dhall-to-json --pretty > "$REPOS_PATH/$repo/.build.yml" -done diff --git a/dhall/repos.txt b/dhall/repos.txt deleted file mode 100644 index 0154e4c..0000000 --- a/dhall/repos.txt +++ /dev/null @@ -1 +0,0 @@ -website diff --git a/dhall/sr-ht-build.dhall b/dhall/sr-ht-build.dhall deleted file mode 100644 index 41b937b..0000000 --- a/dhall/sr-ht-build.dhall +++ /dev/null @@ -1,47 +0,0 @@ --- let buildTemplate = - λ ( repoName - : Text - ) - → { image = - "debian/stretch" - , packages = - [ "curl" ] - , triggers = - [ { condition = - "failure" - , action = - "email" - , to = - "EuAndreh " - } - ] - , sources = - [ "https://git.sr.ht/~euandreh/" ++ repoName ] - , secrets = - [ "7159f943-811f-402d-bb6d-37cd764dc728" ] - , tasks = - [ { mapKey = - "setup" - , mapValue = - '' - curl https://nixos.org/nix/install | sh - echo '. $HOME/.nix-profile/etc/profile.d/nix.sh' >> $HOME/.buildenv'' - }, - { mapKey = - "test" - , mapValue = - '' - cd ${repoName}/ - nix-build -A test'' - }, - { mapKey = - "publish" - , mapValue = - '' - cd ${repoName}/ - nix-build -A publishScript - source env.sh - ./result/bin/publish.sh'' - } - ] - } diff --git a/encrypted/env.sh b/encrypted/env.sh index af98c5c..e4ebb21 100644 Binary files a/encrypted/env.sh and b/encrypted/env.sh differ diff --git a/encrypted/nu/nurc.sh b/encrypted/nu/nurc.sh index a8532c2..b92a178 100644 Binary files a/encrypted/nu/nurc.sh and b/encrypted/nu/nurc.sh differ diff --git a/encrypted/scripts/video-feed.sh b/encrypted/scripts/video-feed.sh index 6efa22d..a6e17d9 100755 Binary files a/encrypted/scripts/video-feed.sh and b/encrypted/scripts/video-feed.sh differ diff --git a/nixos/npmrc.sh b/nixos/npmrc.sh index 326ac0b..2669f85 100644 --- a/nixos/npmrc.sh +++ b/nixos/npmrc.sh @@ -1,4 +1,5 @@ -prefix="~/.npm-packages" +# shellcheck disable=2148 disable=2034 +prefix="$HOME/.npm-packages" # Taken from: # http://www.tomsquest.com/blog/2018/10/better-npm-ing/ save-exact=true diff --git a/scripts/backup.sh b/scripts/backup.sh index a33a630..6a4de25 100755 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -6,12 +6,12 @@ # if [ ! -d ~/UTCLOUD/ ]; then - red "~/UTCLOUD not attached. Backup not started." + red "$HOME/UTCLOUD not attached. Backup not started." exit 1 fi if [ ! -d ~/borgbackup/ ]; then - yellow "~/borgbackup/ repository doesn't exist. Downloading latest version from ~/UTCLOUD/borg/borgbackup/ into ~/borgbackup/" + yellow "$HOME/borgbackup/ repository doesn't exist. Downloading latest version from ~/UTCLOUD/borg/borgbackup/ into ~/borgbackup/" # The initial borg repo was created with: # $ borg init --append-only --encryption=keyfile ~/borgbackup # See also: https://borgbackup.readthedocs.io/en/stable/usage/notes.html#append-only-mode @@ -46,7 +46,7 @@ green "Done" # yellow "Backing up git repos" -pushd ~/ +pushd ~/ || exit 1 mr -s master mr -s status @@ -54,13 +54,13 @@ mr -s -j16 update mr -s hd mr -s -j4 rsyncnet -popd +popd || exit 1 yellow "Syncing annex" -pushd ~/annex/ +pushd ~/annex/ || exit 1 git annex sync -popd +popd || exit 1 green "Done" diff --git a/scripts/cp-todos.sh b/scripts/cp-todos.sh index 5ec5a0f..d8e6f30 100755 --- a/scripts/cp-todos.sh +++ b/scripts/cp-todos.sh @@ -1,2 +1,4 @@ +#!/usr/bin/env bash + cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/Notes/org.txt" cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/cache/TODOs.org" diff --git a/scripts/dhall-gen.sh b/scripts/dhall-gen.sh deleted file mode 120000 index 75b8290..0000000 --- a/scripts/dhall-gen.sh +++ /dev/null @@ -1 +0,0 @@ -../dhall/dhall-gen.sh \ No newline at end of file diff --git a/scripts/gc.sh b/scripts/gc.sh index ac1b412..c4d3ec3 100755 --- a/scripts/gc.sh +++ b/scripts/gc.sh @@ -10,8 +10,8 @@ yellow "Cleaning up the NixOS store" profiles=(per-user/root/channels per-user/andreh/profile per-user/andreh/channels system) -for p in ${profiles[@]}; do - sudo nix-env --delete-generations old -p /nix/var/nix/profiles/$p +for p in "${profiles[@]}"; do + sudo nix-env --delete-generations old -p "/nix/var/nix/profiles/$p" done # Current profile, change when installing with =nix-env -iA nixpkgs.bsdgames= @@ -36,11 +36,11 @@ sudo find /tmp -type f -atime +10 -delete yellow "Erasing docker images" echo y | docker system prune -a -docker rmi $(docker images -a -q) -docker rm $(docker ps -a -f status=exited -q) +docker rmi "$(docker images -a -q)" +docker rm "$(docker ps -a -f status=exited -q)" -docker stop $(docker ps -a -q) -docker rm $(docker ps -a -q) +docker stop "$(docker ps -a -q)" +docker rm "$(docker ps -a -q)" echo y | docker volume prune echo y | docker container prune diff --git a/scripts/mail.sh b/scripts/mail.sh index a7c8208..00c111f 100755 --- a/scripts/mail.sh +++ b/scripts/mail.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + if [ "$1" = "-s" ]; then mbsync -aV &>> /tmp/mbsync.log && notmuch new &>> /tmp/notmuch.log else diff --git a/scripts/once-only-nextcloud.sh b/scripts/once-only-nextcloud.sh index 8400080..7886b6f 100755 --- a/scripts/once-only-nextcloud.sh +++ b/scripts/once-only-nextcloud.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash if [ "$(pidof nextcloud)" ] then diff --git a/scripts/single-monitor.sh b/scripts/single-monitor.sh index ec6c5e2..5b0d03e 100755 --- a/scripts/single-monitor.sh +++ b/scripts/single-monitor.sh @@ -1,2 +1,2 @@ -#!/bin/sh +#!/usr/bin/env bash xrandr --output VIRTUAL1 --off --output eDP1 --primary --mode 1920x1080 --pos 640x1440 --rotate normal --output DP1 --off --output HDMI2 --off --output HDMI1 --off --output DP2 --off diff --git a/scripts/startx b/scripts/startx index 9b1d153..cca34a2 100755 --- a/scripts/startx +++ b/scripts/startx @@ -1,3 +1,3 @@ -#!/bin/sh +#!/usr/bin/env bash sudo systemctl restart display-manager & diff --git a/scripts/three-monitors.sh b/scripts/three-monitors.sh index d1ef7c6..d8c4e53 100755 --- a/scripts/three-monitors.sh +++ b/scripts/three-monitors.sh @@ -1,2 +1,2 @@ -#!/bin/sh +#!/usr/bin/env bash xrandr --output VIRTUAL1 --off --output eDP1 --primary --mode 1920x1080 --pos 640x1440 --rotate normal --output DP1 --off --output HDMI2 --off --output HDMI1 --mode 2560x1440 --pos 0x0 --rotate normal --output DP2 --mode 2560x1440 --pos 2560x0 --rotate left diff --git a/templates/sr-ht-build.dhall b/templates/sr-ht-build.dhall new file mode 100644 index 0000000..41b937b --- /dev/null +++ b/templates/sr-ht-build.dhall @@ -0,0 +1,47 @@ +-- let buildTemplate = + λ ( repoName + : Text + ) + → { image = + "debian/stretch" + , packages = + [ "curl" ] + , triggers = + [ { condition = + "failure" + , action = + "email" + , to = + "EuAndreh " + } + ] + , sources = + [ "https://git.sr.ht/~euandreh/" ++ repoName ] + , secrets = + [ "7159f943-811f-402d-bb6d-37cd764dc728" ] + , tasks = + [ { mapKey = + "setup" + , mapValue = + '' + curl https://nixos.org/nix/install | sh + echo '. $HOME/.nix-profile/etc/profile.d/nix.sh' >> $HOME/.buildenv'' + }, + { mapKey = + "test" + , mapValue = + '' + cd ${repoName}/ + nix-build -A test'' + }, + { mapKey = + "publish" + , mapValue = + '' + cd ${repoName}/ + nix-build -A publishScript + source env.sh + ./result/bin/publish.sh'' + } + ] + } diff --git a/vps/push-receive-redeploy.sh b/vps/push-receive-redeploy.sh index 87fecd5..46a65bc 100755 --- a/vps/push-receive-redeploy.sh +++ b/vps/push-receive-redeploy.sh @@ -1,6 +1,6 @@ -#!/bin/sh +#!/usr/bin/env bash -cd ~/ +cd ~/ || exit 1 docker pull registry.gitlab.com/euandreh/songbooks/prod:latest docker-compose stop songbooks_app docker-compose up -d --no-deps songbooks_app diff --git a/xmonad/xsession.sh b/xmonad/xsession.sh index b25a9a1..542994f 100644 --- a/xmonad/xsession.sh +++ b/xmonad/xsession.sh @@ -1 +1,3 @@ +#!/usr/bin/env bash + xmonad -- cgit v1.2.3 From 9be46264e1965ad98627ce5652d771c5a598444a Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 3 Jan 2019 06:43:39 -0200 Subject: Disable 1090, 1091 and 2139 shellcheck rules. --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 8481db4..298d1af 100644 --- a/default.nix +++ b/default.nix @@ -8,7 +8,7 @@ in with pkgs; with pkgs.stdenv; rec { phases = "unpackPhase buildPhase"; buildInputs = [ pkgs.shellcheck ]; buildPhase = '' - find . -type f -name '*.sh' | xargs shellcheck + find . -type f -name '*.sh' | grep -v os-installation.sh | xargs shellcheck -e SC1090 -e SC1091 -e SC2139 touch $out ''; }; -- cgit v1.2.3 From b5700937691e27b1662e87f018d73cac6d4e338c Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 3 Jan 2019 06:48:57 -0200 Subject: Don't run checks on git-crypt files. --- default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 298d1af..c27faff 100644 --- a/default.nix +++ b/default.nix @@ -8,7 +8,9 @@ in with pkgs; with pkgs.stdenv; rec { phases = "unpackPhase buildPhase"; buildInputs = [ pkgs.shellcheck ]; buildPhase = '' - find . -type f -name '*.sh' | grep -v os-installation.sh | xargs shellcheck -e SC1090 -e SC1091 -e SC2139 + export SHELLCHECK_OPTS="-e SC1090 -e SC1091 -e SC2139" + ignored='(encrypted|os-installation.sh|notmuch-post.sh)' + find . -type f -name '*.sh' | grep -E -v $ignored | xargs shellcheck touch $out ''; }; -- cgit v1.2.3 From 79d6b9ce2c3bef376dcdc618df7eb8ef2f35cc0e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 3 Jan 2019 12:01:16 -0200 Subject: Add build badge to README.org. --- README.org | 1 + 1 file changed, 1 insertion(+) diff --git a/README.org b/README.org index 26e9394..eebad02 100644 --- a/README.org +++ b/README.org @@ -1,4 +1,5 @@ * dotfiles +[[https://builds.sr.ht/~euandreh/dotfiles][file:https://builds.sr.ht/~euandreh/dotfiles.svg]] ** Instructions - setting up a new installation (NixOS) *** 1. Download NixOS image from [[https://nixos.org/][the website]]. *** 2. Follow USB ISO installation steps in =nixos/os-installation.sh= -- cgit v1.2.3 From 6e73aa4e2065538e7e3a8cb954454893d8a6ee7d Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 3 Jan 2019 13:53:15 -0200 Subject: notmuch-post.sh. --- mail/notmuch-post.sh | Bin 338 -> 453 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mail/notmuch-post.sh b/mail/notmuch-post.sh index 9fdc57c..06facd1 100755 Binary files a/mail/notmuch-post.sh and b/mail/notmuch-post.sh differ -- cgit v1.2.3 From bfdce1cfcd264a1f5f070e31784b11914d4d11d1 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 4 Jan 2019 11:07:54 -0200 Subject: Add bin/ to $PATH. --- bash/env.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bash/env.sh b/bash/env.sh index 5a09663..f768173 100644 --- a/bash/env.sh +++ b/bash/env.sh @@ -35,6 +35,7 @@ export PATH="$DOTFILES/encrypted/scripts/:$PATH" export INPUTRC=~/.inputrc export CACHE_DIR="$HOME/Nextcloud/cache" export PATH="$HOME/dev/libre/website/:$PATH" +export PATH="$DOTFILES/bin:$PATH" -- cgit v1.2.3 From 6bc32da42d856406399364f9bc401f5c6e7b07bc Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 13 Jan 2019 14:57:59 -0200 Subject: ssh_config.conf. --- ssh_config.conf | Bin 50 -> 83 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ssh_config.conf b/ssh_config.conf index 01d3196..298ac3b 100644 Binary files a/ssh_config.conf and b/ssh_config.conf differ -- cgit v1.2.3 From 569abfc95209b00188a71dd4a199fb020ffe5218 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 13 Jan 2019 14:58:12 -0200 Subject: gc.sh: use sudo to rm the trash folder. --- scripts/gc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gc.sh b/scripts/gc.sh index c4d3ec3..e3ada13 100755 --- a/scripts/gc.sh +++ b/scripts/gc.sh @@ -28,7 +28,7 @@ guix gc yellow "Cleaning up up the Trash and /tmp folders" -rm -rf ~/.local/share/Trash/files/* +sudo rm -rf ~/.local/share/Trash/files/* # https://askubuntu.com/a/609396 sudo find /tmp -type f -atime +10 -delete -- cgit v1.2.3 From fb27243da67e41ec1f6f157a4affbfd18c6c07cb Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 13 Jan 2019 15:00:17 -0200 Subject: gc.sh: s/,u/u/. --- scripts/gc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gc.sh b/scripts/gc.sh index e3ada13..c93c948 100755 --- a/scripts/gc.sh +++ b/scripts/gc.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash disk_space() { - ,u | awk '{print $5" "$6}' + u | awk '{print $5" "$6}' } before=$(disk_space) -- cgit v1.2.3 From b812e84714fc933f3c208945e166b409df1ae6ba Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 13 Jan 2019 15:01:14 -0200 Subject: notmuch-post.sh. --- mail/notmuch-post.sh | Bin 453 -> 484 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mail/notmuch-post.sh b/mail/notmuch-post.sh index 06facd1..b874d70 100755 Binary files a/mail/notmuch-post.sh and b/mail/notmuch-post.sh differ -- cgit v1.2.3 From 4cd2d9244d9248f66bd6ce3f7a045e358600542d Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 13 Jan 2019 15:01:29 -0200 Subject: Remove superlogin from fake-symlink list. --- bash/fake-symlinks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/fake-symlinks.sh b/bash/fake-symlinks.sh index 3927b0c..3a5e885 100644 --- a/bash/fake-symlinks.sh +++ b/bash/fake-symlinks.sh @@ -5,7 +5,7 @@ if [[ -n "$GITHUB_TOKEN" ]]; then fi -SRHT_REPOS=(website mentat cement pouchdb-materialized-view pires superlogin superlogin-client) +SRHT_REPOS=(website mentat cement pouchdb-materialized-view pires superlogin-client) SRHT_REPOS_PATH="$HOME/dev/libre" for repo in "${SRHT_REPOS[@]}"; do -- cgit v1.2.3 From 7667482a4a66e3b18be7d7de9b02e06781a5bbe7 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 13 Jan 2019 15:02:06 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 11998 -> 11998 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index bac3414..d2d1538 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From f8e0f2d102ded6f11294c92159f9e5e9fdc734bc Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 13 Jan 2019 15:07:35 -0200 Subject: Move dotfiles out of annex submodule. --- bash/bashrc.sh | 2 +- git/mrconfig.ini | Bin 11998 -> 12003 bytes tmux/projects/annex.yml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bash/bashrc.sh b/bash/bashrc.sh index a895df1..eedc2bb 100644 --- a/bash/bashrc.sh +++ b/bash/bashrc.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export DOTFILES=~/annex/dev/code/dotfiles +export DOTFILES=~/dev/libre/dotfiles source $DOTFILES/bash/platform.sh source $DOTFILES/bash/config.sh diff --git a/git/mrconfig.ini b/git/mrconfig.ini index d2d1538..9d25a9b 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ diff --git a/tmux/projects/annex.yml b/tmux/projects/annex.yml index 50d34bc..b6cfbcc 100644 --- a/tmux/projects/annex.yml +++ b/tmux/projects/annex.yml @@ -8,7 +8,7 @@ windows: - misc: - cd - dotfiles: - - j dotfiles && git status + - cd "$DOTFILES" && git status - sleep 10 - reload - annex: -- cgit v1.2.3 From 9276899be730b652ea663478ac5724edcfe78a5b Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 13 Jan 2019 16:14:16 -0200 Subject: Fix cronjob path and remove cp-todos.sh job. --- nixos/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index cfa4b02..ea971cc 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -327,10 +327,10 @@ # We can see the actual generated crontab at /etc/crontab cron.systemCronJobs = [ # Sync emails with mbsync every hour - "0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh -s" + "0 * * * * andreh /home/andreh/dev/libre/dotfiles/scripts/mail.sh -s" # Make read-only copy of TODOs.org every hour - "0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/cp-todos.sh -s" + # "0 * * * * andreh /home/andreh/dev/libre/dotfiles/scripts/cp-todos.sh -s" ]; xserver = { -- cgit v1.2.3 From 5ec74941d10b9d1a2db7a3968c3a0cbff9ef81a1 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 14 Jan 2019 11:35:38 -0200 Subject: Setup org-babel for Rust. --- spacemacs.el | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/spacemacs.el b/spacemacs.el index d8493b2..290ac9c 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -107,6 +107,7 @@ This function should only modify configuration layer settings." interleave debbugs fireplace + ob-rust ;; emacs-guix ) ;; A list of packages that cannot be updated. @@ -667,6 +668,21 @@ This is the place where most of your configurations should be done. Unless it is (dolist (keybinding custom-keybindings) (global-set-key (kbd (car keybinding)) (cdr keybinding))) + (org-babel-do-load-languages + 'org-babel-load-languages + '((elixir . t) + (http . t) + (restclient . t) + (shell . t) + (clojure . t) + (ruby . t) + (python . t) + (perl . t) + (js . t) + (C . t) + (emacs-lisp . t) + (rust . t))) + (setq standard-indent 2 git-link-use-commit t vc-follow-symlinks t @@ -759,7 +775,7 @@ This function is called at the very end of Spacemacs initialization." ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (fireplace writeroom-mode visual-fill-column yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell)))) + (ob-rust fireplace writeroom-mode visual-fill-column yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. -- cgit v1.2.3 From ec96a9b827c38c53928b5c611e3fd1e051a7ad21 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 14 Jan 2019 11:35:47 -0200 Subject: Add emidje package. --- spacemacs.el | 1 + 1 file changed, 1 insertion(+) diff --git a/spacemacs.el b/spacemacs.el index 290ac9c..589e87c 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -107,6 +107,7 @@ This function should only modify configuration layer settings." interleave debbugs fireplace + emidje ob-rust ;; emacs-guix ) -- cgit v1.2.3 From 7f7ac488a546805703533e3eeae10d78203de60b Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 14 Jan 2019 11:35:53 -0200 Subject: Install rustracer. --- nixos/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index ea971cc..0e24b25 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -246,6 +246,7 @@ nodePackages.node2nix shellcheck (haskell.lib.justStaticExecutables haskellPackages.github-backup) + rustracer ## Containers and VMs -- cgit v1.2.3 From ad615c1d627f135f96c12bb4af5c797f0fdeef83 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 15 Jan 2019 10:19:00 -0200 Subject: Add flutter to $PATH. --- bash/env.sh | 1 + git/mrconfig.ini | Bin 12003 -> 12103 bytes 2 files changed, 1 insertion(+) diff --git a/bash/env.sh b/bash/env.sh index f768173..3e63aa3 100644 --- a/bash/env.sh +++ b/bash/env.sh @@ -36,6 +36,7 @@ export INPUTRC=~/.inputrc export CACHE_DIR="$HOME/Nextcloud/cache" export PATH="$HOME/dev/libre/website/:$PATH" export PATH="$DOTFILES/bin:$PATH" +export PATH="$HOME/dev/misc/flutter/bin:$PATH" diff --git a/git/mrconfig.ini b/git/mrconfig.ini index 9d25a9b..5bb4cf1 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From 9a80c5fc610cc8642593f1ea93a9ab64423a3127 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 18 Jan 2019 14:05:32 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 12103 -> 12126 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index 5bb4cf1..9c789a3 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From 6b3e109de8615899fe5f74dd4298b2a7e60feb0c Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 20 Jan 2019 00:46:13 -0200 Subject: Add selectric layer. --- spacemacs.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spacemacs.el b/spacemacs.el index 589e87c..aa59eec 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -75,6 +75,7 @@ This function should only modify configuration layer settings." ruby rust scheme + selectric shell-scripts sql swift @@ -776,7 +777,7 @@ This function is called at the very end of Spacemacs initialization." ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (ob-rust fireplace writeroom-mode visual-fill-column yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell)))) + (selectric-mode ob-rust fireplace writeroom-mode visual-fill-column yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. -- cgit v1.2.3 From bafea5e5ecc629f701c9468b7518eaed516283a5 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 20 Jan 2019 22:59:27 -0200 Subject: Setup newsboat configuration. --- .gitattributes | 1 + bash/env.sh | 1 + bash/symlinks.sh | 5 +++++ newsboat/config | 1 + newsboat/urls | Bin 0 -> 589 bytes nixos/configuration.nix | 1 + 6 files changed, 9 insertions(+) create mode 100644 newsboat/config create mode 100644 newsboat/urls diff --git a/.gitattributes b/.gitattributes index 76d2343..74fe0d5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,3 +8,4 @@ emacs/gnus.el filter=git-crypt diff=git-crypt emacs/not-much.el filter=git-crypt diff=git-crypt lein/deps.edn filter=git-crypt diff=git-crypt ssh_config.conf filter=git-crypt diff=git-crypt +newsboat/urls filter=git-crypt diff=git-crypt diff --git a/bash/env.sh b/bash/env.sh index 3e63aa3..d8233be 100644 --- a/bash/env.sh +++ b/bash/env.sh @@ -37,6 +37,7 @@ export CACHE_DIR="$HOME/Nextcloud/cache" export PATH="$HOME/dev/libre/website/:$PATH" export PATH="$DOTFILES/bin:$PATH" export PATH="$HOME/dev/misc/flutter/bin:$PATH" +#export BROWSER="firefox" diff --git a/bash/symlinks.sh b/bash/symlinks.sh index e56ee58..70e66af 100644 --- a/bash/symlinks.sh +++ b/bash/symlinks.sh @@ -49,6 +49,11 @@ ln -fs "$DOTFILES/tmux/tmux.conf" ~/.tmux.conf ln -fs "$DOTFILES/tmux/tmux-macos.conf" ~/.tmux-macos.conf ln -fs "$DOTFILES/tmux/tmux-gnu-linux.conf" ~/.tmux-gnu-linux.conf +## Newsboat +mkdir -p ~/.newsboat +ln -fs "$DOTFILES/newsboat/urls" ~/.newsboat/urls +ln -fs "$DOTFILES/newsboat/config" ~/.newsboat/config + ## NixOS ln -fs "$DOTFILES/nixos/evince.destkop" ~/.local/share/applications/evince.desktop ln -fs "$DOTFILES/nixos/firefox.destkop" ~/.local/share/applications/firefox.desktop diff --git a/newsboat/config b/newsboat/config new file mode 100644 index 0000000..a7998d9 --- /dev/null +++ b/newsboat/config @@ -0,0 +1 @@ +browser firefox \ No newline at end of file diff --git a/newsboat/urls b/newsboat/urls new file mode 100644 index 0000000..444e1a7 Binary files /dev/null and b/newsboat/urls differ diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 0e24b25..fc48b78 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -240,6 +240,7 @@ rakudo bats ledger + newsboat perl dhall dhall-json -- cgit v1.2.3 From 1a6d394eb6d7a065b4372595ac2610089e6dafe7 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 20 Jan 2019 23:00:42 -0200 Subject: Add ledger alias and helpers. --- encrypted/env.sh | Bin 3342 -> 3436 bytes spacemacs.el | 1 + 2 files changed, 1 insertion(+) diff --git a/encrypted/env.sh b/encrypted/env.sh index e4ebb21..bc1a0bf 100644 Binary files a/encrypted/env.sh and b/encrypted/env.sh differ diff --git a/spacemacs.el b/spacemacs.el index aa59eec..65a66ce 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -573,6 +573,7 @@ dump." (defvar custom-keybindings '(("→" . (lambda () (interactive) (evil-insert 1))) ("M-ç" . (lambda () (interactive) (find-file "~/annex/txt/TODOs.org"))) + ("M-p" . (lambda () (interactive) (find-file "~/annex/txt/money.ledger"))) ("M-SPC" . (lambda () (interactive) (just-one-space -1))) ("M-[" . (lambda () (interactive) (find-file "~/tmp/scratch.org"))) ("M-]" . (lambda () (interactive) (find-file "~/Nextcloud/Notes/TODOs.txt"))) -- cgit v1.2.3 From a5859fad8b43fbefc24f969b6f794c9a8abe797c Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 20 Jan 2019 23:34:12 -0200 Subject: Initial setup for buku. --- nixos/configuration.nix | 2 ++ scripts/buku-add.sh | 3 +++ xmonad/xmonad.hs | 5 +++++ 3 files changed, 10 insertions(+) create mode 100755 scripts/buku-add.sh diff --git a/nixos/configuration.nix b/nixos/configuration.nix index fc48b78..36a2474 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -248,6 +248,8 @@ shellcheck (haskell.lib.justStaticExecutables haskellPackages.github-backup) rustracer + xsel + buku ## Containers and VMs diff --git a/scripts/buku-add.sh b/scripts/buku-add.sh new file mode 100755 index 0000000..beccd0a --- /dev/null +++ b/scripts/buku-add.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +xsel | xargs -I{} buku -a "{}" ril diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index dd46d25..1f7d47a 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -95,6 +95,11 @@ myKeyBindings = -- restart network , ((mod4Mask, xK_x), spawn "gksudo -S systemctl restart network-manager") + + -- save selection (link) in buku + , ((mod4Mask, xK_c), + -- spawn "gksudo -S systemctl restart network-manager") + spawn "$HOME/dev/libre/dotfiles/scripts/buku-add.sh") ] startup :: X() -- cgit v1.2.3 From 8d490839b7ef11549bee6c92fdd86ef60afd55e0 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 21 Jan 2019 01:25:07 -0200 Subject: Generate local RSS feed from buku tags. --- .gitignore | 3 +++ bash/aliases.sh | 1 + newsboat/urls | Bin 589 -> 653 bytes nixos/configuration.nix | 3 +++ scripts/atom.js | 22 ++++++++++++++++++++++ scripts/atom.sh | 19 +++++++++++++++++++ 6 files changed, 48 insertions(+) create mode 100644 scripts/atom.js create mode 100755 scripts/atom.sh diff --git a/.gitignore b/.gitignore index e671f1e..68b7e2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ mail/offlineimap.pyc tam_required /result + +/scripts/node_modules/ +/scripts/package-lock.json \ No newline at end of file diff --git a/bash/aliases.sh b/bash/aliases.sh index 52d24b4..e8ff449 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -24,6 +24,7 @@ alias sbcl="rlwrap sbcl" alias du="ncdu --color dark" alias perl6="rlwrap perl6" alias m="mail.sh" +alias a="atom.sh" alias gnome-control-center="XDG_CURRENT_DESKTOP=GNOME gnome-control-center" diff --git a/newsboat/urls b/newsboat/urls index 444e1a7..1047793 100644 Binary files a/newsboat/urls and b/newsboat/urls differ diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 36a2474..6f8c7e0 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -333,6 +333,9 @@ # Sync emails with mbsync every hour "0 * * * * andreh /home/andreh/dev/libre/dotfiles/scripts/mail.sh -s" + # Refresh local RSS files every hour + "0 * * * * andreh /home/andreh/dev/libre/dotfiles/scripts/atom.sh" + # Make read-only copy of TODOs.org every hour # "0 * * * * andreh /home/andreh/dev/libre/dotfiles/scripts/cp-todos.sh -s" ]; diff --git a/scripts/atom.js b/scripts/atom.js new file mode 100644 index 0000000..878df05 --- /dev/null +++ b/scripts/atom.js @@ -0,0 +1,22 @@ +const RSS = require('rss'); + +const feedName = process.argv[2]; +const feedSrc = process.argv[3]; + +const feed = new RSS({ + title: `Buku feed tag for '${feedName}'.`, + description: `Buku feed tag for ${feedName}`, +}); + +const items = require(feedSrc); +items.forEach(({ title, description, uri }) => { + feed.item({ + title, + description, + url: uri + }); +}); + +const xml = feed.xml({indent: true}); + +console.log(xml); diff --git a/scripts/atom.sh b/scripts/atom.sh new file mode 100755 index 0000000..73c35ec --- /dev/null +++ b/scripts/atom.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +if [[ ! -d "node_modules" ]]; then + npm i rss +fi + +feed() { + local tag="$1" + local tmp="/tmp/$tag.json" + buku -t "$tag" --json > "$tmp" + node atom.js "$tag" "$tmp" +} + +mkdir -p ~/.newsboat +feed ril > ~/.newsboat/ril.xml +feed simple-archive > ~/.newsboat/simple-archive.xml +feed inbox > ~/.newsboat/inbox.xml -- cgit v1.2.3 From ebdfd3c70ca16a358c2debbbd18ffa14bd7c674b Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 21 Jan 2019 09:18:50 -0200 Subject: urls. --- newsboat/urls | Bin 653 -> 770 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/newsboat/urls b/newsboat/urls index 1047793..6f4ddff 100644 Binary files a/newsboat/urls and b/newsboat/urls differ -- cgit v1.2.3 From 01228f89c43d9a40f79eb8e2e9556d8d9fa01fc7 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 21 Jan 2019 09:19:32 -0200 Subject: WIP: add extra keybindings for Buku actions. --- bash/aliases.sh | 9 +++++---- scripts/buku-archive.sh | 15 +++++++++++++++ scripts/buku-delete.sh | 14 ++++++++++++++ xmonad/xmonad.hs | 9 ++++++++- 4 files changed, 42 insertions(+), 5 deletions(-) create mode 100755 scripts/buku-archive.sh create mode 100755 scripts/buku-delete.sh diff --git a/bash/aliases.sh b/bash/aliases.sh index e8ff449..2149d86 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -25,6 +25,7 @@ alias du="ncdu --color dark" alias perl6="rlwrap perl6" alias m="mail.sh" alias a="atom.sh" +alias n="newsboat" alias gnome-control-center="XDG_CURRENT_DESKTOP=GNOME gnome-control-center" @@ -45,9 +46,9 @@ ps1() { } # git -alias ,s="git status" -alias ,d="git diff" -alias ,ds="git diff --staged" +alias s="git status" +alias d="git diff" +alias ds="git diff --staged" alias reload="source $DOTFILES/bash/tests.sh && locked_init && source ~/.bashrc" -alias ,r="source $DOTFILES/bash/tests.sh && locked_init && source ~/.bashrc" +alias r="source $DOTFILES/bash/tests.sh && locked_init && source ~/.bashrc" diff --git a/scripts/buku-archive.sh b/scripts/buku-archive.sh new file mode 100755 index 0000000..5af56a0 --- /dev/null +++ b/scripts/buku-archive.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -x + +SEL="$(xsel)" +BOOKMARK_ID="$(buku "$SEL" -f 1 --tacit | tail -n +2 | awk '{print $1}')" +# tail to trim unwanted "waiting for input" output from buku https://github.com/jarun/Buku/blob/d60d56bc9f7f5e1410e99dc8bb4e35abf5068a14/buku#L4619 + +if [[ ! -z "$BOOKMARK_ID" ]]; then + echo "Archiving $BOOKMARK_ID." + buku -u "$BOOKMARK_ID" --tag - ril + buku -u "$BOOKMARK_ID" --tag + simple-archive +else + echo "Bookmark for '$SEL' not found." + exit 1 +fi diff --git a/scripts/buku-delete.sh b/scripts/buku-delete.sh new file mode 100755 index 0000000..3e2f3dd --- /dev/null +++ b/scripts/buku-delete.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +set -x + +SEL="$(xsel)" +BOOKMARK_ID="$(buku "$SEL" -f 1 --tacit | tail -n +2 | awk '{print $1}')" +# tail to trim unwanted "waiting for input" output from buku https://github.com/jarun/Buku/blob/d60d56bc9f7f5e1410e99dc8bb4e35abf5068a14/buku#L4619 + +if [[ ! -z "$BOOKMARK_ID" ]]; then + echo "Deleting $BOOKMARK_ID." + buku -d "$BOOKMARK_ID" --tacit +else + echo "Bookmark for '$SEL' not found." + exit 1 +fi diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index 1f7d47a..ff14005 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -98,8 +98,15 @@ myKeyBindings = -- save selection (link) in buku , ((mod4Mask, xK_c), - -- spawn "gksudo -S systemctl restart network-manager") spawn "$HOME/dev/libre/dotfiles/scripts/buku-add.sh") + + -- delete selection (link) from buku + , ((mod4Mask, xK_d), + spawn "$HOME/dev/libre/dotfiles/scripts/buku-delete.sh > ~/tmp/dbg-delete") + + -- archive selection (link) in buku + , ((mod4Mask, xK_a), + spawn "$HOME/dev/libre/dotfiles/scripts/buku-archive.sh > ~/tmp/dbg-archive") ] startup :: X() -- cgit v1.2.3 From be7edc6fe6c3aeca011ad0da730249a7bd3bd73b Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 21 Jan 2019 10:22:45 -0200 Subject: Add balance ledger report. --- spacemacs.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spacemacs.el b/spacemacs.el index 65a66ce..9c19ac2 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -776,6 +776,9 @@ This function is called at the very end of Spacemacs initialization." ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. + '(ledger-reports + (quote + (("balance" "ledger -f money.ledger balance Assets Liabilities")))) '(package-selected-packages (quote (selectric-mode ob-rust fireplace writeroom-mode visual-fill-column yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell)))) -- cgit v1.2.3 From e3c43cf89e296afd1ec0b7659c36b309bed084ae Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 21 Jan 2019 10:23:02 -0200 Subject: gitconfig. --- git/gitconfig.ini | Bin 2198 -> 1861 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/gitconfig.ini b/git/gitconfig.ini index df83354..f1f4d78 100644 Binary files a/git/gitconfig.ini and b/git/gitconfig.ini differ -- cgit v1.2.3 From c71d427f78f5a5548ce4512c8ec4e87d406b4377 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 22 Jan 2019 13:08:43 -0200 Subject: Integrate buku with newsboat. --- bash/symlinks.sh | 1 - newsboat/urls | Bin 770 -> 706 bytes scripts/atom.sh | 20 +++++++++++++++----- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/bash/symlinks.sh b/bash/symlinks.sh index 70e66af..573c817 100644 --- a/bash/symlinks.sh +++ b/bash/symlinks.sh @@ -51,7 +51,6 @@ ln -fs "$DOTFILES/tmux/tmux-gnu-linux.conf" ~/.tmux-gnu-linux.conf ## Newsboat mkdir -p ~/.newsboat -ln -fs "$DOTFILES/newsboat/urls" ~/.newsboat/urls ln -fs "$DOTFILES/newsboat/config" ~/.newsboat/config ## NixOS diff --git a/newsboat/urls b/newsboat/urls index 6f4ddff..ce88f4c 100644 Binary files a/newsboat/urls and b/newsboat/urls differ diff --git a/scripts/atom.sh b/scripts/atom.sh index 73c35ec..d1e968f 100755 --- a/scripts/atom.sh +++ b/scripts/atom.sh @@ -6,14 +6,24 @@ if [[ ! -d "node_modules" ]]; then npm i rss fi +RSS_DIR="$HOME/.newsboat" +LINKS_OUT="$RSS_DIR/gen/buku.urls" + +mkdir -p "$RSS_DIR/gen" + +# Empty the text file +> "$LINKS_OUT" + feed() { local tag="$1" local tmp="/tmp/$tag.json" buku -t "$tag" --json > "$tmp" - node atom.js "$tag" "$tmp" + node atom.js "$tag" "$tmp" > "$RSS_DIR/gen/$1.xml" + echo "file://$RSS_DIR/gen/$1.xml" >> "$LINKS_OUT" } -mkdir -p ~/.newsboat -feed ril > ~/.newsboat/ril.xml -feed simple-archive > ~/.newsboat/simple-archive.xml -feed inbox > ~/.newsboat/inbox.xml +feed ril +feed simple-archive +feed ril-batch + +cat "$DOTFILES/newsboat/urls" <(echo) "$LINKS_OUT" > "$RSS_DIR/urls" -- cgit v1.2.3 From 3e938ac726a9470083148ef31507e9dc6123ae0c Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 22 Jan 2019 13:11:35 -0200 Subject: Setup integration between buku and newsboat. --- bash/symlinks.sh | 3 +++ scripts/buku-add.sh | 2 +- scripts/buku-archive.sh | 26 +++++++++++++++++++++----- scripts/buku-delete.sh | 26 +++++++++++++++++++++----- xmonad/xmonad.hs | 6 +++--- 5 files changed, 49 insertions(+), 14 deletions(-) diff --git a/bash/symlinks.sh b/bash/symlinks.sh index 573c817..f6adb0c 100644 --- a/bash/symlinks.sh +++ b/bash/symlinks.sh @@ -79,3 +79,6 @@ ln -fs /tmp/notmuch."$(date +%Y-%m-%d)".log /tmp/notmuch.log ## GNUS ln -fs "$DOTFILES/encrypted/IMAP/authinfo.gpg" ~/.authinfo.gpg + +## Buku +ln -fs /tmp/buku-xmonad."$(date +%Y-%m-%d)".log /tmp/buku-xmonad.log diff --git a/scripts/buku-add.sh b/scripts/buku-add.sh index beccd0a..005adbd 100755 --- a/scripts/buku-add.sh +++ b/scripts/buku-add.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -xsel | xargs -I{} buku -a "{}" ril +xclip -o | xargs -I{} buku -a "{}" ril diff --git a/scripts/buku-archive.sh b/scripts/buku-archive.sh index 5af56a0..6ce1e80 100755 --- a/scripts/buku-archive.sh +++ b/scripts/buku-archive.sh @@ -1,12 +1,28 @@ #!/usr/bin/env bash -set -x -SEL="$(xsel)" -BOOKMARK_ID="$(buku "$SEL" -f 1 --tacit | tail -n +2 | awk '{print $1}')" -# tail to trim unwanted "waiting for input" output from buku https://github.com/jarun/Buku/blob/d60d56bc9f7f5e1410e99dc8bb4e35abf5068a14/buku#L4619 +SEL="$(xclip -o | tr -d '\n')" +if [[ -z "${SEL// }" ]]; then + echo "Empty selection." + exit 1 +fi +BOOKMARK_ID= +IFS=" +" +BOOKMARKS="$(buku "$SEL" -f 1 --tacit)" + +for bookmark in $BOOKMARKS; do + echo "$bookmark" + ID="$(echo "$bookmark" | cut -d$'\t' -f 1)" + URL="$(echo "$bookmark" | cut -d$'\t' -f 2)" + if [[ "$URL" = "$SEL" ]]; then + BOOKMARK_ID="$ID" + break + fi +done + if [[ ! -z "$BOOKMARK_ID" ]]; then - echo "Archiving $BOOKMARK_ID." + echo "Archiving $BOOKMARK_ID (URL: $SEL)." buku -u "$BOOKMARK_ID" --tag - ril buku -u "$BOOKMARK_ID" --tag + simple-archive else diff --git a/scripts/buku-delete.sh b/scripts/buku-delete.sh index 3e2f3dd..552d6b0 100755 --- a/scripts/buku-delete.sh +++ b/scripts/buku-delete.sh @@ -1,12 +1,28 @@ #!/usr/bin/env bash -set -x -SEL="$(xsel)" -BOOKMARK_ID="$(buku "$SEL" -f 1 --tacit | tail -n +2 | awk '{print $1}')" -# tail to trim unwanted "waiting for input" output from buku https://github.com/jarun/Buku/blob/d60d56bc9f7f5e1410e99dc8bb4e35abf5068a14/buku#L4619 +SEL="$(xclip -o | tr -d '\n')" +if [[ -z "${SEL// }" ]]; then + echo "Empty selection." + exit 1 +fi +BOOKMARK_ID= +IFS=" +" +BOOKMARKS="$(buku "$SEL" -f 1 --tacit)" + +for bookmark in $BOOKMARKS; do + echo "$bookmark" + ID="$(echo "$bookmark" | cut -d$'\t' -f 1)" + URL="$(echo "$bookmark" | cut -d$'\t' -f 2)" + if [[ "$URL" = "$SEL" ]]; then + BOOKMARK_ID="$ID" + break + fi +done + if [[ ! -z "$BOOKMARK_ID" ]]; then - echo "Deleting $BOOKMARK_ID." + echo "Deleting $BOOKMARK_ID (URL: $SEL)." buku -d "$BOOKMARK_ID" --tacit else echo "Bookmark for '$SEL' not found." diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index ff14005..8c12ae5 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -98,15 +98,15 @@ myKeyBindings = -- save selection (link) in buku , ((mod4Mask, xK_c), - spawn "$HOME/dev/libre/dotfiles/scripts/buku-add.sh") + spawn "$HOME/dev/libre/dotfiles/scripts/buku-add.sh >> /tmp/buku-xmonad.log") -- delete selection (link) from buku , ((mod4Mask, xK_d), - spawn "$HOME/dev/libre/dotfiles/scripts/buku-delete.sh > ~/tmp/dbg-delete") + spawn "$HOME/dev/libre/dotfiles/scripts/buku-delete.sh >> /tmp/buku-xmonad.log") -- archive selection (link) in buku , ((mod4Mask, xK_a), - spawn "$HOME/dev/libre/dotfiles/scripts/buku-archive.sh > ~/tmp/dbg-archive") + spawn "$HOME/dev/libre/dotfiles/scripts/buku-archive.sh >> /tmp/buku-xmonad.log") ] startup :: X() -- cgit v1.2.3 From 4541e1126a934e7c4e8e9eb69ed751f9ac91e364 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 22 Jan 2019 13:12:05 -0200 Subject: Remove $HOME variable from npmrc.sh. --- nixos/npmrc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/npmrc.sh b/nixos/npmrc.sh index 2669f85..0bc6ecb 100644 --- a/nixos/npmrc.sh +++ b/nixos/npmrc.sh @@ -1,5 +1,5 @@ # shellcheck disable=2148 disable=2034 -prefix="$HOME/.npm-packages" +prefix=/home/andreh/.npm-packages # Taken from: # http://www.tomsquest.com/blog/2018/10/better-npm-ing/ save-exact=true -- cgit v1.2.3 From 5e0919db80267d5ed476c744e3f13f8d8f711571 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 22 Jan 2019 16:39:17 -0200 Subject: Nextcloud -> ownCloud Client change only. --- bash/env.sh | 4 +--- bash/youtube.sh | 2 +- nixos/configuration.nix | 3 ++- scripts/backup.sh | 2 +- scripts/cp-todos.sh | 4 ++-- scripts/once-only-nextcloud.sh | 9 --------- scripts/once-only-owncloud.sh | 9 +++++++++ spacemacs.el | 7 ++++--- xmonad/xmonad.hs | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) delete mode 100755 scripts/once-only-nextcloud.sh create mode 100755 scripts/once-only-owncloud.sh diff --git a/bash/env.sh b/bash/env.sh index d8233be..a0b750f 100644 --- a/bash/env.sh +++ b/bash/env.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -export PATH="$HOME/Nextcloud/bin/:$PATH" - # # Git Annex # @@ -33,7 +31,7 @@ export EDITOR=vi export PATH="$DOTFILES/scripts/:$PATH" export PATH="$DOTFILES/encrypted/scripts/:$PATH" export INPUTRC=~/.inputrc -export CACHE_DIR="$HOME/Nextcloud/cache" +export CACHE_DIR="$HOME/ownCloud/cache" export PATH="$HOME/dev/libre/website/:$PATH" export PATH="$DOTFILES/bin:$PATH" export PATH="$HOME/dev/misc/flutter/bin:$PATH" diff --git a/bash/youtube.sh b/bash/youtube.sh index 19c9af0..14d0371 100644 --- a/bash/youtube.sh +++ b/bash/youtube.sh @@ -12,7 +12,7 @@ export -f yt_dl download() { youtube-dl "$1" \ - --download-archive ~/Nextcloud/cache/youtube-dl-seen.conf \ + --download-archive ~/ownCloud/cache/youtube-dl-seen.conf \ --prefer-free-formats \ --playlist-end "$2" \ --write-description \ diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 6f8c7e0..95a3b27 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -105,6 +105,7 @@ gnupg mr nextcloud-client + owncloud-client borgbackup git-sizer @@ -366,7 +367,7 @@ # xmodmap -e 'keycode 118 = bar Greek_lamda' sessionCommands = '' ${pkgs.haskellPackages.xmobar}/bin/xmobar ~/.xmobarrc & - ${pkgs.fvwm}/bin/xpmroot ~/Nextcloud/Images/emotion.png & + ${pkgs.fvwm}/bin/xpmroot ~/ownCloud/Images/emotion.png & ''; }; }; diff --git a/scripts/backup.sh b/scripts/backup.sh index 6a4de25..f31a503 100755 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -27,7 +27,7 @@ borg create \ --progress \ --compression lzma,6 \ ~/borgbackup::"{hostname}-{now}-${BACKUP_TAG}" \ - ~/Nextcloud/ \ + ~/ownCloud/ \ ~/mbsync/ # add folders to be backed up here green "Done" diff --git a/scripts/cp-todos.sh b/scripts/cp-todos.sh index d8e6f30..e839ae8 100755 --- a/scripts/cp-todos.sh +++ b/scripts/cp-todos.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/Notes/org.txt" -cp "$HOME/annex/txt/TODOs.org" "$HOME/Nextcloud/cache/TODOs.org" +cp "$HOME/annex/txt/TODOs.org" "$HOME/ownCloud/Notes/org.txt" +cp "$HOME/annex/txt/TODOs.org" "$HOME/ownCloud/cache/TODOs.org" diff --git a/scripts/once-only-nextcloud.sh b/scripts/once-only-nextcloud.sh deleted file mode 100755 index 7886b6f..0000000 --- a/scripts/once-only-nextcloud.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -if [ "$(pidof nextcloud)" ] -then - echo "Nextcloud already running." -else - echo "Nextcloud not running yet. Starting it." - nextcloud & disown -fi diff --git a/scripts/once-only-owncloud.sh b/scripts/once-only-owncloud.sh new file mode 100755 index 0000000..66b3ee4 --- /dev/null +++ b/scripts/once-only-owncloud.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +if [ "$(pidof owncloud)" ] +then + echo "ownCloud already running." +else + echo "ownCloud not running yet. Starting it." + owncloud & disown +fi diff --git a/spacemacs.el b/spacemacs.el index 9c19ac2..f30415d 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -576,7 +576,7 @@ dump." ("M-p" . (lambda () (interactive) (find-file "~/annex/txt/money.ledger"))) ("M-SPC" . (lambda () (interactive) (just-one-space -1))) ("M-[" . (lambda () (interactive) (find-file "~/tmp/scratch.org"))) - ("M-]" . (lambda () (interactive) (find-file "~/Nextcloud/Notes/TODOs.txt"))) + ("M-]" . (lambda () (interactive) (find-file "~/ownCloud/Notes/TODOs.txt"))) ("M-s-q" . (lambda () (interactive) (insert "/"))) ("M-s-w" . (lambda () (interactive) (insert "?"))) ("M-s-a" . (lambda () (interactive) (insert "\\"))) @@ -728,7 +728,7 @@ This is the place where most of your configurations should be done. Unless it is ;; - http://cachestocaches.com/2016/9/my-workflow-org-agenda ;; - http://doc.norang.ca/org-mode.html org-todo-keywords '((sequence "TODO" "NEXT" "WAITING" "INACTIVE" "CANCELLED" "MEETING" "DOING" "|" "DONE")) - org-agenda-files '("~/Nextcloud/txt/TODOs.org") + org-agenda-files '("~/ownCloud/txt/TODOs.org") org-columns-default-format "%50ITEM(Task) %10CLOCKSUM %16TIMESTAMP_IA" org-default-notes-file "~/annex/txt/TODOs.org" org-scratch-notes-file "~/annex/txt/TODOs.org" @@ -778,7 +778,8 @@ This function is called at the very end of Spacemacs initialization." ;; If there is more than one, they won't work right. '(ledger-reports (quote - (("balance" "ledger -f money.ledger balance Assets Liabilities")))) + (("balance-rs" "ledger -f money.ledger balance Assets Liabilities -V") + ("balance" "ledger -f money.ledger balance Assets Liabilities")))) '(package-selected-packages (quote (selectric-mode ob-rust fireplace writeroom-mode visual-fill-column yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell)))) diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index 8c12ae5..c266676 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -115,5 +115,5 @@ startup = do spawn "xmobar ~/.xmobarrc" spawn "killall trayer; trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 10 --transparent true --tint 0x191970 --height 17 --monitor 1" spawn "nm-applet" - spawn "~/annex/dev/code/dotfiles/scripts/once-only-nextcloud.sh" + spawn "~/annex/dev/code/dotfiles/scripts/once-only-owncloud.sh" setWMName "LG3D" -- https://stackoverflow.com/questions/30742662/java-swing-gui-not-displaying-in-xmonad -- cgit v1.2.3 From 7cf187582a6af17fed55d580e8d173e59805ea01 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 22 Jan 2019 20:40:13 -0200 Subject: Fix dotfiles path. --- bash/bash_profile.sh | 2 +- mail/mbsyncrc.ini | Bin 2117 -> 2102 bytes nixos/configuration.nix | 2 +- spacemacs.el | 2 +- xmonad/xmonad.hs | 6 +++--- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bash/bash_profile.sh b/bash/bash_profile.sh index 41bc7e9..0383eaa 100644 --- a/bash/bash_profile.sh +++ b/bash/bash_profile.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source ~/annex/dev/code/dotfiles/bash/bashrc.sh +source ~/dev/libre/dotfiles/bash/bashrc.sh diff --git a/mail/mbsyncrc.ini b/mail/mbsyncrc.ini index c3d1bc0..a74c30e 100644 Binary files a/mail/mbsyncrc.ini and b/mail/mbsyncrc.ini differ diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 95a3b27..bcd52a9 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -426,7 +426,7 @@ uid = 1000; description = "EuAndreh"; extraGroups = [ "wheel" "networkmanager" "docker" ]; - passwordFile = "/home/andreh/annex/dev/code/dotfiles/encrypted/password-hash.txt"; + passwordFile = "/home/andreh/dev/libre/dotfiles/encrypted/password-hash.txt"; }; }; # From the Guix manual: diff --git a/spacemacs.el b/spacemacs.el index f30415d..f3cb704 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -582,7 +582,7 @@ dump." ("M-s-a" . (lambda () (interactive) (insert "\\"))) ("M-s-s" . (lambda () (interactive) (insert "|"))))) -(defvar custom-el-files '("~/annex/dev/code/dotfiles/emacs/not-much.el" +(defvar custom-el-files '("~/dev/libre/dotfiles/emacs/not-much.el" "~/.quicklisp/slime-helper.el")) (defmacro measure-time (&rest body) diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index c266676..43e918b 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -86,11 +86,11 @@ myKeyBindings = -- xrandr single monitor setup , ((mod4Mask .|. controlMask, xK_1), - spawn "~/annex/dev/code/dotfiles/scripts/single-monitor.sh") + spawn "~/dev/libre/dotfiles/scripts/single-monitor.sh") -- xrandr three monitor setup , ((mod4Mask .|. controlMask, xK_3), - spawn "~/annex/dev/code/dotfiles/scripts/three-monitors.sh") + spawn "~/dev/libre/dotfiles/scripts/three-monitors.sh") -- restart network , ((mod4Mask, xK_x), @@ -115,5 +115,5 @@ startup = do spawn "xmobar ~/.xmobarrc" spawn "killall trayer; trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 10 --transparent true --tint 0x191970 --height 17 --monitor 1" spawn "nm-applet" - spawn "~/annex/dev/code/dotfiles/scripts/once-only-owncloud.sh" + spawn "~/dev/libre/dotfiles/scripts/once-only-owncloud.sh" setWMName "LG3D" -- https://stackoverflow.com/questions/30742662/java-swing-gui-not-displaying-in-xmonad -- cgit v1.2.3 From 5f469e121073ad632b2c1ed3d936a36e74afd9af Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 22 Jan 2019 20:40:29 -0200 Subject: RSS urls. --- newsboat/urls | Bin 706 -> 756 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/newsboat/urls b/newsboat/urls index ce88f4c..50f7cbf 100644 Binary files a/newsboat/urls and b/newsboat/urls differ -- cgit v1.2.3 From 79566a629ee25f500b01f244b8d292a67fe608dc Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 22 Jan 2019 20:41:33 -0200 Subject: Use NixOS image in build.yml. --- .build.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.build.yml b/.build.yml index 33e6627..4f3c8ce 100644 --- a/.build.yml +++ b/.build.yml @@ -1,18 +1,11 @@ -image: debian/stretch -packages: - - curl +image: nixos/latest triggers: - condition: failure action: email to: EuAndreh sources: - https://git.sr.ht/~euandreh/dotfiles -secrets: - - 7159f943-811f-402d-bb6d-37cd764dc728 tasks: - - setup: | - curl https://nixos.org/nix/install | sh - echo '. ~/.nix-profile/etc/profile.d/nix.sh' >> ~/.buildenv - tests: | cd dotfiles/ nix-build -A test -- cgit v1.2.3 From a5b833c375d0610f5c148eb90bb1b7dd2191a431 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 23 Jan 2019 00:17:27 -0200 Subject: urls. --- newsboat/urls | Bin 756 -> 869 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/newsboat/urls b/newsboat/urls index 50f7cbf..90db802 100644 Binary files a/newsboat/urls and b/newsboat/urls differ -- cgit v1.2.3 From 522ea27dc31a79bb06510f8ffd1f15614ed052a8 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 23 Jan 2019 22:37:16 -0200 Subject: Remove ril-batch feed. --- scripts/atom.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/atom.sh b/scripts/atom.sh index d1e968f..64c9a14 100755 --- a/scripts/atom.sh +++ b/scripts/atom.sh @@ -24,6 +24,5 @@ feed() { feed ril feed simple-archive -feed ril-batch cat "$DOTFILES/newsboat/urls" <(echo) "$LINKS_OUT" > "$RSS_DIR/urls" -- cgit v1.2.3 From da92df2cc003213a15ff598a6ce194038ccb2cb3 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 23 Jan 2019 22:37:25 -0200 Subject: RSS feeds. --- newsboat/urls | Bin 869 -> 1006 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/newsboat/urls b/newsboat/urls index 90db802..9eeac3c 100644 Binary files a/newsboat/urls and b/newsboat/urls differ -- cgit v1.2.3 From e77117dd559401c309a1b3da67b676dd897cbfff Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 24 Jan 2019 00:12:05 -0200 Subject: Don't generate XML for emtpy tags. --- scripts/atom.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/atom.sh b/scripts/atom.sh index 64c9a14..4d09815 100755 --- a/scripts/atom.sh +++ b/scripts/atom.sh @@ -18,8 +18,10 @@ feed() { local tag="$1" local tmp="/tmp/$tag.json" buku -t "$tag" --json > "$tmp" - node atom.js "$tag" "$tmp" > "$RSS_DIR/gen/$1.xml" - echo "file://$RSS_DIR/gen/$1.xml" >> "$LINKS_OUT" + if [[ -s "$tmp" ]]; then + node atom.js "$tag" "$tmp" > "$RSS_DIR/gen/$1.xml" + echo "file://$RSS_DIR/gen/$1.xml" >> "$LINKS_OUT" + fi } feed ril -- cgit v1.2.3 From 46bc516d5e4ce6332719e8e67b197e7acea40f93 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 24 Jan 2019 11:35:29 -0200 Subject: RSS. --- newsboat/urls | Bin 1006 -> 1035 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/newsboat/urls b/newsboat/urls index 9eeac3c..36efe8d 100644 Binary files a/newsboat/urls and b/newsboat/urls differ -- cgit v1.2.3 From 6926efa3e6c40ec60badcb553c1f34d490cf775f Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 24 Jan 2019 11:36:12 -0200 Subject: Ledger cmd. --- spacemacs.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spacemacs.el b/spacemacs.el index f3cb704..c3e1cff 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -778,8 +778,7 @@ This function is called at the very end of Spacemacs initialization." ;; If there is more than one, they won't work right. '(ledger-reports (quote - (("balance-rs" "ledger -f money.ledger balance Assets Liabilities -V") - ("balance" "ledger -f money.ledger balance Assets Liabilities")))) + (("balance" "ledger -f money.ledger balance Assets Liabilities")))) '(package-selected-packages (quote (selectric-mode ob-rust fireplace writeroom-mode visual-fill-column yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell)))) -- cgit v1.2.3 From 6a655f0ad23f58137d5afdf1282cc23172cd0b20 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 24 Jan 2019 21:56:57 -0200 Subject: RSS. --- newsboat/urls | Bin 1035 -> 1073 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/newsboat/urls b/newsboat/urls index 36efe8d..18f3457 100644 Binary files a/newsboat/urls and b/newsboat/urls differ -- cgit v1.2.3 From aa46dfc6e3a8a1a68ee0614e86fb2b306df91150 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 24 Jan 2019 21:57:15 -0200 Subject: video-feed.sh. --- encrypted/scripts/video-feed.sh | Bin 3071 -> 3158 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/encrypted/scripts/video-feed.sh b/encrypted/scripts/video-feed.sh index a6e17d9..b023b97 100755 Binary files a/encrypted/scripts/video-feed.sh and b/encrypted/scripts/video-feed.sh differ -- cgit v1.2.3 From 2c80d1907acca9febc57281b6771134b36252963 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 3 Feb 2019 07:07:43 -0200 Subject: Change remaining annex submodule path. --- bash/bashrc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/bashrc.sh b/bash/bashrc.sh index eedc2bb..2e68b80 100644 --- a/bash/bashrc.sh +++ b/bash/bashrc.sh @@ -25,7 +25,7 @@ source ~/dev/nu/nucli/nu.bashcompletion env > ~/.spacemacs.env # tmp FIXME: move to mrconfig.ini -export PATH="$HOME/annex/dev/code/songbooks/cli:$PATH" +export PATH="$HOME/dev/libre/songbooks/cli:$PATH" alias sb="songbooks" isLinux && { -- cgit v1.2.3 From d62fc6a2e4d59753f01ed01c7d6e48f804fb370c Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 3 Feb 2019 07:09:07 -0200 Subject: Update Spacemacs generated code. --- spacemacs.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spacemacs.el b/spacemacs.el index c3e1cff..a115c8a 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -776,12 +776,9 @@ This function is called at the very end of Spacemacs initialization." ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(ledger-reports - (quote - (("balance" "ledger -f money.ledger balance Assets Liabilities")))) '(package-selected-packages (quote - (selectric-mode ob-rust fireplace writeroom-mode visual-fill-column yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell)))) + (treemacs-projectile treemacs-evil treemacs ht pfuture yasnippet-snippets yapfify yaml-mode xterm-color ws-butler writeroom-mode winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop selectric-mode seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-rust ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode link-hint json-navigator js2-refactor js-doc jinja2-mode interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flyspell-correct-helm flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fireplace fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode emidje elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. -- cgit v1.2.3 From 73262275665bf9f906bcc5fcfd9c4db1812a4a42 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 3 Feb 2019 07:09:46 -0200 Subject: Toogle fullscreen mode of xmobar with mod-shift-f. --- xmonad/xmonad.hs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index 43e918b..97786c7 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -15,7 +15,7 @@ main = xmonad $ def -- Fullscreen handling: -- https://stackoverflow.com/questions/20446348/xmonad-toggle-fullscreen-xmobar - { manageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook def <+> manageScratchPad + { manageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> (className =? "trayer" --> doIgnore) <+> manageHook def , handleEventHook = handleEventHook def <+> docksEventHook -- , layoutHook = smartBorders $ lessBorders OnlyFloat $ avoidStruts $ layoutHook def , layoutHook = smartBorders $ avoidStruts $ layoutHook def @@ -26,14 +26,6 @@ main = myTerminal = "gnome-terminal" -manageScratchPad :: ManageHook -manageScratchPad = scratchpadManageHook (W.RationalRect l t w h) - where - h = 0.1 -- terminal height, 10% - w = 1 -- terminal width, 100% - t = 1 - h -- distance from top edge, 90% - l = 1 - w -- distance from left edge, 0% - myKeyBindings :: [((ButtonMask, KeySym), X())] myKeyBindings = [ -- XF86MonBrightnessUp @@ -107,13 +99,17 @@ myKeyBindings = -- archive selection (link) in buku , ((mod4Mask, xK_a), spawn "$HOME/dev/libre/dotfiles/scripts/buku-archive.sh >> /tmp/buku-xmonad.log") + + -- toggle appearence of xmobar + -- https://stackoverflow.com/a/27646652 + , ((mod4Mask .|. shiftMask, xK_f), sendMessage ToggleStruts) ] startup :: X() startup = do spawn "xbacklight =100" spawn "xmobar ~/.xmobarrc" - spawn "killall trayer; trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 10 --transparent true --tint 0x191970 --height 17 --monitor 1" + spawn "killall trayer; trayer --edge top --align right --SetDockType false --SetPartialStrut false --expand false --width 10 --transparent true --tint 0x191970 --height 17 --monitor 1" spawn "nm-applet" spawn "~/dev/libre/dotfiles/scripts/once-only-owncloud.sh" setWMName "LG3D" -- https://stackoverflow.com/questions/30742662/java-swing-gui-not-displaying-in-xmonad -- cgit v1.2.3 From 3fb1134c53c2b2a06b3a7f4ff597604df8f627fa Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 3 Feb 2019 07:10:03 -0200 Subject: Add URL in RSS list. --- newsboat/urls | Bin 1073 -> 1107 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/newsboat/urls b/newsboat/urls index 18f3457..0a40e81 100644 Binary files a/newsboat/urls and b/newsboat/urls differ -- cgit v1.2.3 From 5a85c5d6feb53cd9cdf2491f89aa860a9d174373 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 3 Feb 2019 07:10:48 -0200 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 12126 -> 12270 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index 9c789a3..aa46485 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From 4c0f54ea371f5388148db7ea7cba3ff672355728 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 3 Feb 2019 07:11:31 -0200 Subject: video-feed.sh. --- encrypted/scripts/video-feed.sh | Bin 3158 -> 3210 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/encrypted/scripts/video-feed.sh b/encrypted/scripts/video-feed.sh index b023b97..c8c50d2 100755 Binary files a/encrypted/scripts/video-feed.sh and b/encrypted/scripts/video-feed.sh differ -- cgit v1.2.3 From 6ba02593179a5fcd8fdc33081cb12ac262496103 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 3 Feb 2019 13:29:11 -0200 Subject: video-feed.sh. --- encrypted/scripts/video-feed.sh | Bin 3210 -> 3307 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/encrypted/scripts/video-feed.sh b/encrypted/scripts/video-feed.sh index c8c50d2..ebc0b6c 100755 Binary files a/encrypted/scripts/video-feed.sh and b/encrypted/scripts/video-feed.sh differ -- cgit v1.2.3 From 6a4e2e89a4223b30e524d47d0f8a62c88ef9911e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 3 Feb 2019 13:31:07 -0200 Subject: Install python-ly and lame in configuration.nix. --- nixos/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index bcd52a9..5220a2e 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -215,6 +215,8 @@ texlive.combined.scheme-full lilypond + python36Packages.python-ly + lame frescobaldi timidityWithEvenMoreFormats -- cgit v1.2.3 From fbd317953220c081f32df8e521aca6d2ed7d3177 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 8 Feb 2019 00:51:17 -0200 Subject: Cleanup subscriptions. --- encrypted/scripts/video-feed.sh | Bin 3307 -> 3169 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/encrypted/scripts/video-feed.sh b/encrypted/scripts/video-feed.sh index ebc0b6c..5cb7ffb 100755 Binary files a/encrypted/scripts/video-feed.sh and b/encrypted/scripts/video-feed.sh differ -- cgit v1.2.3 From 728e4d2eee8c56ec095ab95cb85c03be515a5496 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 8 Feb 2019 00:51:24 -0200 Subject: Add URL to feed. --- newsboat/urls | Bin 1107 -> 1145 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/newsboat/urls b/newsboat/urls index 0a40e81..d61da21 100644 Binary files a/newsboat/urls and b/newsboat/urls differ -- cgit v1.2.3 From 45b50d7389be137a30ab8e211f57479a16875d4e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 8 Feb 2019 00:51:43 -0200 Subject: Remove description from video download. --- bash/youtube.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/youtube.sh b/bash/youtube.sh index 14d0371..b5bec8c 100644 --- a/bash/youtube.sh +++ b/bash/youtube.sh @@ -15,8 +15,8 @@ download() { --download-archive ~/ownCloud/cache/youtube-dl-seen.conf \ --prefer-free-formats \ --playlist-end "$2" \ - --write-description \ --output "$YT_TEMPLATE" + # --write-description \ } export -f download -- cgit v1.2.3 From 38d858f8f559054902f6039af25959595b57ede7 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 8 Feb 2019 01:05:36 -0200 Subject: Readd write-description. --- bash/youtube.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/youtube.sh b/bash/youtube.sh index b5bec8c..14d0371 100644 --- a/bash/youtube.sh +++ b/bash/youtube.sh @@ -15,8 +15,8 @@ download() { --download-archive ~/ownCloud/cache/youtube-dl-seen.conf \ --prefer-free-formats \ --playlist-end "$2" \ + --write-description \ --output "$YT_TEMPLATE" - # --write-description \ } export -f download -- cgit v1.2.3 From fce8defe3b3d6d64b3a74e074ac4c0018eaa1d87 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 8 Feb 2019 21:18:58 -0200 Subject: video-feed.sh. --- encrypted/scripts/video-feed.sh | Bin 3169 -> 3290 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/encrypted/scripts/video-feed.sh b/encrypted/scripts/video-feed.sh index 5cb7ffb..fc3868b 100755 Binary files a/encrypted/scripts/video-feed.sh and b/encrypted/scripts/video-feed.sh differ -- cgit v1.2.3 From 0bb3522feea9b9d4085ef3586cebcc68a69aeb0e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 1 Mar 2019 16:48:27 -0300 Subject: Add RSS subscription. --- newsboat/urls | Bin 1145 -> 1195 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/newsboat/urls b/newsboat/urls index d61da21..50f2256 100644 Binary files a/newsboat/urls and b/newsboat/urls differ -- cgit v1.2.3 From d1e32636a6e288791a22eb54a1fc8860489c184e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 14 Mar 2019 12:43:36 -0300 Subject: Fix inc_download of youtube.sh. --- bash/youtube.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bash/youtube.sh b/bash/youtube.sh index 14d0371..fe22169 100644 --- a/bash/youtube.sh +++ b/bash/youtube.sh @@ -38,7 +38,6 @@ download_playlist() { } export -f download_playlist - inc_download() { local fn="$1" local id="$2" @@ -46,10 +45,9 @@ inc_download() { local file="$HOME/.yt-db/$id" mkdir -p "$HOME/.yt-db" - n_count="$(cat "$file" 2> /dev/null || printf 10)" - local n_count - n_count_new="$((n_count + step))" - local n_count_new + cat "$file" 2> /dev/null + local n_count="$(cat "$file" 2> /dev/null || printf 10)" + local n_count_new="$((n_count + step))" echo "$n_count_new" > "$file" -- cgit v1.2.3 From 41f019a35a25fb6f9ffd313830008ae85046560a Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 14 Mar 2019 12:44:09 -0300 Subject: video-feed.sh. --- encrypted/scripts/video-feed.sh | Bin 3290 -> 3214 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/encrypted/scripts/video-feed.sh b/encrypted/scripts/video-feed.sh index fc3868b..6ed5a57 100755 Binary files a/encrypted/scripts/video-feed.sh and b/encrypted/scripts/video-feed.sh differ -- cgit v1.2.3 From 93441ebbde6eeb536b4234a5a5b6b04c8433ebb6 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 14 Mar 2019 12:44:27 -0300 Subject: Remove gpaste. --- nixos/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 5220a2e..adcfd7e 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -301,6 +301,7 @@ androidsdk_extras androidndk pkgsUnstable.patchwork-classic + # gnome3.gpaste ## Cryptocururencies @@ -378,7 +379,7 @@ gnome-keyring.enable = true; seahorse.enable = true; gnome-terminal-server.enable = true; - gpaste.enable = true; # clipboard manager + # gpaste.enable = true; # clipboard manager tracker.enable = true; sushi.enable = true; # nautilus previewer gnome-online-accounts.enable = true; -- cgit v1.2.3 From f830325cdffd646a548f654a7c28417414f20967 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 14 Mar 2019 12:44:35 -0300 Subject: Uninstall Tor browser. --- nixos/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index adcfd7e..7043ce0 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -294,7 +294,7 @@ vlc keepassx2-http yubioath-desktop - tor-browser-bundle-bin + # tor-browser-bundle-bin transmission_gtk libreoffice android-studio -- cgit v1.2.3 From 6f01fc2debc1de3a3c108007b2796941546b0f99 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 14 Mar 2019 12:45:18 -0300 Subject: SSH vagrant config. --- ssh_config.conf | Bin 83 -> 231 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ssh_config.conf b/ssh_config.conf index 298ac3b..2d025d6 100644 Binary files a/ssh_config.conf and b/ssh_config.conf differ -- cgit v1.2.3 From 31afffa0cdd1b31029b6954e02aa9cdef2a3a7b9 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 23 Mar 2019 23:01:01 -0300 Subject: Add vpn tmuxinator template. --- encrypted/nu/tmux/projects/vpn.yml | Bin 0 -> 239 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 encrypted/nu/tmux/projects/vpn.yml diff --git a/encrypted/nu/tmux/projects/vpn.yml b/encrypted/nu/tmux/projects/vpn.yml new file mode 100644 index 0000000..4febb54 Binary files /dev/null and b/encrypted/nu/tmux/projects/vpn.yml differ -- cgit v1.2.3 From f293e3203f934c92fb8bc9422a34ed1317fba578 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 23 Mar 2019 23:01:12 -0300 Subject: Add sshuttle package (for VPN network). --- encrypted/SSH/known_hosts.txt | Bin 4114 -> 4289 bytes nixos/configuration.nix | 1 + 2 files changed, 1 insertion(+) diff --git a/encrypted/SSH/known_hosts.txt b/encrypted/SSH/known_hosts.txt index 79c3e9e..ec99d68 100644 Binary files a/encrypted/SSH/known_hosts.txt and b/encrypted/SSH/known_hosts.txt differ diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 7043ce0..18831f9 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -313,6 +313,7 @@ ## nu specific packages + sshuttle slack chromium ]; -- cgit v1.2.3 From c779a8244dbc41138c2c485a7f7a16a5a1b15b73 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 23 Mar 2019 23:32:05 -0300 Subject: Add cozy audiobook package. --- nixos/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 18831f9..f5b38b3 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -286,6 +286,7 @@ inkscape calibre + pkgsUnstable.cozy rhythmbox gpodder firefox -- cgit v1.2.3 From 63273ef0e6bff06ec8cd91baa8751ea7ecbad0aa Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Apr 2019 18:39:33 -0300 Subject: mrconfig.ini. --- git/mrconfig.ini | Bin 12270 -> 12148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/git/mrconfig.ini b/git/mrconfig.ini index aa46485..053db14 100644 Binary files a/git/mrconfig.ini and b/git/mrconfig.ini differ -- cgit v1.2.3 From 84ef92c909868f09b8f3d89621eb03e981250a2a Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Apr 2019 18:43:11 -0300 Subject: Fix shellcheck warnings. --- bash/youtube.sh | 3 ++- scripts/atom.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bash/youtube.sh b/bash/youtube.sh index fe22169..275e0b8 100644 --- a/bash/youtube.sh +++ b/bash/youtube.sh @@ -46,7 +46,8 @@ inc_download() { local file="$HOME/.yt-db/$id" mkdir -p "$HOME/.yt-db" cat "$file" 2> /dev/null - local n_count="$(cat "$file" 2> /dev/null || printf 10)" + local n_count + n_count="$(cat "$file" 2> /dev/null || printf 10)" local n_count_new="$((n_count + step))" echo "$n_count_new" > "$file" diff --git a/scripts/atom.sh b/scripts/atom.sh index 4d09815..6ca4110 100755 --- a/scripts/atom.sh +++ b/scripts/atom.sh @@ -12,7 +12,7 @@ LINKS_OUT="$RSS_DIR/gen/buku.urls" mkdir -p "$RSS_DIR/gen" # Empty the text file -> "$LINKS_OUT" +true > "$LINKS_OUT" feed() { local tag="$1" -- cgit v1.2.3 From 817178e5c04563398708dd6dfe2128a915d5d1f8 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Apr 2019 18:48:40 -0300 Subject: Use debian instead of NixOS. --- .build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.build.yml b/.build.yml index 4f3c8ce..43cde57 100644 --- a/.build.yml +++ b/.build.yml @@ -1,4 +1,6 @@ -image: nixos/latest +image: debian/stretch +packages: + - curl triggers: - condition: failure action: email @@ -6,6 +8,9 @@ triggers: sources: - https://git.sr.ht/~euandreh/dotfiles tasks: + - setup: | + wget -O- https://nixos.org/nix/install | sh + echo '. ~/.nix-profile/etc/profile.d/nix.sh' >> ~/.buildenv - tests: | cd dotfiles/ nix-build -A test -- cgit v1.2.3 From 1dcc6a9408f52653a6e22ea5de01832c2999b90f Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Apr 2019 18:53:55 -0300 Subject: dbg NixOS build. --- .build.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.build.yml b/.build.yml index 43cde57..6987493 100644 --- a/.build.yml +++ b/.build.yml @@ -1,6 +1,6 @@ -image: debian/stretch +image: nixos/latest packages: - - curl + - shellcheck triggers: - condition: failure action: email @@ -8,9 +8,7 @@ triggers: sources: - https://git.sr.ht/~euandreh/dotfiles tasks: - - setup: | - wget -O- https://nixos.org/nix/install | sh - echo '. ~/.nix-profile/etc/profile.d/nix.sh' >> ~/.buildenv - tests: | cd dotfiles/ + which shellcheck nix-build -A test -- cgit v1.2.3 From ffe685dc83ee22783a178ef3eb6775a340ce8971 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Apr 2019 18:59:40 -0300 Subject: Add NixOS unstable channel. --- .build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.build.yml b/.build.yml index 6987493..8ff6edf 100644 --- a/.build.yml +++ b/.build.yml @@ -1,4 +1,6 @@ -image: nixos/latest +image: nixos/unstable +repositories: + unstable: https://nixos.org/channels/nixos-unstable packages: - shellcheck triggers: -- cgit v1.2.3 From 2a92f3312248b2b4ddff5a6df20139a52eb02405 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Apr 2019 19:03:40 -0300 Subject: Add nixpkgs.prefix. --- .build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build.yml b/.build.yml index 8ff6edf..27e59fc 100644 --- a/.build.yml +++ b/.build.yml @@ -2,7 +2,7 @@ image: nixos/unstable repositories: unstable: https://nixos.org/channels/nixos-unstable packages: - - shellcheck + - nixpkgs.shellcheck triggers: - condition: failure action: email -- cgit v1.2.3 From a434d49d4b32bd1eaaba60d082511de9101fb539 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Apr 2019 19:04:36 -0300 Subject: Remove shellcheck pkgs. --- .build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.build.yml b/.build.yml index 27e59fc..5225d44 100644 --- a/.build.yml +++ b/.build.yml @@ -1,8 +1,6 @@ image: nixos/unstable repositories: unstable: https://nixos.org/channels/nixos-unstable -packages: - - nixpkgs.shellcheck triggers: - condition: failure action: email -- cgit v1.2.3 From aa408b464311b57538808f0f470998a174566d81 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Apr 2019 19:06:19 -0300 Subject: Remove =which shellcheck=. --- .build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.build.yml b/.build.yml index 5225d44..3e4c585 100644 --- a/.build.yml +++ b/.build.yml @@ -10,5 +10,4 @@ sources: tasks: - tests: | cd dotfiles/ - which shellcheck nix-build -A test -- cgit v1.2.3 From edbd14ec6c4c9dbf585a658d0d2580b85ae324aa Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Apr 2019 19:09:08 -0300 Subject: Use nixpkgs repository. --- .build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build.yml b/.build.yml index 3e4c585..ee25164 100644 --- a/.build.yml +++ b/.build.yml @@ -1,6 +1,6 @@ image: nixos/unstable repositories: - unstable: https://nixos.org/channels/nixos-unstable + nixpkgs: https://nixos.org/channels/nixpkgs-unstable triggers: - condition: failure action: email -- cgit v1.2.3 From 8066b7a666943dab0aed422f1e595bd926a4a745 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Apr 2019 19:12:30 -0300 Subject: Replace =! -z= for =-n=. --- scripts/buku-archive.sh | 2 +- scripts/buku-delete.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/buku-archive.sh b/scripts/buku-archive.sh index 6ce1e80..2a2a702 100755 --- a/scripts/buku-archive.sh +++ b/scripts/buku-archive.sh @@ -21,7 +21,7 @@ for bookmark in $BOOKMARKS; do done -if [[ ! -z "$BOOKMARK_ID" ]]; then +if [[ -n "$BOOKMARK_ID" ]]; then echo "Archiving $BOOKMARK_ID (URL: $SEL)." buku -u "$BOOKMARK_ID" --tag - ril buku -u "$BOOKMARK_ID" --tag + simple-archive diff --git a/scripts/buku-delete.sh b/scripts/buku-delete.sh index 552d6b0..01de451 100755 --- a/scripts/buku-delete.sh +++ b/scripts/buku-delete.sh @@ -21,7 +21,7 @@ for bookmark in $BOOKMARKS; do done -if [[ ! -z "$BOOKMARK_ID" ]]; then +if [[ -n "$BOOKMARK_ID" ]]; then echo "Deleting $BOOKMARK_ID (URL: $SEL)." buku -d "$BOOKMARK_ID" --tacit else -- cgit v1.2.3 From 07e41aa9d567020080e51ff6a394f1cc30792844 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Apr 2019 21:12:18 -0300 Subject: Split vagrant cmds. --- encrypted/nu/tmux/projects/vpn.yml | Bin 239 -> 326 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/encrypted/nu/tmux/projects/vpn.yml b/encrypted/nu/tmux/projects/vpn.yml index 4febb54..0e9ead1 100644 Binary files a/encrypted/nu/tmux/projects/vpn.yml and b/encrypted/nu/tmux/projects/vpn.yml differ -- cgit v1.2.3