flake.lock

@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725843309,
+        "lastModified": 1725757047,
-        "narHash": "sha256-8TVcjmIfGM5Arxs9oBtdCTOojhjSQAofUSw7aCjjbnE=",
+        "narHash": "sha256-+0yo6mq+c83a/JgCoMC+VQo+08/mTrkGpy7iN0x5Zl0=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "1770fbd40babfb807f258b70b7992eaf6d09a712",
+        "rev": "863c7532c468f208ce8cb651e44f63408d548c3f",
         "type": "github"
       },
       "original": {
@@ -304,6 +304,22 @@
         "type": "github"
       }
     },
+    "markview-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1725563775,
+        "narHash": "sha256-nSboIBcB9nwfRiyK2y47/T3az0oIUHip1L4vB+iqUwg=",
+        "owner": "OXY2DEV",
+        "repo": "markview.nvim",
+        "rev": "e4b4b9d03b90350236ce88f5be723aa5a8610931",
+        "type": "github"
+      },
+      "original": {
+        "owner": "OXY2DEV",
+        "repo": "markview.nvim",
+        "type": "github"
+      }
+    },
     "nextcloud-cookbook": {
       "flake": false,
       "locked": {
@@ -587,6 +603,7 @@
         "hmts-nvim-src": "hmts-nvim-src",
         "home-manager": "home-manager",
         "mac-app-util": "mac-app-util",
+        "markview-nvim-src": "markview-nvim-src",
         "nextcloud-cookbook": "nextcloud-cookbook",
         "nextcloud-external": "nextcloud-external",
         "nextcloud-news": "nextcloud-news",
@@ -604,6 +621,7 @@
         "ren": "ren",
         "rep": "rep",
         "snipe-nvim-src": "snipe-nvim-src",
+        "stu": "stu",
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
         "tiny-inline-diagnostic-nvim-src": "tiny-inline-diagnostic-nvim-src",
@@ -636,6 +654,22 @@
         "type": "github"
       }
     },
+    "stu": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1725751514,
+        "narHash": "sha256-J70RgnuNlChhdIl0j/pFnIfCV6d9JT+ifYPbRxkoIKU=",
+        "owner": "lusingander",
+        "repo": "stu",
+        "rev": "6899c43edc34aeea99b632ae18c793f040160a99",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lusingander",
+        "repo": "stu",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,

flake.nix

@@ -130,6 +130,10 @@
       url = "github:mfussenegger/nvim-lint";
       flake = false;
     };
+    markview-nvim-src = {
+      url = "github:OXY2DEV/markview.nvim";
+      flake = false;
+    };
     tiny-inline-diagnostic-nvim-src = {
       url = "github:rachartier/tiny-inline-diagnostic.nvim";
       flake = false;
@@ -185,6 +189,12 @@
       flake = false;
     };
 
+    # Stu - TUI for S3
+    stu = {
+      url = "github:lusingander/stu";
+      flake = false;
+    };
+
     # Nextcloud Apps
     nextcloud-news = {
       # https://github.com/nextcloud/news/releases
@@ -261,6 +271,7 @@
         (import ./overlays/betterlockscreen.nix)
         (import ./overlays/gh-collaborators.nix)
         (import ./overlays/ren-rep.nix inputs)
+        (import ./overlays/stu.nix inputs)
       ];
 
       # System types to support.

modules/common/applications/1password.nix

@@ -22,9 +22,10 @@
       "1password-cli"
     ];
     home-manager.users.${config.user} = {
-      home.packages = [
+      home.packages = with pkgs; [
-        pkgs._1password
+        _1password-gui
-      ] ++ (if pkgs.stdenv.isLinux then [ pkgs._1password-gui ] else [ ]);
+        _1password
+      ];
     };
 
     # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app

modules/common/applications/wezterm.nix

@@ -119,9 +119,6 @@
                 font = wezterm.font('${font}', { weight = 'Bold'}),
                 font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"},
 
-		-- Fix color blocks instead of text
-		front_end = "WebGpu",
-
                 -- Tab Bar
                 hide_tab_bar_if_only_one_tab = true,
                 window_frame = {

modules/common/neovim/config/misc.nix

@@ -10,7 +10,6 @@
     pkgs.vimPlugins.vim-eunuch # File manipulation commands
     pkgs.vimPlugins.vim-fugitive # Git commands
     pkgs.vimPlugins.vim-repeat # Better repeat using .
-    pkgs.vimPlugins.vim-abolish # Keep capitalization in substitute (Subvert)
     pkgs.vimPlugins.markview-nvim # Markdown preview
     pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
     pkgs.vimPlugins.which-key-nvim # Keybind helper

overlays/neovim-plugins.nix

@@ -38,6 +38,7 @@ in
     base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
     baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
     hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
+    markview-nvim = plugin "markview-nvim" inputs.markview-nvim-src;
     tiny-inline-diagnostic-nvim = plugin "tiny-inline-diagnostic-nvim" inputs.tiny-inline-diagnostic-nvim-src;
     snipe-nvim = plugin "snipe-nvim" inputs.snipe-nvim-src;
   };

overlays/stu.nix

@@ -0,0 +1,17 @@
+inputs: _final: prev: {
+
+  stu = prev.rustPlatform.buildRustPackage {
+    pname = "stu";
+    version = "0.5.0";
+    src = inputs.stu;
+    cargoHash = "sha256-gUolS7HXkTddxDWDGir4YC+2tJjgB/CCQC49SSRaR6U=";
+    buildInputs =
+      if prev.stdenv.isDarwin then
+        [
+          prev.darwin.apple_sdk.frameworks.CoreGraphics
+          prev.darwin.apple_sdk.frameworks.AppKit
+        ]
+      else
+        [ ];
+  };
+}