🎨 merge mbpr changes

.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"
+}

.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"

.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

.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

.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'

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
@@ -6,6 +9,37 @@ 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
+
+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
+
+setup_editorconfig:
+	ln -s -f ~/dotfiles/.editorconfig ~/.editorconfig

ubuntu.md

@@ -3,12 +3,29 @@ 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
 sudo apt install ffmpeg
+sudo apt install keepass2
 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
 ```
+
+## Homebrew casks
+
+> :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