9 files changed, 77 insertions, 20 deletions

diff --git a/flake.lock b/flake.lock
index 1ea6df4..6e39042 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,6 +40,27 @@
         "type": "github"
       }
     },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "talon",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1693660503,
+        "narHash": "sha256-B/g2V4v6gjirFmy+I5mwB2bCYc0l3j5scVfwgl6WOl8=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "bd5bdbb52350e145c526108f4ef192eb8e554fa0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1662714967,
@@ -71,6 +92,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1698318101,
+        "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "prompt": {
       "inputs": {
         "nixpkgs": [
@@ -98,9 +135,29 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "prompt": "prompt",
+        "talon": "talon",
         "vim-colors-plain": "vim-colors-plain"
       }
     },
+    "talon": {
+      "inputs": {
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1701208467,
+        "narHash": "sha256-1xt+pieI5N1muLQ3NVuar9yl/YpkWX4/2+LPdhPC31Y=",
+        "owner": "nix-community",
+        "repo": "talon-nix",
+        "rev": "75a4a73b457ccbb44229dc9a5ec97c2ca46da065",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "talon-nix",
+        "type": "github"
+      }
+    },
     "vim-colors-plain": {
       "inputs": {
         "nixpkgs": [
@@ -108,11 +165,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662030705,
-        "narHash": "sha256-eMPhWbybSTbf109A53Gmim6dGt7NwRwCfVbRXMIIEEo=",
+        "lastModified": 1702647482,
+        "narHash": "sha256-HLDqIfRjzb3YAdpjBW7iN2YCWWxSkTgu+MzKV5+H/WQ=",
         "ref": "refs/heads/master",
-        "rev": "b381e6949ccd13b44fcab7b67e91dec2bb37deb2",
-        "revCount": 57,
+        "rev": "bfa854ec04e0dab4c69911595d0653a34f626f1d",
+        "revCount": 58,
         "type": "git",
         "url": "https://git.peppe.rs/vim/vim-colors-plain"
       },
diff --git a/flake.nix b/flake.nix
index d659c3f..f57748d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,15 +10,8 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # home-manager = {
-    #   url = "path:/home/np/code/home-manager";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
 
-    # statix = {
-    #   url = "git+https://git.peppe.rs/languages/statix";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
+    talon.url = "github:nix-community/talon-nix";
 
     prompt = {
       url = "git+https://git.peppe.rs/cli/prompt";
@@ -46,6 +39,7 @@
     , prompt
     , better-text-objs
     , vim-colors-plain
+    , talon
     , ...
     } @ inputs: {
 
@@ -54,6 +48,7 @@
         prompt = prompt.overlay;
         better-text-objs = better-text-objs.overlay;
         vim-colors-plain = vim-colors-plain.overlay;
+        talon = talon.overlays.default;
       };
 
       nixosConfigurations = {
diff --git a/font.nix b/font.nix
index 02425b1..74afcdd 100644
--- a/font.nix
+++ b/font.nix
@@ -1,3 +1,3 @@
 {
-  name = "CommitMono";
+  name = "Nerd Input";
 }
diff --git a/home.nix b/home.nix
index 7f73e46..6500216 100644
--- a/home.nix
+++ b/home.nix
@@ -88,6 +88,7 @@
     # input
     xinput_calibrator
     libinput
+    talon
 
     # meta
     nixpkgs-review
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix
index 09da894..069425f 100644
--- a/hosts/myrtle/configuration.nix
+++ b/hosts/myrtle/configuration.nix
@@ -53,6 +53,7 @@
     prompt
     better-text-objs
     vim-colors-plain
+    talon
   ];
 
   environment = {
@@ -123,7 +124,7 @@
     };
     sensor.iio.enable = true; # enable screen autorotate
     asus.battery = {
-      chargeUpto = 100;
+      chargeUpto = 80;
     };
   };
 
diff --git a/programs/init.vim b/programs/init.vim
index 8336db6..c62f419 100644
--- a/programs/init.vim
+++ b/programs/init.vim
@@ -176,4 +176,5 @@ lua << EOF
 require 'lsp'
 require 'treesitter'
 require 'completions'
+require 'leap'
 EOF
diff --git a/programs/neovim.nix b/programs/neovim.nix
index 9585e37..0430868 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -13,7 +13,7 @@
     withPython3 = true;
     extraPackages = with pkgs; [
       # gcc
-      # python37Packages.yapf
+      python311Packages.yapf
       # hlint
       # ocamlformat
     ];
@@ -41,17 +41,16 @@
       # syntax
       rust-vim
       haskell-vim
-      elm-vim
       vim-nix
-      vimtex
 
       # handy
-      vim-gitgutter
       tabular
-      emmet-vim
-      vimwiki
       fzf-vim
+
+      # motion
+      leap-nvim
     ] ++ [
+      # own
       pkgs.better-text-objs
       pkgs.vim-colors-plain
     ];
diff --git a/programs/tmux.nix b/programs/tmux.nix
index f061997..43778dd 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -72,6 +72,7 @@ in
       set escape-time 20
       set -g mouse on
 
+
       set -g base-index 1
       setw -g pane-base-index 1
 
@@ -113,6 +114,7 @@ in
       bind-key -T copy-mode-vi v send-keys -X begin-selection
       bind-key -T copy-mode-vi y send-keys -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c "
       bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
+      bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "xclip -i -sel p -f | xclip -i -sel c "
       bind P paste-buffer
 
       set-window-option -g allow-rename off
diff --git a/services/default.nix b/services/default.nix
index b2a39bb..0a3977d 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -16,6 +16,7 @@
 
   services = {
     lorri.enable = true;
+    syncthing.enable = true;
     gpg-agent = {
       enable = true;
       defaultCacheTtl = 60 * 60 * 24 * 7;