Change my gs command to account for jj

ghostty/.config/ghostty/config

@@ -0,0 +1,47 @@
+# This is the configuration file for Ghostty.
+#
+# This template file has been automatically created at the following
+# path since Ghostty couldn't find any existing config files on your system:
+#
+#   /home/nicholas/.config/ghostty/config
+#
+# The template does not set any default options, since Ghostty ships
+# with sensible defaults for all options. Users should only need to set
+# options that they want to change from the default.
+#
+# Run `ghostty +show-config --default --docs` to view a list of
+# all available config options and their default values.
+#
+# Additionally, each config option is also explained in detail
+# on Ghostty's website, at https://ghostty.org/docs/config.
+
+# Config syntax crash course
+# ==========================
+# # The config file consists of simple key-value pairs,
+# # separated by equals signs.
+# font-family = Iosevka
+# window-padding-x = 2
+#
+# # Spacing around the equals sign does not matter.
+# # All of these are identical:
+# key=value
+# key= value
+# key =value
+# key = value
+#
+# # Any line beginning with a # is a comment. It's not possible to put
+# # a comment after a config option, since it would be interpreted as a
+# # part of the value. For example, this will have a value of "#123abc":
+# background = #123abc
+#
+# # Empty values are used to reset config keys to default.
+# key =
+#
+# # Some config options have unique syntaxes for their value,
+# # which is explained in the docs for that config option.
+# # Just for example:
+# resize-overlay-duration = 4s 200ms
+font-family = Mononoki
+theme = Gruvbox Dark Hard
+font-size = 18
+gtk-titlebar = false

kitty/.config/kitty/kitty.conf

@@ -35,7 +35,7 @@ map super+t new_tab_with_cwd
 # When on wayland remove the unsightly title bar
 #linux_display_server x11
 
-# hide_window_decorations yes
+hide_window_decorations yes
 
 # Make sure all the colors are enabled
 term xterm-256color

linearmouse/.config/linearmouse/linearmouse.json

@@ -1,27 +0,0 @@
-{
-  "schemes" : [
-    {
-      "if" : {
-        "device" : {
-          "category" : "mouse"
-        }
-      },
-      "pointer" : {
-        "disableAcceleration" : true,
-        "acceleration" : 0.6
-      },
-      "scrolling" : {
-        "speed" : {
-          "horizontal" : 0
-        },
-        "distance" : {
-          "horizontal" : 6
-        },
-        "acceleration" : {
-          "horizontal" : 1
-        }
-      }
-    }
-  ],
-  "$schema" : "https:\/\/schema.linearmouse.app\/0.9.5"
-}

macos/Library/KeyBindings/DefaultKeyBinding.dict

@@ -1,6 +0,0 @@
-{
-    "\UF729"  = moveToBeginningOfLine:; // home
-    "\UF72B"  = moveToEndOfLine:; // end
-    "$\UF729" = moveToBeginningOfLineAndModifySelection:; // shift-home
-    "$\UF72B" = moveToEndOfLineAndModifySelection:; // shift-end
-}

nix-darwin/.nix-channels

@@ -1,3 +0,0 @@
-https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin
-https://nixos.org/channels/nixos-24.05 nixpkgs
-https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager

nix-darwin/.nixpkgs/darwin-configuration.nix

