From a332abf1d164f9232b9e352de3f3ec5c33f77d05 Mon Sep 17 00:00:00 2001
From: Michael Zhang <mail@mzhang.io>
Date: Sat, 14 Aug 2021 23:06:07 -0500
Subject: [PATCH] d

---
 dot_config/i3/private_config               |  1 -
 dot_config/i3blocks/executable_config      |  5 +++++
 dot_config/nix/executable_nix.conf         |  2 ++
 dot_config/nvim/coc-settings.json          | 17 ++++++++++++-----
 dot_config/nvim/init.vim                   |  1 +
 dot_local/scripts/executable_screenshot.sh |  2 +-
 dot_local/scripts/zsh/aliases.zsh          |  2 ++
 dot_wakatime.cfg                           |  2 +-
 dot_zshrc                                  |  1 +
 9 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 dot_config/nix/executable_nix.conf

diff --git a/dot_config/i3/private_config b/dot_config/i3/private_config
index f498e61..bbe885f 100644
--- a/dot_config/i3/private_config
+++ b/dot_config/i3/private_config
@@ -45,7 +45,6 @@ exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 exec --no-startup-id nm-applet
 exec --no-startup-id feh --bg-fill $HOME/.config/i3/wallpaper.jpg
 # exec --no-startup-id polybar -r michael
-exec --no-startup-id dunst
 exec --no-startup-id i3-msg 'workspace 10; exec rocketchat-desktop;'
 exec --no-startup-id dex -a
 
diff --git a/dot_config/i3blocks/executable_config b/dot_config/i3blocks/executable_config
index e325e30..98fa827 100644
--- a/dot_config/i3blocks/executable_config
+++ b/dot_config/i3blocks/executable_config
@@ -1,3 +1,8 @@
+[memory]
+command=/usr/lib/i3blocks/memory/memory
+label=MEM
+interval=20
+
 [weather]
 command=curl -Ss "https://wttr.in/55404?m&format=%25c%25C+%25t+%25p\n"
 interval=3600
diff --git a/dot_config/nix/executable_nix.conf b/dot_config/nix/executable_nix.conf
new file mode 100644
index 0000000..9d92a7a
--- /dev/null
+++ b/dot_config/nix/executable_nix.conf
@@ -0,0 +1,2 @@
+experimental-features = nix-command flakes
+
diff --git a/dot_config/nvim/coc-settings.json b/dot_config/nvim/coc-settings.json
index 4f3b752..0c0eaee 100644
--- a/dot_config/nvim/coc-settings.json
+++ b/dot_config/nvim/coc-settings.json
@@ -3,11 +3,11 @@
     "python.venvFolders": ["~/.local/share/virtualenvs"],
     "rust-analyzer.diagnostics.disabled": ["unresolved-proc-macro"],
     "languageserver": {
-  "ocaml-lsp": {
-    "command": "opam",
-    "args": ["config", "exec", "--", "ocamllsp"],
-    "filetypes": ["ocaml", "reason"]
-  },
+        "ocaml-lsp": {
+            "command": "opam",
+            "args": ["config", "exec", "--", "ocamllsp"],
+            "filetypes": ["ocaml", "reason"]
+        },
         "haskell": {
             "command": "ghcide",
             "args": [
@@ -25,6 +25,13 @@
                 "lhs",
                 "haskell"
             ]
+        },
+        "fstar": {
+            "command": "fstar.exe",
+            "args": ["--lsp"],
+            "rootPatterns": [],
+            "trace.server": "verbose",
+            "filetypes": ["fst", "fsti"]
         }
     }
 }
diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim
index d9ab607..b9ab80b 100644
--- a/dot_config/nvim/init.vim
+++ b/dot_config/nvim/init.vim
@@ -19,6 +19,7 @@ Plug 'FStarLang/VimFStar', {'for': 'fstar'}
 " Plug 'kovisoft/slimv', { 'for': 'lisp' }
 " Plug 'leafOfTree/vim-svelte-plugin'
 " Plug 'JuliaEditorSupport/julia-vim'
+Plug 'FStarLang/VimFStar', {'for': 'fstar'}
 
 " Plug 'mhinz/vim-startify'
 Plug 'tomasiser/vim-code-dark'
diff --git a/dot_local/scripts/executable_screenshot.sh b/dot_local/scripts/executable_screenshot.sh
index d4b847d..5699be5 100644
--- a/dot_local/scripts/executable_screenshot.sh
+++ b/dot_local/scripts/executable_screenshot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-SCREENSHOT=$HOME/.cargo/bin/leanshot
+SCREENSHOT=leanshot
 # choose some file to save it to
 FILENAME="$(date +%Y-%m-%d-%H:%M:%S).png"
 FILE="$HOME/Screenshots/$FILENAME"
diff --git a/dot_local/scripts/zsh/aliases.zsh b/dot_local/scripts/zsh/aliases.zsh
index d008eee..c44c4e5 100644
--- a/dot_local/scripts/zsh/aliases.zsh
+++ b/dot_local/scripts/zsh/aliases.zsh
@@ -2,6 +2,8 @@ command_exists exa && alias ls="exa"
 command_exists garbage && alias rm="garbage put"
 alias cm="chezmoi"
 alias kill-gpg-agent="gpgconf --kill gpg-agent"
+alias dcompose="docker-compose"
+alias ytmp3="youtube-dl --extract-audio --audio-format mp3 --embed-thumbnail --add-metadata"
 
 function ced() {
     # if the file doesn't exist, prompt to make a new one
diff --git a/dot_wakatime.cfg b/dot_wakatime.cfg
index f792e95..36386f3 100644
--- a/dot_wakatime.cfg
+++ b/dot_wakatime.cfg
@@ -1,3 +1,3 @@
 [settings]
-api_url=http://localhost:5800/api/v1/heartbeats.bulk
+api_url=http://localhost:5800/api
 api_key=a2b783b6-f6ae-4a58-8cb8-63cc2921ac16
diff --git a/dot_zshrc b/dot_zshrc
index 1fbf8c9..33fc112 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -61,6 +61,7 @@ fi
 
 source_if_exists $HOME/.local/scripts/zsh/aliases.zsh
 [ -f "$HOME/.zsh/extras" ] && source $HOME/.zsh/extras/*.zsh
+if [ -e /home/michael/.nix-profile/etc/profile.d/nix.sh ]; then . /home/michael/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
 
 source <(chezmoi completion zsh)
 # vim: set filetype=zsh: