.bash_aliases/all

@@ -1,4 +1,3 @@
-# shellcheck shell=bash
 # vim: set ft=bash :
 
 # Alias aliases

.bash_aliases/dualboot

@@ -1,4 +1,3 @@
-# shellcheck shell=bash
 # vim: set ft=bash :
 
 reboot-to-windows ()

.bash_aliases/hosts/flex-arch

@@ -1,4 +1,3 @@
-# shellcheck shell=bash
 # vim: set ft=bash :
 
 source "$HOME/.bash_aliases/dualboot"

.bashrc.d/editor

@@ -1,4 +1,3 @@
-# shellcheck shell=bash
 # vim: set ft=bash :
 
 # Set NeoVim as default editor

.bashrc.d/hosts/flex-arch

@@ -1,5 +1,4 @@
-# shellcheck shell=bash
-# vim: set ft=bash :
+# Laptop configuration
 
 # >>> mamba initialize >>>
 # !! Contents within this block are managed by 'mamba init' !!

.bashrc.d/prompt

@@ -1,6 +1,4 @@
-# shellcheck shell=bash
 # vim: set ft=bash :
-
 get_branch_name() {
   git symbolic-ref --quiet --short HEAD 2>/dev/null \
     || git rev-parse --short HEAD 2>/dev/null \

.bin/calc

@@ -1,3 +0,0 @@
-#!/usr/env/bin bash
-
-ipython -i /home/h/.bin/calc.py

.config/nvim/init.lua

@@ -1,6 +1,5 @@
-require("vim")
-require("ftdetect")
-require("keymaps")
-require("highlight")
-
--- vim.opt.background = "dark"
+vim.cmd([[
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
+source ~/.vimrc"
+]])

.config/nvim/lua/ftdetect.lua

@@ -1,5 +0,0 @@
-vim.filetype.add({
-  filename = {
-    [".lintstagedrc"] = "json",
-  },
-})

.config/nvim/lua/highlight.lua

@@ -1,14 +0,0 @@
-local autocmd = vim.api.nvim_create_autocmd
-local augroup = vim.api.nvim_create_augroup
-
-local function yank_highlight()
-  vim.highlight.on_yank({ higroup = "Visual", timeout = 150 })
-end
-
--- Yanked text highlight feedback (source: https://github.com/nvim-lua/kickstart.nvim/blob/master/init.lua)
-augroup("YankHighlight", { clear = true })
-autocmd("TextYankPost", {
-  desc = "Highlight when yanking (copying) text",
-  group = "YankHighlight",
-  callback = yank_highlight,
-})

.config/nvim/lua/keymaps.lua

@@ -1,13 +0,0 @@
-local set = vim.keymap.set
-
-set("n", "<leader>cx", "<cmd>!chmod +x %<CR>", { silent = true, desc = "Run `chmod +x` on current file" })
-set("n", "yp", "<cmd>let @+ = expand('%r')<CR>:p<CR>", { silent = true, desc = "Yank path" })
-
--- Remap native NeoVim comment keymaps
-set({ "n", "x" }, "<leader>c", "gc", { remap = true, desc = "Toggle comment" })
-set("n", "<leader>cc", "gcc", { remap = true, desc = "Toggle comment line" })
-set("o", "<leader>c", "gc", { remap = true, desc = "Comment textobject" })
-
--- Move lines
-set("v", "K", ": '<,'>move '<-2<cr>gv")
-set("v", "J", ": '<,'>move '>+1<cr>gv")

.config/nvim/lua/vim.lua

@@ -1,5 +0,0 @@
-vim.cmd([[
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
-let &packpath = &runtimepath
-source ~/.vimrc"
-]])

.xmonad/xmonad.hs

@@ -167,7 +167,7 @@ myModMask = mod4Mask
 
 myConfig =
   def
-    { terminal = "kitty",
+    { terminal = "alacritty",
       modMask = myModMask,
       workspaces = withScreen 1 myWorkspaces ++ withScreen 2 mySharedWorkspaces,
       -- Styling
@@ -197,6 +197,7 @@ myKeys =
     ("M-<Space> M-<Space>", nextLayout),        -- ..fat finger
     ("M-<Space> M-S-<Space>", defaultLayout),   --
     ("<F8>",  spawnKeepassXC),
+    ("M-z",   spawnZettelkasten),
     ("M-p",   spawnLauncher),
     ("M-w", spawnWindowSwitcher),
     ("M-S-w", spawnWifiMenu),
@@ -216,6 +217,7 @@ myKeys =
     ("M-S-<XF86MonBrightnessUp>", resetTemp),   --
     ("M-S-<XF86MonBrightnessDown>", resetTemp), --
     ("M-S-b", fullscreenBrowser),
+    ("<XF86Calculator>", spawnCalculator),
     ("<XF86PowerOff>", spawn "systemctl suspend"), --TODO: Only enable this on laptop
     ("M-c", windows copyToAll),
     ("M-S-c", killAllOtherCopies),
@@ -253,6 +255,9 @@ nextLayout = sendMessage NextLayout
 defaultLayout :: X ()
 defaultLayout = setLayout $ Layout myLayoutHook
 
+spawnZettelkasten :: X ()
+spawnZettelkasten = spawn "alacritty --class Zettelkasten,Zettelkasten -e nvim $(cat ~/.zk/current-zettel.txt)"
+
 spawnKeepassXC :: X ()
 spawnKeepassXC = spawn "keepassxc"
 
@@ -260,12 +265,12 @@ fullscreenBrowser :: X ()
 fullscreenBrowser = spawn "firefox --fullscreen"
 
 spawnWindowSwitcher = spawn "rofi -show window -show-icons"
-
 spawnWifiMenu = spawn "rofi -show wifi -modi \"wifi:iwdrofimenu\""
 
-spawnLauncher, spawnClipManager :: X ()
+spawnLauncher, spawnClipManager, spawnCalculator :: X ()
 spawnLauncher = spawn "rofi -show drun -show-icons"
 spawnClipManager = spawn "rofi -modi 'clipboard:greenclip print' -show clipboard -run-command '{cmd}'"
+spawnCalculator = spawn "alacritty --class 'Calculator' -e ipython -i /home/h/.bin/calc.py"
 
 printScreen :: X ()
 printScreen = spawn "flameshot gui"