@@ -1,127 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  system = {
-    keyboard = {
-      enableKeyMapping = true;
-      remapCapsLockToControl = true;
-    };
-    defaults = {
-      ".GlobalPreferences"."com.apple.mouse.scaling" = -1.0;
-    };
-  };
-
-  # List packages installed in system profile. To search by name, run:
-  # $ nix-env -qaP | grep wget
-  environment.systemPackages = [
-    pkgs.neovim
-    # pkgs.jdk8
-    pkgs.jdk17
-    pkgs.prismlauncher
-    pkgs.kitty
-    # pkgs.bash
-    # pkgs.bashInteractive
-    pkgs.nodePackages.tailwindcss
-    pkgs.texlive.combined.scheme-full
-    pkgs.python311Packages.pynvim
-    pkgs.zathura
-    # pkgs.gcc
-    pkgs.graphviz
-    pkgs.unrar
-    pkgs.obsidian
-    # pkgs.xournal
-    pkgs.kalker
-    pkgs.ghc
-    pkgs.tree-sitter
-    pkgs.clang-tools
-    pkgs.wezterm
-    pkgs.speedtest-cli
-    pkgs.google-java-format
-    pkgs.go
-    pkgs.nodePackages.npm
-    pkgs.haskellPackages.haskell-language-server
-    pkgs.haskellPackages.implicit-hie
-    pkgs.sshfs
-    pkgs.macfuse-stubs
-    pkgs.yt-dlp
-  ];
-
-  environment = {
-    variables = {
-      EDITOR = "vim";
-    };
-  };
-
-  # environment.etc."java".source = "${pkgs.jdk8}/zulu-8.jdk/Contents/Home/bin/java";
-
-  environment.pathsToLink = [ "/share/bash-completion" ];
-
-  imports = [
-    <home-manager/nix-darwin>
-  ];
-
-  users.users.nicholas = {
-    name = "nicholas";
-    home = "/Users/nicholas";
-    # shell = pkgs.bashInteractive;
-  };
-
-  home-manager.users.nicholas = { pkgs, ... }: {
-    home.stateVersion = "24.05";
-    home.packages = [ pkgs.neovim pkgs.zathura pkgs.jdk17 ];
-    # programs.bash.enable = true;
-    # programs.bash.enableCompletion = true;
-  };
-
-  home-manager.useUserPackages = true;
-
-  homebrew = {
-    enable = true;
-    onActivation.autoUpdate = true;
-    brews = [
-      "ffmpeg"
-      "htop"
-      "xdotool"
-      {
-        name = "dbus";
-        start_service = true;
-        restart_service = true;
-      }
-      {
-        name = "girara";
-        args = ["--HEAD"];
-      }
-      {
-        name = "zathura";
-        args = ["HEAD" "with-synctex"];
-      }
-      "zathura-pdf-poppler"
-      "jupyterlab"
-      "black"
-      "bpytop"
-      "typst"
-    ];
-    casks = [ "spotify" "wacom-tablet" "inkscape" "xournal-plus-plus" "mactex-no-gui" "mullvadvpn" "slack" "ollama" "skim" "linearmouse"];
-    taps = [ "zegervdv/zathura" ];
-  };
-
-  # Use a custom configuration.nix location.
-  # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
-  # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
-
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-  # nix.package = pkgs.nix;
-
-  # Create /etc/zshrc that loads the nix-darwin environment.
-  programs.zsh.enable = true;  # default shell on catalina
-  # programs.bash.enable = true;
-  # programs.bash.enableCompletion = true;
-  # programs.fish.enable = true;
-
-  nixpkgs.config.allowUnfree = true;
-
-  # Used for backwards compatibility, please read the changelog before changing.
-  # $ darwin-rebuild changelog
-  system.stateVersion = 4;
-}

nvim/.config/nvim/lazy-lock.json

