Merge branch 'master' into arch-desktop

config/.bash_profile

@@ -18,11 +18,5 @@ test -r '/home/mikec/.opam/opam-init/init.sh' && . '/home/mikec/.opam/opam-init/
 if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
   exec river
 fi
-HOMEBREW_PREFIX=/opt/homebrew
-export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
-export CPATH="$HOMEBREW_PREFIX/include:$CPATH"
-export LIBRARY_PATH="$HOMEBREW_PREFIX/lib:$LIBRARY_PATH"
-. "/Users/mikec/.local/share/bob/env/env.sh"
-
-test -e "${HOME}/.iterm2_shell_integration.bash" && source "${HOME}/.iterm2_shell_integration.bash"
 
+. "/home/mikec/.local/share/bob/env/env.sh"

config/.config/dconf/user.txt

@@ -640,14 +640,14 @@ window-maximized=true
 first-run=false
 view='icon-view'
 window-maximized=false
-window-position=[20, 20]
+window-position=[45, 45]
-window-size=[2532, 1382]
+window-size=[2544, 1392]
 
 [org/gnome/builder]
 night-mode=true
-window-maximized=true
+window-maximized=false
 window-position=(1680, 32)
-window-size=(2560, 1361)
+window-size=(2544, 1392)
 format-on-save=true
 projects-directory='/home/mikec/Documents/Projects'
 interface-style='tab-bar'
@@ -667,7 +667,7 @@ show-relative-line-numbers=true
 highlight-current-line=true
 highlight-matching-brackets=true
 wrap-text='whitespace'
-font-name='Olympe Mono Hacked 10'
+font-name='Adwaita Mono 10'
 
 [org/gnome/builder/editor/language/automake]
 insert-spaces-instead-of-tabs=false
@@ -808,6 +808,7 @@ tab-width=2
 
 [org/gnome/builder/terminal]
 scrollback-lines=uint32 10000
+font-name='Adwaita Mono 10'
 
 [org/gnome/builder/workbench]
 bottom-position=200
@@ -894,8 +895,8 @@ xkb-options=['lv3:ralt_switch']
 [org/gnome/desktop/interface]
 clock-format='12h'
 color-scheme='prefer-dark'
-cursor-size=24
+cursor-size=30
-cursor-theme='breeze_cursors'
+cursor-theme='Colloid-dark-cursors'
 document-font-name='Cantarell 11'
 enable-animations=true
 enable-hot-corners=true
@@ -903,7 +904,7 @@ font-antialiasing='rgba'
 font-hinting='slight'
 font-name='Noto Sans,  10'
 gtk-theme='Breeze'
-icon-theme='breeze-dark'
+icon-theme='klassy-dark'
 monospace-font-name='BigBlueTermPlus Nerd Font 12'
 show-battery-percentage=true
 toolbar-style='text'
@@ -1123,7 +1124,7 @@ content-filters=['https://better.fyi/blockerList.json']
 [org/gnome/epiphany/state]
 is-maximized=false
 window-position=(0, 0)
-window-size=(2560, 1419)
+window-size=(2544, 1392)
 
 [org/gnome/epiphany/web]
 default-zoom-level=1.0
@@ -1640,8 +1641,8 @@ window-position=(45, 45)
 window-size=(948, 645)
 
 [org/virt-manager/virt-manager]
-manager-window-height=1388
+manager-window-height=1410
-manager-window-width=2532
+manager-window-width=2560
 xmleditor-enabled=true
 
 [org/virt-manager/virt-manager/confirm]
@@ -1911,9 +1912,9 @@ show-graph-grids=false
 sidebar-details=false
 sidebar-meter-type='Graph'
 apps-sort-by-ascending=true
-window-width=1024
+window-width=3424
-is-maximized=true
+is-maximized=false
-window-height=900
+window-height=1392
 
 [com/github/rafostar/Clapper]
 volume=1.0
@@ -2616,14 +2617,14 @@ enabled=true
 last-opened-version='0.4.1'
 user-flatpak-theming-gtk4=true
 first-run=false
-window-width=1000
+window-width=1268
 window-fullscreen=false
-window-height=700
+window-height=1392
 window-maximized=false
 
 [ar/xjuan/Cambalache/state/window]
-state=uint32 0
+state=uint32 4
-size=(1071, 645)
+size=(0, 0)
 
 [com/vysp3r/ProtonPlus/State]
 width=1024
@@ -2642,3 +2643,36 @@ name-column-width=250
 window-width=1170
 sidebar-width=200
 window-height=1422
