jj-sync

.config/fish/config.fish

@@ -9,12 +9,12 @@ if status is-interactive
 
   jj util completion fish | source
   
-  # # start or attach to default tmux session
+  # start or attach to default tmux session
-  # if not set -q TMUX
+  if not set -q TMUX
-  #   set -g TMUX tmux new-session -d -s default
+    set -g TMUX tmux new-session -d -s default
-  #   eval $TMUX
+    eval $TMUX
-  #   tmux attach-session -d -t default
+    tmux attach-session -d -t default
-  # end
+  end
 end
 
 set -xg SSH_AUTH_SOCK ~/Library/Group\ Containers/2BUA8C4S2C.com.1password/t/agent.sock

.config/fish/functions/jj-sync.fish

@@ -0,0 +1,5 @@
+function jj-sync
+    jj git fetch
+    jj rebase -b 'all:bookmarks() & mine() ~ trunk()' -d 'trunk()' --skip-emptied
+    jj git push --tracked
+end

.config/kitty/current-theme.conf

@@ -1,80 +1,80 @@
 # vim:ft=kitty
 
-## name:     Catppuccin-Mocha
+## name:     Catppuccin-Frappe
 ## author:   Pocco81 (https://github.com/Pocco81)
 ## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
+## upstream: https://github.com/catppuccin/kitty/blob/main/frappe.conf
 ## blurb:    Soothing pastel theme for the high-spirited!
 
 
 
 # The basic colors
-foreground              #CDD6F4
+foreground              #C6D0F5
-background              #1E1E2E
+background              #303446
-selection_foreground    #1E1E2E
+selection_foreground    #303446
-selection_background    #F5E0DC
+selection_background    #F2D5CF
 
 # Cursor colors
-cursor                  #F5E0DC
+cursor                  #F2D5CF
-cursor_text_color       #1E1E2E
+cursor_text_color       #303446
 
 # URL underline color when hovering with mouse
-url_color               #F5E0DC
+url_color               #F2D5CF
 
 # Kitty window border colors
-active_border_color     #B4BEFE
+active_border_color     #BABBF1
-inactive_border_color   #6C7086
+inactive_border_color   #737994
-bell_border_color       #F9E2AF
+bell_border_color       #E5C890
 
 # OS Window titlebar colors
 wayland_titlebar_color system
 macos_titlebar_color system
 
 # Tab bar colors
-active_tab_foreground   #11111B
+active_tab_foreground   #232634
-active_tab_background   #CBA6F7
+active_tab_background   #CA9EE6
-inactive_tab_foreground #CDD6F4
+inactive_tab_foreground #C6D0F5
-inactive_tab_background #181825
+inactive_tab_background #292C3C
-tab_bar_background      #11111B
+tab_bar_background      #232634
 
 # Colors for marks (marked text in the terminal)
-mark1_foreground #1E1E2E
+mark1_foreground #303446
-mark1_background #B4BEFE
+mark1_background #BABBF1
-mark2_foreground #1E1E2E
+mark2_foreground #303446
-mark2_background #CBA6F7
+mark2_background #CA9EE6
-mark3_foreground #1E1E2E
+mark3_foreground #303446
-mark3_background #74C7EC
+mark3_background #85C1DC
 
 # The 16 terminal colors
 
 # black
-color0 #45475A
+color0 #51576D
-color8 #585B70
+color8 #626880
 
 # red
-color1 #F38BA8
+color1 #E78284
-color9 #F38BA8
+color9 #E78284
 
 # green
-color2  #A6E3A1
+color2  #A6D189
-color10 #A6E3A1
+color10 #A6D189
 
 # yellow
-color3  #F9E2AF
+color3  #E5C890
-color11 #F9E2AF
+color11 #E5C890
 
 # blue
-color4  #89B4FA
+color4  #8CAAEE
-color12 #89B4FA
+color12 #8CAAEE
 
 # magenta
-color5  #F5C2E7
+color5  #F4B8E4
-color13 #F5C2E7
+color13 #F4B8E4
 
 # cyan
-color6  #94E2D5
+color6  #81C8BE
-color14 #94E2D5
+color14 #81C8BE
 
 # white
-color7  #BAC2DE
+color7  #B5BFE2
-color15 #A6ADC8
+color15 #A5ADCE

.config/kitty/kitty.conf

@@ -1,7 +1,6 @@
-font_family RecMonoCasual Nerd Font Mono
+font_family Courier Prime
-font_size 16
+font_size 18
 
-# include /nix/store/q0zlywm34vh76h9rl7v5wvxp57pfvrxc-kitty-themes-unstable-2023-12-28/share/kitty-themes/themes/Catppuccin-Mocha.conf
 
 # Shell integration is sourced and configured manually
 shell_integration no-rc
@@ -12,6 +11,6 @@ paste_actions quote-urls-at-prompt,confirm-if-large
 macos_option_as_alt yes
 
 # BEGIN_KITTY_THEME
-# Catppuccin-Mocha
+# Catppuccin-Frappe
 include current-theme.conf
 # END_KITTY_THEME

.config/nvim/lazy-lock.json