@@ -1,40 +1,43 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" },
+  "LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" },
-  "black": { "branch": "main", "commit": "d1d4fc58d3b744db35ac832cddf1d076ba5f5e7f" },
+  "black": { "branch": "main", "commit": "9fd9ea2835973981e3f5dc5b8eb76f2ded46aa61" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
-  "cmp-nvim-ultisnips": { "branch": "main", "commit": "24bca5c3e137b28cd87442d4fc51a2b312dd99cc" },
+  "conform.nvim": { "branch": "master", "commit": "dca1a190aa85f9065979ef35802fb77131911106" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "fidget.nvim": { "branch": "main", "commit": "889e2e96edef4e144965571d46f7a77bcc4d0ddf" },
-  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
+  "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" },
-  "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
+  "gruvbox": { "branch": "master", "commit": "697c00291db857ca0af00ec154e5bd514a79191f" },
-  "gruvbox": { "branch": "master", "commit": "f1ecde848f0cdba877acb0c740320568252cc482" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
-  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
+  "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
-  "lean.nvim": { "branch": "main", "commit": "dd37e1d2e320fb8a0948bf6ca3f7703c98b80ecb" },
+  "lean.nvim": { "branch": "main", "commit": "75b7822d565054606af84fa61771eb0030e2ceec" },
-  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
+  "lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "0c2823e0418f3d9230ff8b201c976e84de1cb401" },
-  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
-  "neodev.nvim": { "branch": "main", "commit": "f7f249b361e9fb245eea24cbcd9f5502e796c6ea" },
+  "mason.nvim": { "branch": "main", "commit": "cb8445f8ce85d957416c106b780efd51c6298f89" },
-  "nvim": { "branch": "main", "commit": "c0de3b46811fe1ce3912e2245a9dfbea6b41c300" },
+  "nerdtree": { "branch": "master", "commit": "690d061b591525890f1471c6675bcb5bdc8cdff9" },
-  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
+  "nvim": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b8751ff9ac9fd6ce253e0653d898de02e54040d5" },
+  "nvim-lspconfig": { "branch": "master", "commit": "31026a13eefb20681124706a79fc1df6bf11ab27" },
-  "nvim-treesitter": { "branch": "master", "commit": "9896ef5f701cc8258c4f04c6944b77e7cfa244e3" },
+  "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" },
+  "nvim-web-devicons": { "branch": "master", "commit": "4fc505ac7bd7692824a142e96e5f529c133862f8" },
-  "omnisharp-vim": { "branch": "master", "commit": "f9c5d3e3375e8b5688a4506e813cb21bdc7329b1" },
+  "omnisharp-vim": { "branch": "master", "commit": "1e1d65e05ad2bd466851246654d28c91864ab2e7" },
-  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
+  "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
   "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
-  "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
+  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
+  "telescope.nvim": { "branch": "master", "commit": "ec009610d5d259ec59a6edf0219ef3f7ee4732e5" },
   "tex-conceal.vim": { "branch": "master", "commit": "93ae39d9222b0892684d02324b85ee9d3647bf8e" },
-  "typst.vim": { "branch": "main", "commit": "1a101a1e2ecde246f66d30b373d1db02a1a6f632" },
+  "typescript-tools.nvim": { "branch": "master", "commit": "c2f5910074103705661e9651aa841e0d7eea9932" },
-  "ultisnips": { "branch": "master", "commit": "b393ba65386d47664421e1f8b246a87a6e8b218c" },
+  "typst.vim": { "branch": "main", "commit": "1d5436c0f55490893892441c0eca55e6cdf4916c" },
-  "uxntal.vim": { "branch": "main", "commit": "2ba479268252510cc7741c0cf67051feb0e82203" },
+  "ultisnips": { "branch": "master", "commit": "0223456b89f7f797c5424ddef07cfc28b5cd86a5" },
-  "vim-codefmt": { "branch": "master", "commit": "6fa1616adebeffe26fadf5a1a61996ccdcbe46a1" },
+  "uxntal.vim": { "branch": "main", "commit": "1c72d8fe8ca21f662c4ee1714e8af422651799e4" },
-  "vim-fugitive": { "branch": "master", "commit": "4bc9d989930e37989b038540cc49e63728d3f220" },
+  "vim-codefmt": { "branch": "master", "commit": "ff464a478202df40ae484e6e94a1d56587fcc69e" },
+  "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
   "vim-glaive": { "branch": "master", "commit": "3c5db8d279f86355914200119e8727a085863fcd" },
-  "vim-go": { "branch": "master", "commit": "0e975560df38be387cca1d7d33df7a4744091303" },
+  "vim-go": { "branch": "master", "commit": "f4b4ba17035aebcd222df90375c1cbb1dc4d8c5b" },
   "vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" },
