Add some packages and configs

darwin/default.nix

@@ -13,7 +13,6 @@
   # See workaround at ../home/copyApplications.nix
   environment.systemPackages = with pkgs; [
     discord-ptb
-    element-desktop
     # firefox *
     kitty
     lagrange

darwin/homebrew.nix

@@ -7,7 +7,9 @@ let
 in
 
 {
-  environment.shellInit = mkIf brewEnabled ''
+  # perma-enabling to prevent losing brew when we skip bundling
+  # environment.shellInit = mkIf brewEnabled ''
+  environment.shellInit = ''
     eval "$(${config.homebrew.brewPrefix}/brew shellenv)"
   '';
 
@@ -63,6 +65,8 @@ in
     # "mullvadvpn"
     "origin"
     "rectangle"
+    "seaglass"
+    "secretive"
     "signal"
     "steam"
     "transmission"

flake.lock

@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "auto-pairs-kak-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1647175978,
+        "narHash": "sha256-MgqCuGj03ctKty2yQgQvy6qV/0s7euNwukhSjqauqW8=",
+        "owner": "alexherbo2",
+        "repo": "auto-pairs.kak",
+        "rev": "bfdcb8566076f653ec707f86207f83ea75173ce9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "alexherbo2",
+        "repo": "auto-pairs.kak",
+        "type": "github"
+      }
+    },
     "dark-mode-notify-src": {
       "flake": false,
       "locked": {
@@ -104,6 +120,22 @@
         "type": "github"
       }
     },
+    "kakoune-sudo-write-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1629101282,
+        "narHash": "sha256-O+yw8upyYnQThDoWKnFbjrjthPTCm6EaBUoJNqpUPLA=",
+        "owner": "occivink",
+        "repo": "kakoune-sudo-write",
+        "rev": "ec0d6d26ceaadd93d6824630ba587b31e442214d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "occivink",
+        "repo": "kakoune-sudo-write",
+        "type": "github"
+      }
+    },
     "luar-src": {
       "flake": false,
       "locked": {
@@ -170,12 +202,14 @@
     },
     "root": {
       "inputs": {
+        "auto-pairs-kak-src": "auto-pairs-kak-src",
         "dark-mode-notify-src": "dark-mode-notify-src",
         "darwin": "darwin",
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "homebrew-enabled": "homebrew-enabled",
+        "kakoune-sudo-write-src": "kakoune-sudo-write-src",
         "luar-src": "luar-src",
         "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",

flake.nix

@@ -34,6 +34,14 @@
       url = github:andreyorst/smarttab.kak;
       flake = false;
     };
+    auto-pairs-kak-src = {
+      url = github:alexherbo2/auto-pairs.kak;
+      flake = false;
+    };
+    kakoune-sudo-write-src = {
+      url = github:occivink/kakoune-sudo-write;
+      flake = false;
+    };
   };
 
   outputs = { self, darwin, nixpkgs, home-manager, flake-utils, ... }@inputs:
@@ -205,6 +213,11 @@
           lib = prev.lib // {
             homebrew-enabled = inputs.homebrew-enabled.value;
           };
+          kakounePlugins = prev.kakounePlugins // {
+            auto-pairs-kak = prev.kakounePlugins.auto-pairs-kak.overrideAttrs (attrs: {
+              src = inputs.auto-pairs-kak-src;
+            });
+          };
         };
       };
 

home/default.nix

@@ -62,6 +62,19 @@
         ctrlp
       ];
     };
+    ssh = {
+      enable = true;
+      matchBlocks."*".extraOptions = {
+        UseKeychain = "yes";
+        AddKeysToAgent = "yes";
+        IdentityFile = "~/.ssh/id_ed25519";
+      };
+      matchBlocks.remarkable = {
+        hostname = "10.11.99.1";
+        user = "root";
+        port = 22;
+      };
+    };
     # vscode
     vscode = with pkgs; {
       enable = true;
@@ -76,6 +89,7 @@
   home.packages = with pkgs; [
     # System
     abduco # lightweight session management
+    atool # archive tool
     bottom # fancy version of `top` with ASCII graphs
     coreutils
     curl
@@ -85,6 +99,7 @@
     mosh # wrapper for `ssh` that better at not dropping connections
     procs # fancy version of `ps`
     pv # pipe progress viewer
+    rage # command line file encryption
     thefuck
     unrar # extract RAR archives
     wget

home/kakoune.nix

@@ -106,9 +106,10 @@ in
         # lsp hooks
         {
           name = "WinSetOption";
-          option = "filetype=(haskell)";
+          option = "filetype=(none)";
           commands = ''
             lsp-enable-window
+            lsp-auto-hover-enable
           '';
         }
         # general hooks
@@ -119,6 +120,13 @@ in
             set-option window indentwidth 2
           '';
         }
+        {
+          name = "WinCreate";
+          option = ".*";
+          commands = ''
+            kakboard-enable
+          '';
+        }
       ];
 
       indentWidth = 4;
@@ -142,6 +150,24 @@ in
           mode = "normal";
           docstring = "Open fzf-mode buffer dialog with ctrl-b";
         }
+        {
+          key = "v";
+          effect = ": vertical-selection-down<ret>";
+          mode = "user";
+          docstring = "Extend vertical selection down";
+        }
+        {
+          key = "<a-v>";
+          effect = ": vertical-selection-up<ret>";
+          mode = "user";
+          docstring = "Extend vertical selection up";
+        }
+        {
+          key = "V";
+          effect = ": vertical-selection-up-and-down<ret>";
+          mode = "user";
+          docstring = "Extend vertical selection both up and down";
+        }
       ];
 
       numberLines.enable = true;
@@ -167,6 +193,8 @@ in
 
     extraConfig = ''
       eval %sh{${pkgs.kak-lsp}/bin/kak-lsp --kakoune -s $kak_session}
+      enable-auto-pairs
+      alias global w!! sudo-write
     '';
 
     plugins = with pkgs.kakounePlugins; [
@@ -179,9 +207,10 @@ in
       kakoune-state-save
       kakoune-vertical-selection
       pkgs.smarttab-kak
-      # needs luar
+      pkgs.kakoune-sudo-write
-      pkgs.luar
+      # disabled, tabs-kak tries to load before luar for some reason
-      tabs-kak
+      # pkgs.luar
+      # tabs-kak
     ];
   };
   programs.fish.functions.set-kak-colors = {

home/kitty.nix

@@ -66,6 +66,8 @@ in
 
     # Shell integration manually enabled for fish
     shell_integration = "disabled";
+
+    macos_option_as_alt = "both";
   };
 
   # Change the style of italic font variants

pkgs/default.nix

@@ -8,6 +8,7 @@ let
     "dark-mode-notify"
     "luar"
     "smarttab-kak"
+    "kakoune-sudo-write"
   ];
 in
 genAttrs pkgs buildPkg

pkgs/kakoune-sudo-write.nix

@@ -0,0 +1,8 @@
+{ kakouneUtils, kakoune-sudo-write-src, ... }:
+
+with kakouneUtils;
+
+buildKakounePlugin {
+  name = "kakoune-sudo-write";
+  src = kakoune-sudo-write-src;
+}