+
+[org/virt-manager/virt-manager/vms/397e4f61152343138f3f378f3e7dfa64]
+autoconnect=1
+vm-window-size=(2560, 1410)
+
+[org/virt-manager/virt-manager/vms/43ec9914ecc34ed9a870e22c346204c0]
+autoconnect=1
+vm-window-size=(1280, 838)
+
+[apps/psensor]
+graph-alpha-channel-enabled=false
+graph-background-alpha=1.0
+graph-background-color='#e8f4e8f4a8f5'
+graph-foreground-color='#000000000000'
+graph-monitoring-duration=20
+graph-update-interval=2
+interface-hide-on-startup=false
+interface-window-divider-pos=460
+interface-window-h=662
+interface-window-restore-enabled=true
+interface-window-w=1260
+interface-window-x=0
+interface-window-y=0
+sensor-update-interval=2
+slog-enabled=false
+slog-interval=300
+
+[ar/xjuan/Cambalache/notification]
+uuid='938744cc-6fbf-496c-87f1-64550adef088'
+next-request=uint64 1753661123
+
+[ar/xjuan/Cambalache]
+completed-intro=true

config/.config/ghostty/config

@@ -10,10 +10,10 @@ font-family = "CaskaydiaCove Nerd Font"
 # font-family = "Ubuntu Mono Nerd Font"
 # font-family = "Victor Mono Nerd Font"
 # font-family = "Sudo"
-theme = light:rose-pine-dawn,dark:rose-pine
+# theme = light:rose-pine-dawn,dark:rose-pine
 font-size = 14
 font-variation = wdth=100
-# theme = light:xcodelight,dark:xcodedark
+theme = light:xcodelight,dark:xcodedark
 # theme = Monokai Classic
 # window-decoration = false
 # gtk-adwaita = false

config/.config/kde.org/UserFeedback.org.kde.discover.conf

@@ -26,5 +26,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=137
+ApplicationStartCount=141
-ApplicationTime=622
+ApplicationTime=705

config/.config/kde.org/UserFeedback.org.kde.dolphin.conf

@@ -26,5 +26,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=3
+ApplicationStartCount=72
-ApplicationTime=35142
+ApplicationTime=68724

config/.config/kde.org/UserFeedback.org.kde.kmail.conf

@@ -23,5 +23,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=1
+ApplicationStartCount=18
-ApplicationTime=14
+ApplicationTime=16794

config/.config/kde.org/UserFeedback.org.kde.kmail2.conf

@@ -1,2 +1,2 @@
 [UserFeedback]
-ApplicationStartCount=1
+ApplicationStartCount=18

config/.config/kde.org/UserFeedback.org.kde.plasmashell.conf

@@ -26,6 +26,6 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true
 
 [UserFeedback]
-ApplicationStartCount=210
+ApplicationStartCount=260
-ApplicationTime=2008695
+ApplicationTime=2430104
 LastEncouragement=@DateTime(\0\0\0\x10\0\0\0\0\0\0%\x87}\x4\n\x84\xab\0)

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

@@ -2,7 +2,7 @@
   "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
   "alpha-nvim": { "branch": "main", "commit": "2b3cbcdd980cae1e022409289245053f62fb50f6" },
   "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
-  "catppuccin": { "branch": "main", "commit": "211dc3649f775c5a390e9fae07bf20d985f8dcf2" },
+  "catppuccin": { "branch": "main", "commit": "9a9a875e979fe9d2b42423d056f944dd286d0280" },
   "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
   "compiler-explorer.nvim": { "branch": "master", "commit": "ee8e7a2808bdad67cd2acb61b5c9ffa7735c7ec9" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
@@ -10,22 +10,22 @@
   "dracula.nvim": { "branch": "main", "commit": "df528c869b09fbdc7578e6ccc7ff6faf44a2046d" },
   "dropbar.nvim": { "branch": "master", "commit": "418897fe7828b2749ca78056ec8d8ad43136b695" },
   "everblush": { "branch": "main", "commit": "678f808d81801b983b6fb8296fb17ba1b2785d7c" },
-  "everforest": { "branch": "master", "commit": "34fd33500cb86c3c1af3c87f97c0fec247592e83" },
+  "everforest": { "branch": "master", "commit": "28d59e29d972e21f2e802ce916f28dcab30697ae" },
   "fennel.vim": { "branch": "main", "commit": "c6a9c035ca108cbb24273d96cd6277fb8fbc60b4" },
   "github-colors": { "branch": "main", "commit": "7292749e49e6f870e63879a528bb05c8c8d1a59a" },
   "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" },
   "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
-  "gruvbox-material": { "branch": "master", "commit": "81aeeee11a45ae8e4f26df67bfbbe18795bda6ee" },
+  "gruvbox-material": { "branch": "master", "commit": "6a100833060d26cd3ab85c34c5f7154a1000c12f" },
   "gruvbox.nvim": { "branch": "main", "commit": "58a2cda2e953a99e2f87c12b7fb4602da4e0709c" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" },
   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" },
   "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
   "melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" },
   "mellow.nvim": { "branch": "main", "commit": "0cb5476b506f8e71428e823919b69ecf34afe646" },