@@ -1,18 +1,19 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "8d7aa7a7b7c0875e4878d1d2590924bc1c229305" },
+  "LuaSnip": { "branch": "master", "commit": "2737edc9e674e537dc0a97e3405658d57d2d31ed" },
+  "catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "hunk.nvim": { "branch": "master", "commit": "eb89245a66bdfce10436d15923bf4deb43d23c96" },
-  "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
+  "lazy.nvim": { "branch": "main", "commit": "b1134ab82ee4279e31f7ddf7e34b2a99eb9b7bc9" },
-  "lsp-zero.nvim": { "branch": "v4.x", "commit": "19a8b90340c6c522219c84f7befe784d657ab28e" },
+  "lsp-zero.nvim": { "branch": "v4.x", "commit": "4f1e00bfe276758d30fec5d1eb161108ff8a959b" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" },
   "nerdtree": { "branch": "master", "commit": "9b465acb2745beb988eff3c1e4aa75f349738230" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
-  "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
+  "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
-  "nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d01864641c6e43c681c3e9f6cf4745c75fdd9dcc" },
-  "nvim-treesitter": { "branch": "master", "commit": "b065b59196edb10a7c29bfbed88cc225b7e3de37" },
+  "nvim-treesitter": { "branch": "master", "commit": "425b58968340bd5b4621c2a0d626c73556516d3d" },
   "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
@@ -20,7 +21,7 @@
   "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" },
   "vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" },
   "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
-  "vim-helix": { "branch": "main", "commit": "0d6bab9626cf74dedc16997e9f8d8c356939e76d" },
+  "vim-pollen": { "branch": "master", "commit": "aaceb56e67a155900f55319dfe92c4bd8aa8c56a" },
   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
   "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
   "vim-sensible": { "branch": "master", "commit": "0ce2d843d6f588bb0c8c7eec6449171615dc56d9" },
@@ -28,5 +29,5 @@
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-textobj-user": { "branch": "master", "commit": "41a675ddbeefd6a93664a4dc52f302fe3086a933" },
   "vim-tmux-navigator": { "branch": "master", "commit": "424b5caa154bff34dc258ee53cec5a8e36cf7ea8" },
-  "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
+  "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" }
 }

.config/nvim/lua/plugins/colorscheme.lua

@@ -1,10 +1,19 @@
 return {
+  -- {
+  --   'foxoman/vim-helix',
+  --   lazy = false,
+  --   priority = 1000,
+  --   config = function ()
+  --     vim.cmd([[colorscheme helix-boo]])
+  --   end,
+  -- },
   {
-    'foxoman/vim-helix',
+    'catppuccin/nvim',
+    name = 'catppuccin',
     lazy = false,
     priority = 1000,
     config = function ()
-      vim.cmd([[colorscheme helix-boo]])
+      vim.cmd([[colorscheme catppuccin-frappe]])
-    end,
+    end
   },
 }

.config/nvim/lua/plugins/core.lua

@@ -51,6 +51,10 @@ return {
   {
     'windwp/nvim-autopairs',
     event = 'InsertEnter',
-    config = true,
+    config = function ()
+      require('nvim-autopairs').setup({
+        disabled_filetype = { 'TelescopePrompt', 'pollen' },
+      })
+    end,
   },
 }

.config/nvim/lua/plugins/syntax.lua

@@ -0,0 +1,51 @@
+return {
+  {
+    'nvim-treesitter/nvim-treesitter',
+    build = ':TSUpdate',
+    config = function ()
+      require('nvim-treesitter.configs').setup({
+        ensure_installed = {
+          'elixir',
+          'javascript',
+          'typescript',
+          'css',
+          'markdown',
+          'lua',
+          'html',
+        },
+        auto_install = false,
+        highlight = {
+          enable = true,
+        },
+      })
+    end
+  },
+  {
+    'otherjoel/vim-pollen',
+    config = function ()
+      vim_pollen_autogroup = vim.api.nvim_create_augroup('vim-pollen', { clear = true })
+      vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
+        pattern = { '*.pm', '*.pp', '*.ptree', '*.p' },
+        command = 'set filetype=pollen',
+        group = vim_pollen_autogroup,
+      })
+      vim.api.nvim_create_autocmd('FileType', {
+        pattern = { 'pollen' },
+        command = 'setlocal wrap',
+        group = vim_pollen_autogroup,
+      })
+      vim.api.nvim_create_autocmd('FileType', {
+        pattern = { 'pollen' },
+        command = 'setlocal linebreak',
+        group = vim_pollen_autogroup,
+      })
+      vim.api.nvim_create_autocmd('FileType', {
+        pattern = { 'pollen' },
+        callback = function ()
+          require('nvim-autopairs').disable()
+        end,
+        group = vim_pollen_autogroup,
+      })
+    end
+  },
+}

.config/nvim/lua/plugins/treesitter.lua

@@ -1,23 +0,0 @@
-return {
-  {
-    'nvim-treesitter/nvim-treesitter',
-    build = ':TSUpdate',
-    config = function ()
-      require('nvim-treesitter.configs').setup({
-        ensure_installed = {
-          'elixir',
-          'javascript',
-          'typescript',
-          'css',
-          'markdown',
-          'lua',
-          'html',
-        },
-        auto_install = true,
-        highlight = {
-          enable = true,
-        },
-      })
-    end
-  },
-}

.config/tmux/tmux.conf

@@ -4,7 +4,7 @@ set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
 set -g @plugin 'christoomey/vim-tmux-navigator'
 set -g @plugin 'catppuccin/tmux#v2.1.0'
 
-set -g @catppuccin_flavor 'mocha'
+set -g @catppuccin_flavor 'frappe'
 
 unbind C-b
 set-option -g prefix C-a

.jjconfig.toml

@@ -13,6 +13,7 @@ program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
 paginate = "never"
 default-command = "log"
 editor = "nvim"
+diff.tool = ["difft", "--color=always", "$left", "$right"]
 
 [user]
 email = "git@sloanelybutsurely.com"
@@ -23,3 +24,6 @@ log = "trunk() | ancestors(reachable(@ | mine(), mutable()), 2) | @"
 
 [git]
 push-bookmark-prefix = "sloane/push-"
+
+[aliases]
+rebase-bookmarks = ["rebase", "-b", "all:bookmarks() & mine() ~trunk()", "-d", "main", "--skip-emptied"]