-  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
+  "vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" },
-  "vimtex": { "branch": "master", "commit": "01c4c167338b74dc0c30621841bc548b52e96330" },
+  "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
-  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
+  "vimtex": { "branch": "master", "commit": "97e11bd4f56d46a87f8593d6ccb27820e19c4ab0" },
-}
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
+}

nvim/.config/nvim/plugin/keybinds.lua

@@ -0,0 +1,24 @@
+-- [[ Basic Keymaps ]]
+--  See `:help vim.keymap.set()`
+
+-- Clear highlights on search when pressing <Esc> in normal mode
+--  See `:help hlsearch`
+vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
+
+-- Diagnostic keymaps
+vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
+
+-- Keybinds to make split navigation easier.
+--  Use CTRL+<hjkl> to switch between windows
+--
+--  See `:help wincmd` for a list of all window commands
+vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
+vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
+vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
+vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
+
+vim.keymap.set("n", "<leader>n", ":NERDTreeFocus<CR>")
+vim.keymap.set("n", "<C-n>", ":NERDTree<CR>")
+vim.keymap.set("n", "<C-t>", ":NERDTreeToggle<CR>")
+vim.keymap.set("n", "<C-f>", ":NERDTreeFind<CR>")
+vim.keymap.set("n", "<leader>rf", ":NERDTreeRefreshRoot<CR>")

nvim/.config/nvim/plugin/options.lua

@@ -29,6 +29,12 @@ vim.wo.signcolumn = 'yes'
 -- Prevent markdown from collapsing down
 vim.o.foldenable = false
 
+-- Preview substitutions live, as you type!
+vim.o.inccommand = 'split'
+
+-- Show which line your cursor is on
+vim.o.cursorline = true
+
 -- Tabs instead of spaces
 -- :h tabstop is the number of spaces for a tab character
 -- :h expandtab expands tabs into spaces
@@ -42,5 +48,3 @@ vim.o.completeopt = 'menuone,noinsert,noselect'
 
 -- Disable modelines, this removes some errors when opening text files
 vim.o.modeline = false
-
-vim.o.rtp = vim.o.rtp .. ",~/oxy/current-course"

shell/.shell-common

@@ -1,5 +1,11 @@
 # Git aliases
-alias gs="git status"
+gs() {
+  if jj root 2>/dev/null; then
+    jj show -s
+  else
+    git status
+  fi
+}
 
 # Calculator
 alias k="kalker"

streamdeck/.streamdeck_ui.json

@@ -175,11 +175,11 @@
                         "state": 0,
                         "states": {
                             "0": {
-                                "text": "Whatsapp",
+                                "text": "",
-                                "icon": "/usr/share/icons/hicolor/128x128/apps/whatsapp-nativefier.png",
+                                "icon": "",
                                 "keys": "",
                                 "write": "",
-                                "command": "whatsapp-nativefier",
+                                "command": "",
                                 "brightness_change": 0,
                                 "switch_page": 0,
                                 "switch_state": 0,
@@ -3181,4 +3181,4 @@
         }
     },
     "streamdeck_ui_version": 2
-}
+}

wezterm/.wezterm.lua

@@ -0,0 +1,21 @@
+local wezterm = require "wezterm"
+
+local config = wezterm.config_builder()
+
+config.color_scheme = "GruvboxDark"
+config.font = wezterm.font "Mononoki"
+-- config.window_decorations = "NONE"
+config.font_size = 18.0
+
+config.keys = {}
+
+for i = 1, 9 do
+  -- ALT + number to move to that position
+  table.insert(config.keys, {
+    key = tostring(i),
+    mods = 'ALT',
+    action = wezterm.action.ActivateTab(i - 1),
+  })
+end
+
+return config