-  "mini.nvim": { "branch": "main", "commit": "93cca0073778f4118c55a73a48b30d06ef064add" },
+  "mini.nvim": { "branch": "main", "commit": "5d938b3a078a7eeae23ba9f04f180066ab8bd9ef" },
   "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" },
   "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" },
   "moonlight.nvim": { "branch": "pure-lua", "commit": "e24e4218ec680b6396532808abf57ca0ada82e66" },
@@ -33,11 +33,12 @@
   "multicursor.nvim": { "branch": "1.0", "commit": "9eedebdd395bbbc4711081e33b0606c079e054c3" },
   "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" },
   "nelua.vim": { "branch": "main", "commit": "330f34d017df92dd1a1a7283e302982256e169db" },
+  "neogit": { "branch": "master", "commit": "49d0527143fe748196ae9a20b8c9ff54cbf45fab" },
   "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
   "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
-  "nvim-highlight-colors": { "branch": "main", "commit": "b42a5ccec7457b44e89f7ed3b3afb1b375bb2093" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "1ce0a09bfc28c7274e649d20927cea51e440b65c" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b0caeef0d835fbe19df6ad71dbc4345eaaea649c" },
+  "nvim-lspconfig": { "branch": "master", "commit": "34c9ecfdcc19d579f51c072300a71445fbec9da8" },
-  "nvim-surround": { "branch": "main", "commit": "7a7a78a52219a3312c1fcabf880cea07a7956a5f" },
+  "nvim-surround": { "branch": "main", "commit": "d56752df477ebd808cb82cea2fc68cf7455abb21" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },

config/.config/nvim/lua/config/keymap.lua

@@ -22,6 +22,7 @@ setnx('<leader>M', tele.man_pages, 'Search man pages')
 setnx('<leader>t', require'telescope-tabs'.list_tabs, 'List tabs')
 setnx('<leader>c', tele.colorscheme, 'Select colorscheme')
 
+local neogit = require('neogit')
 setnx('<leader>op', '<CMD>Oil<CR>', 'Open file manager')
 setnx('<leader>oP', '<CMD>Oil --float<CR>', 'Open file manager in floating window')
 setnx('<leader>ot', '<CMD>term<CR>', 'Open terminal')
@@ -30,7 +31,8 @@ setnx('<leader>of', '<CMD>enew<CR>', 'Open new file')
 setnx('<leader>ow', '<CMD>Telescope workspaces', 'Open workspace')
 setnx('<leader>ol', '<CMD>Lazy<CR>', 'Open Lazy')
 setnx('<leader>om', '<CMD>Mason<CR>', 'Open Mason')
-setnx('<leader>oc', '<CMD>cd' .. vim.fn.stdpath('config') .. '<CR><CMD>Oil<CR>', 'Open neovim configuration')
+setnx('<leader>oc', '<CMD>cd ' .. vim.fn.stdpath('config') .. '<CR><CMD>Oil .<CR>', 'Open neovim configuration')
+setnx('<leader>og', neogit.open, 'Open (neo)git')
 
 -- Exit terminal mode with ESC
 set('t', '<Esc>', '<C-\\><C-n>')

config/.config/nvim/lua/config/lazy.lua

@@ -29,7 +29,7 @@ require("lazy").setup({
   },
   -- Configure any other settings here. See the documentation for more details.
   -- colorscheme that will be used when installing plugins.
-  install = { colorscheme = { "rose-pine" } },
+  install = { colorscheme = { "xcode" } },
   -- automatically check for plugin updates
-  checker = { enabled = true },
+  checker = { enabled = false, notify = false },
 })

config/.config/nvim/lua/config/set.lua

@@ -61,7 +61,7 @@ vim.g.netrw_keepdir = 0
 vim.g.netrw_preview = 1
 vim.g.netrw_alto = 0
 
-vim.cmd('colorscheme rose-pine')
+vim.cmd('colorscheme xcode')
 
 vim.lsp.config('lua_ls', {
     settings = {

config/.config/nvim/lua/plugins/util.lua

@@ -10,6 +10,20 @@ return {
         -- this is equivalent to setup({}) function
     },
 
+    {
+        "NeogitOrg/neogit",
+        dependencies = {
+            "nvim-lua/plenary.nvim",         -- required
+            "sindrets/diffview.nvim",        -- optional - Diff integration
+
+            -- Only one of these is needed.
+            "nvim-telescope/telescope.nvim", -- optional
+            -- "ibhagwan/fzf-lua",              -- optional
+            -- "echasnovski/mini.pick",         -- optional
+            -- "folke/snacks.nvim",             -- optional
+        },
+    },
+
     {
         'brenoprata10/nvim-highlight-colors',
         opts = {

config/.icons/default/index.theme

@@ -1,5 +1 @@
-# This file is written by nwg-look. Do not edit.
+
-[Icon Theme]
-Name=Default
-Comment=Default Cursor Theme
-Inherits=BreezeX-RosePineDawn-Linux