From 15fe4c40ece9ead5988a4b55a1632cd1bdb805af Mon Sep 17 00:00:00 2001 From: Daniel Thoren Date: Mon, 16 May 2022 13:29:02 +0000 Subject: [PATCH 01/13] Update ubuntu.md --- ubuntu.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu.md b/ubuntu.md index 667d7fa..d57b122 100644 --- a/ubuntu.md +++ b/ubuntu.md @@ -3,9 +3,9 @@ All the startup installation stuff for ubuntu clients. ``` sudo apt install git sudo apt install neovim -sudo apt install librewolf +sudo apt install librewolf # add librewolf repo first sudo apt install gnome-tweaks -sudo apt install alacritty +sudo apt install alacritty # add alacritty repo first sudo apt install tmux sudo apt install make sudo apt install curl From bb46d0b7a946f21ccd9e5cc8688e540c8d341dd1 Mon Sep 17 00:00:00 2001 From: Daniel Thoren Date: Mon, 16 May 2022 13:32:45 +0000 Subject: [PATCH 02/13] Update ubuntu.md --- ubuntu.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ubuntu.md b/ubuntu.md index d57b122..ae9deae 100644 --- a/ubuntu.md +++ b/ubuntu.md @@ -3,12 +3,12 @@ All the startup installation stuff for ubuntu clients. ``` sudo apt install git sudo apt install neovim -sudo apt install librewolf # add librewolf repo first +sudo apt install librewolf # add librewolf repo first sudo apt install gnome-tweaks -sudo apt install alacritty # add alacritty repo first +sudo apt install alacritty # add alacritty repo first sudo apt install tmux sudo apt install make sudo apt install curl sudo apt install ffmpeg -sudo apt install zsh # install oh-my-zsh to set zsh as default shell +sudo apt install zsh # install oh-my-zsh to set zsh as default shell ``` From 0be89471b0f5e38af81fd76633ec7986b1581005 Mon Sep 17 00:00:00 2001 From: "dth@taiga.ai" Date: Tue, 17 May 2022 11:09:16 +0200 Subject: [PATCH 03/13] :memo: add administration vimwiki --- .config/nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 29caf5c..7f33e01 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -45,7 +45,7 @@ let g:syntastic_python_checkers = ['python', 'flake8'] let g:syntastic_python_python_exec = 'python3' " VimWiki setup -let g:vimwiki_list = [{'path':'$HOME/.local/share/nvim/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}, {'path':'$HOME/methodology/', 'syntax': 'markdown', 'ext': '.md'}] +let g:vimwiki_list = [{'path':'$HOME/.local/share/nvim/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}, {'path':'$HOME/methodology/', 'syntax': 'markdown', 'ext': '.md'}, {'path':'$HOME/administration/', 'syntax': 'markdown', 'ext': '.md'}] let g:vimwiki_sync_branch = "main" let g:vimwiki_sync_commit_message = '$USER @ $HOST' let g:sync_taskwarrior = 0 From dfc5f3499e1e64d69e50a716333cf42b57c3f953 Mon Sep 17 00:00:00 2001 From: "dth@taiga.ai" Date: Tue, 17 May 2022 11:15:38 +0200 Subject: [PATCH 04/13] :sparkles: add make rule to setup vimwikis --- makefile | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/makefile b/makefile index 46d7372..57b1548 100644 --- a/makefile +++ b/makefile @@ -6,6 +6,27 @@ setup_tmux_a: echo "configuring tmux with 'a' as prefix" ln -s -f ~/dotfiles/.tmux.conf ~/.tmux.conf -setup_nvim: +setup_git: + git config --global user.email "DannyDannyDanny" + git config --global user.name "dth@taiga.ai" + + +setup_vimwiki1: + rm -rf ~/.local/share/nvim/vimwiki/ + git clone git@github.com:DannyDannyDanny/vimwiki.git ~/.local/share/nvim/vimwiki/ + + +setup_vimwiki2: + rm -rf ~/methodology/ + git clone git@github.com:DannyDannyDanny/methodology.git ~/methodology/ + + +setup_vimwiki3: + rm -rf ~/administration/ + git clone git@github.com:taigacompany/administration.git ~/administration/ + + +setup_nvim: setup_vimwiki1 setup_vimwiki2 setup_vimwiki3 + echo "configuring nvim" mkdir -p ~/.config/nvim ln -s -f ~/dotfiles/.config/nvim/init.vim ~/.config/nvim/init.vim From b02a6f06fe4d9a9f752bf9cc7cac69d6edc1be69 Mon Sep 17 00:00:00 2001 From: "dth@taiga.ai" Date: Tue, 17 May 2022 12:30:58 +0200 Subject: [PATCH 05/13] :boom: add failing music config --- .config/mpd/mpd.conf | 52 ++++++++++++++++++++++++++++++++++++++++++ .config/ncmpcpp/config | 27 ++++++++++++++++++++++ makefile | 7 ++++++ ubuntu.md | 10 ++++++++ 4 files changed, 96 insertions(+) create mode 100644 .config/mpd/mpd.conf create mode 100644 .config/ncmpcpp/config diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf new file mode 100644 index 0000000..b82cffb --- /dev/null +++ b/.config/mpd/mpd.conf @@ -0,0 +1,52 @@ +# Recommended location for database +db_file "~/.config/mpd/database" + +# If running mpd using systemd, delete this line to log directly to systemd. +log_file "syslog" + +# The music directory is by default the XDG directory, uncomment to amend and choose a different directory +#music_directory "~/music" + +# Uncomment to refresh the database whenever files in the music_directory are changed +#auto_update "yes" + +# Uncomment to enable the functionalities +#playlist_directory "~/.config/mpd/playlists" +#pid_file "~/.config/mpd/pid" +#state_file "~/.config/mpd/state" +#sticker_file "~/.config/mpd/sticker.sql" + +audio_output { + type "pulse" + name "My pulse Device" + device "hw:0,0" # optional + format "44100:16:2" # optional + mixer_device "default" # optional + mixer_control "PCM" # optional + mixer_index "0" # optional +} +audio_output { + type "pulse" + name "MPD" +# server "remote_server" # optional +# sink "remote_server_sink" # optional +} +audio_output { +type "pulse" +name "My pulse EQ" +auto_resample "no" +use_mmap "yes" +device "plug:plugequal" +format "44100:16:2" # optional +mixer_device "default" # optional +mixer_control "PCM" # optional +mixer_index "0" # optional +} +mixer_type "software" + +audio_output { +type "fifo" +name "FIFO" +path "/tmp/mpd.fifo" +format "44100:16:2" +} diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config new file mode 100644 index 0000000..91ef249 --- /dev/null +++ b/.config/ncmpcpp/config @@ -0,0 +1,27 @@ +mpd_music_dir = "~/Music/" +ncmpcpp_directory = "~/.config/ncmpcpp" +lyrics_directory = "~/.config/ncmpcpp/lyrics" +#execute_on_song_change = "~/.ncmpcpp/songchange.sh" + +## Unsupported mouse ## +mouse_support = "yes" +mouse_list_scroll_whole_page = "yes" + +## Navigation ## +cyclic_scrolling = "yes" +header_text_scrolling = "yes" +jump_to_now_playing_song_at_start = "yes" +lines_scrolled = "2" + +## Other ## +system_encoding = "utf-8" +regular_expressions = "extended" + +## +## Appearance +## Other ## +now_playing_prefix = "❥ " +progressbar_look = "───" +colors_enabled = "yes" +autocenter_mode = "yes" +centered_cursor = "yes" diff --git a/makefile b/makefile index 57b1548..b924ff5 100644 --- a/makefile +++ b/makefile @@ -30,3 +30,10 @@ setup_nvim: setup_vimwiki1 setup_vimwiki2 setup_vimwiki3 echo "configuring nvim" mkdir -p ~/.config/nvim ln -s -f ~/dotfiles/.config/nvim/init.vim ~/.config/nvim/init.vim + +setup_music: + mkdir -p ~/.config/mpd/playlists/ + mkdir -p ~/.mpd + ln -s -f ~/dotfiles/.config/mpd/mpd.conf ~/.config/mpd/mpd.conf + mkdir -p ~/.config/ncmpcpp/ + ln -s -f ~/dotfiles/.config/ncmpcpp/config ~/.config/ncmpcpp/config diff --git a/ubuntu.md b/ubuntu.md index ae9deae..c2ec2fc 100644 --- a/ubuntu.md +++ b/ubuntu.md @@ -11,4 +11,14 @@ sudo apt install make sudo apt install curl sudo apt install ffmpeg sudo apt install zsh # install oh-my-zsh to set zsh as default shell + +# music setup +sudo apt-get install mpd +sudo apt-get install ncmpcpp +``` + +## Snap Apps + +``` +sudo snap install yt-dlp ``` From d8a01378e23f481580ccb6ac7a828dc6615b42a9 Mon Sep 17 00:00:00 2001 From: "dth@taiga.ai" Date: Tue, 17 May 2022 12:31:22 +0200 Subject: [PATCH 06/13] :memo: add .editorconfig --- .editorconfig | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..350cd93 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,35 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +indent_size = 2 +indent_style = space + +# Matches multiple files with brace expansion notation +# Set default charset +[*.{js,py}] +charset = utf-8 + +# 4 space indentation +[*.py] +indent_style = space +indent_size = 4 + +# Tab indentation (no size specified) +[Makefile] +indent_style = tab + +# Indentation override for all JS under lib directory +[lib/**.js] +indent_style = space +indent_size = 2 + +# Matches the exact files either package.json or .travis.yml +[{package.json,.travis.yml}] +indent_style = space +indent_size = 2 From 480e71f2b8329fdf7cc0338ce453172239231655 Mon Sep 17 00:00:00 2001 From: "dth@taiga.ai" Date: Tue, 17 May 2022 13:06:43 +0200 Subject: [PATCH 07/13] :memo: git add editorconfig make rule --- makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makefile b/makefile index b924ff5..00ff35b 100644 --- a/makefile +++ b/makefile @@ -37,3 +37,6 @@ setup_music: ln -s -f ~/dotfiles/.config/mpd/mpd.conf ~/.config/mpd/mpd.conf mkdir -p ~/.config/ncmpcpp/ ln -s -f ~/dotfiles/.config/ncmpcpp/config ~/.config/ncmpcpp/config + +setup_editorconfig: + ln -s -f ~/dotfiles/.editorconfig ~/.editorconfig From 05538a0630a882adc5f29f66a559b53c70a7e08e Mon Sep 17 00:00:00 2001 From: "dth@taiga.ai" Date: Tue, 17 May 2022 14:10:52 +0200 Subject: [PATCH 08/13] :memo: add keepass install to ubuntu' --- ubuntu.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ubuntu.md b/ubuntu.md index c2ec2fc..3086ace 100644 --- a/ubuntu.md +++ b/ubuntu.md @@ -10,6 +10,7 @@ sudo apt install tmux sudo apt install make sudo apt install curl sudo apt install ffmpeg +sudo apt install keepass2 sudo apt install zsh # install oh-my-zsh to set zsh as default shell # music setup From d8ffae3881661cab229be700594e91424df698ed Mon Sep 17 00:00:00 2001 From: "dth@taiga.ai" Date: Wed, 18 May 2022 12:42:20 +0200 Subject: [PATCH 09/13] :art: replace snap with homebrew --- ubuntu.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ubuntu.md b/ubuntu.md index 3086ace..e3f4098 100644 --- a/ubuntu.md +++ b/ubuntu.md @@ -18,8 +18,14 @@ sudo apt-get install mpd sudo apt-get install ncmpcpp ``` -## Snap Apps +## Homebrew casks -``` -sudo snap install yt-dlp -``` +> :construction: I'm still forming opinions but here's the rundown +> 1. snap is opinionated +> 2. snap is slow +> 3. homebrew / brew has been great on Mac +> 4. already have brewfile +> 5. homebrew also works on WSL +> 6. snap apps have been unable to detect ffmpeg (even when it is in my path) + +* Install yt-dlp From cd35df5b28d9fbe8f925a191cc48c4cfcb4ed725 Mon Sep 17 00:00:00 2001 From: "dth@taiga.ai" Date: Wed, 18 May 2022 14:01:52 +0200 Subject: [PATCH 10/13] :art: start calendar.vim on mondays and add w.no.s --- .config/nvim/init.vim | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 7f33e01..2a9b222 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -50,6 +50,10 @@ let g:vimwiki_sync_branch = "main" let g:vimwiki_sync_commit_message = '$USER @ $HOST' let g:sync_taskwarrior = 0 +" Calendar setup +let g:calendar_first_day = 'monday' " set monday as first day of week +let g:calendar_week_number = 1 " add weeknumber + " LARBS inspired below set title set bg=light @@ -138,17 +142,17 @@ set noshowcmd cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' edit! " Enable Goyo by default for mutt writing - autocmd BufRead,BufNewFile /tmp/neomutt* let g:goyo_width=80 - autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo | set bg=light - autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x! - autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q! + autocmd BufRead,BufNewFile /tmp/neomutt* let g:goyo_width=80 + autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo | set bg=light + autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x! + autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q! " Automatically deletes all trailing whitespace and newlines at end of file on save. & reset cursor position - autocmd BufWritePre * let currPos = getpos(".") - autocmd BufWritePre * %s/\s\+$//e - autocmd BufWritePre * %s/\n\+\%$//e - autocmd BufWritePre *.[ch] %s/\%$/\r/e - autocmd BufWritePre * cal cursor(currPos[1], currPos[2]) + autocmd BufWritePre * let currPos = getpos(".") + autocmd BufWritePre * %s/\s\+$//e + autocmd BufWritePre * %s/\n\+\%$//e + autocmd BufWritePre *.[ch] %s/\%$/\r/e + autocmd BufWritePre * cal cursor(currPos[1], currPos[2]) " When shortcut files are updated, renew bash and ranger configs with new material: autocmd BufWritePost bm-files,bm-dirs !shortcuts From f5b96b8a9194c19b22a090facfdc84547a2a6f8b Mon Sep 17 00:00:00 2001 From: "dth@taiga.ai" Date: Wed, 18 May 2022 14:05:44 +0200 Subject: [PATCH 11/13] :bug: fix wrong comment syntax --- .zshrc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.zshrc b/.zshrc index 88fdb8d..997839a 100644 --- a/.zshrc +++ b/.zshrc @@ -1,10 +1,10 @@ -" README: -" If zsh is not yet installed: -" https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH -" If oh-my-zsh is not yet installed: -" https://ohmyz.sh/#install -" During zsh setup, a `.zhrc` file is generated and left in the root. -" The following .zshrc content should extend (rather than replace) your `.zshrc`. +# README: +# If zsh is not yet installed: +# https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH +# If oh-my-zsh is not yet installed: +# https://ohmyz.sh/#install +# During zsh setup, a `.zhrc` file is generated and left in the root. +# The following .zshrc content should extend (rather than replace) your `.zshrc`. # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH From 6b369dfa15870f1aa7926f975dcab6dd806f5234 Mon Sep 17 00:00:00 2001 From: "dth@taiga.ai" Date: Wed, 18 May 2022 14:08:51 +0200 Subject: [PATCH 12/13] :recycle: add zsh setup make-rule --- makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makefile b/makefile index 00ff35b..15fa255 100644 --- a/makefile +++ b/makefile @@ -1,3 +1,6 @@ +setup_zshrc: + ln -s -f ~/dotfiles/.zshrc ~/.zshrc + setup_alacritty: mkdir -p ~/.config/alacritty ln -s -f ~/dotfiles/.config/alacritty/alacritty.yml ~/.config/alacritty/alacritty.yml From 8d3c4e9888fdc4f5b3f143c724d1bf27587fbcf7 Mon Sep 17 00:00:00 2001 From: "dth@taiga.ai" Date: Wed, 18 May 2022 14:31:45 +0200 Subject: [PATCH 13/13] :bug: update old .zshrc --- .zshrc | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/.zshrc b/.zshrc index 997839a..06ffb72 100644 --- a/.zshrc +++ b/.zshrc @@ -1,21 +1,14 @@ -# README: -# If zsh is not yet installed: -# https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH -# If oh-my-zsh is not yet installed: -# https://ohmyz.sh/#install -# During zsh setup, a `.zhrc` file is generated and left in the root. -# The following .zshrc content should extend (rather than replace) your `.zshrc`. # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH="/Users/dth/.oh-my-zsh" +export ZSH="$HOME/.oh-my-zsh" # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, # to know which specific one was loaded, run: echo $RANDOM_THEME # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -ZSH_THEME="sunaku" # set by `omz` +ZSH_THEME="xiong-chiamiov" # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load @@ -30,14 +23,13 @@ ZSH_THEME="sunaku" # set by `omz` # Case-sensitive completion must be off. _ and - will be interchangeable. # HYPHEN_INSENSITIVE="true" -# Uncomment the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to automatically update without prompting. -# DISABLE_UPDATE_PROMPT="true" +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +zstyle ':omz:update' mode auto # update automatically without asking +# zstyle ':omz:update' mode reminder # just remind me to update when it's time # Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 +# zstyle ':omz:update' frequency 13 # Uncomment the following line if pasting URLs and other text is messed up. # DISABLE_MAGIC_FUNCTIONS="true" @@ -90,11 +82,12 @@ source $ZSH/oh-my-zsh.sh # export LANG=en_US.UTF-8 # Preferred editor for local and remote sessions -if [[ -n $SSH_CONNECTION ]]; then - export EDITOR='vim' -else - export EDITOR='mvim' -fi +export EDITOR='nvim' +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi # Compilation flags # export ARCHFLAGS="-arch x86_64" @@ -114,4 +107,3 @@ alias docos="docker compose -f docker-compose.staging.yml" # use vim bindings bindkey -v -alias config='/usr/bin/git --git-dir=/Users/dth/.cfg/ --work-tree=/Users/dth'