Update php

gitconfig

@@ -67,7 +67,7 @@
   keepBackup = false
 
 [push]
-  default = simple
+	default = current
 
 [pull]
   rebase = false

hammerspoon/init.lua

@@ -42,6 +42,7 @@ local layoutDouble = {
   { "Microsoft Teams", nil, mainMonitor, screenPositions.rightBottom, nil, nil },
   { "Reminders", nil, laptopMonitor, screenPositions.full, nil, nil },
   { "Signal", nil, mainMonitor, screenPositions.rightBottom, nil, nil },
+  { "Strongbox", nil, laptopMonitor, screenPositions.full, nil, nil },
   { "Telegram", nil, mainMonitor, screenPositions.rightTop, nil, nil },
   { "iTerm2", nil, mainMonitor, screenPositions.right, nil, nil },
 }
@@ -55,6 +56,7 @@ local layoutSingle = {
   { "Microsoft Teams", nil, laptopMonitor, screenPositions.full, nil, nil },
   { "Reminders", nil, laptopMonitor, screenPositions.full, nil, nil },
   { "Signal", nil, laptopMonitor, screenPositions.full, nil, nil },
+  { "Strongbox", nil, laptopMonitor, screenPositions.full, nil, nil },
   { "Telegram", nil, laptopMonitor, screenPositions.full, nil, nil },
   { "iTerm2", nil, laptopMonitor, screenPositions.full, nil, nil },
 }
@@ -68,6 +70,7 @@ local appNames = {
   "Microsoft Teams",
   "Reminders",
   "Signal",
+  "Strongbox",
   "Telegram",
   "iTerm",
 }

install/6_software.sh

@@ -21,15 +21,11 @@ brew install --cask syntax-highlight
 brew install --cask telegram
 
 # seldomly used software
-#brew install --cask alfaview
 #brew install --cask paw
 #brew install --cask sequel-pro
 #brew install --cask sketch
-#brew install --cask skype
 #brew install --cask transmission
 #brew install --cask vmware-fusion
-#brew install --cask webex
-#brew install --cask zoom
 
 # Quicklook-reset
 xattr -cr ~/Library/QuickLook
@@ -43,17 +39,10 @@ ln -s ~/dotfiles/karabiner ~/.config/karabiner
 
 # Drivers and other software
 brew install --cask font-fira-code-nerd-font
-brew install --cask temurin8 # for ubiquiti-unifi-controller
-brew install --cask ubiquiti-unifi-controller
-
-# Tell unifi-controller to use brew-installed java
-sudo ln -s /Library/Java/JavaVirtualMachines/temurin-8.jdk /Applications/UniFi.app/Contents/PlugIns/temurin-8.jdk
-sudo v /Applications/UniFi.app/Contents/Info.plist
-# THEN add this: <key>JVMRuntime</key> <string>temurin-8.jdk</string>
 
 # firefox-extensions: 
 # surfingkeys, dark reader, privacy badger, ublock origin, 
-# react developer tools, df youtube, axe devtools
+# react developer tools, df youtube, axe devtools 
 
 # other software:
 # bill: https://billtheapp.com/

nvim/lua/config/neorg.lua

@@ -0,0 +1,13 @@
+require('neorg').setup({
+  load = {
+    ["core.defaults"] = {},
+    ["core.norg.dirman"] = {
+      config = {
+        workspaces = {
+          work = "~/Documents/notes/work",
+          home = "~/Documents/notes/home",
+        }
+      }
+    }
+  }
+})

nvim/lua/config/treesitter.lua

@@ -5,19 +5,20 @@ require('nvim-treesitter.configs').setup({
     'css',
     'html',
     'javascript',
-    'jsdoc',
     'json',
     'json5',
+    'jsonc',
     'lua',
+    'markdown',
+    'norg',
     'php',
     'python',
     'regex',
     'ruby',
     'scss',
+    'sql',
     'toml',
-    'tsx',
     'typescript',
-    'vue',
     'yaml',
   },
   highlight = {

nvim/lua/config/trouble.lua

@@ -0,0 +1 @@
+require('trouble').setup({})

nvim/lua/options.lua

@@ -19,6 +19,7 @@ set.grepprg = 'rg'
 set.hidden = true
 set.ignorecase = true
 set.infercase = true
+set.laststatus = 3
 set.lazyredraw = true
 set.list = true
 set.listchars = 'extends:»,precedes:«,tab:▸ ,trail:·'
@@ -39,6 +40,8 @@ set.sidescroll = 10
 set.sidescrolloff = 5
 set.signcolumn = 'number'
 set.smartcase = true
+set.splitright = true
+set.splitbelow = true
 set.updatetime = 300
 set.virtualedit = 'all'
 set.visualbell = true

nvim/lua/plugins.lua

@@ -79,9 +79,7 @@ return require('packer').startup(function(use)
   use {
     'ibhagwan/fzf-lua',
     config = get_config('fzf'),
-    requires = {
-      { 'kyazdani42/nvim-web-devicons', opt = true },
-    },
+    requires = { 'kyazdani42/nvim-web-devicons' },
   }
 
   -- autopairs for sensible () "" ''
@@ -93,8 +91,8 @@ return require('packer').startup(function(use)
   -- colorizer for nice css-colors
   use {
     'norcalli/nvim-colorizer.lua',
-    event = 'BufReadPre',
     config = get_config('colorizer'),
+    event = 'BufReadPre',
   }
 
   -- commenting stuff out
@@ -107,10 +105,8 @@ return require('packer').startup(function(use)
   use {
     'nvim-lualine/lualine.nvim',
     config = get_config('lualine'),
+    requires = { 'kyazdani42/nvim-web-devicons' },
     event = 'VimEnter',
-    requires = {
-      { 'kyazdani42/nvim-web-devicons', opt = true }
-    },
   }
 
   -- leap for stupidly nice navigation
@@ -123,8 +119,8 @@ return require('packer').startup(function(use)
   -- git diff view and blame, using lazygit for everything else
   use {
     'sindrets/diffview.nvim',
-    requires = { 'nvim-lua/plenary.nvim' },
     config = get_config('diffview'),
+    requires = { 'nvim-lua/plenary.nvim' },
   }
 
   -- finally: the colorscheme of choice
@@ -138,6 +134,16 @@ return require('packer').startup(function(use)
     'rcarriga/nvim-notify',
     config = get_config('notify'),
   }
+  use {
+    'nvim-neorg/neorg',
+    config = get_config('neorg'),
+    requires = { 'nvim-lua/plenary.nvim' },
+  }
+  use {
+    'folke/trouble.nvim',
+    config = get_config('trouble'),
+    requires = { 'kyazdani42/nvim-web-devicons' },
+  }
 
   -- oldschool vimscript plugins that still provide a lot of value
   use 'christoomey/vim-tmux-navigator'

zsh/zshrc

@@ -15,8 +15,8 @@ zinit wait lucid for \
     light-mode zsh-users/zsh-autosuggestions \
     light-mode zsh-users/zsh-completions \
     light-mode zdharma-continuum/fast-syntax-highlighting \
-    light-mode "https://github.com/belak/zsh-utils/blob/master/history/history.plugin.zsh" \
-    light-mode "https://github.com/belak/zsh-utils/blob/master/completion/completion.plugin.zsh"
+    light-mode "https://github.com/belak/zsh-utils/blob/main/history/history.plugin.zsh" \
+    light-mode "https://github.com/belak/zsh-utils/blob/main/completion/completion.plugin.zsh"
 
 # history
 setopt SHARE_HISTORY