Update deps

flake.lock

@@ -244,11 +244,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699783872,
-        "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
+        "lastModified": 1700118404,
+        "narHash": "sha256-XkqpZpVoy1FV7UbiLkP+fQxxv/6KnwLYkFEHgE8z2IQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "280721186ab75a76537713ec310306f0eba3e407",
+        "rev": "c1a033122df8a3c74fda3780c83a104a7d60873c",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1700037583,
-        "narHash": "sha256-PR0CTwi1G23MrPUR6dT8U8hL6U6YogQPnfGTFDoBGbs=",
+        "lastModified": 1700187596,
+        "narHash": "sha256-EZAN3gQj0mYLCr05oDoaj7E8R1lYBuAYFil2+3R1Qdo=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "d92dd2a0c05148154c353f0e7cd2099b2427308a",
+        "rev": "dc9f7b814517045b5354364655f660aae0989710",
         "type": "github"
       },
       "original": {
@@ -312,11 +312,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700054624,
-        "narHash": "sha256-keCn/xfYMYevyxoF+4B4NDIUy8sx8+greK8aEclWZNg=",
+        "lastModified": 1700213693,
+        "narHash": "sha256-Fa/I0fYJ2Twe2uqyV38b1wTX6Vo6HDokjtCFQXxIPOg=",
         "ref": "refs/heads/master",
-        "rev": "30fc71e41e4ec0011a65b9188b31b2cb82e54134",
-        "revCount": 585,
+        "rev": "5781d052ab86184a8bf2faad89bad408d9c41dfe",
+        "revCount": 587,
         "type": "git",
         "url": "https://git.kempkens.io/daniel/nix-overlay"
       },
@@ -363,11 +363,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1700044047,
-        "narHash": "sha256-L7sCQsyETMknCztejhFCb7QXoa7k92Pv/e8X7OudAuk=",
+        "lastModified": 1700169889,
+        "narHash": "sha256-AnqotTs1cIpx7Rc0ML3cnQwGJGSmlaLQZ2xzbjLU3XQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "68baab123fc4f898ebb6191eca8ae9383604f5f5",
+        "rev": "7bea27b7ef1c23c7433e52327d81a01702d34272",
         "type": "github"
       },
       "original": {
@@ -379,11 +379,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700014976,
-        "narHash": "sha256-dSGpS2YeJrXW5aH9y7Abd235gGufY3RuZFth6vuyVtU=",
+        "lastModified": 1700108881,
+        "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "592047fc9e4f7b74a4dc85d1b9f5243dfe4899e3",
+        "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1",
         "type": "github"
       },
       "original": {

home/config/nvim/init.fnl

@@ -59,6 +59,9 @@
   (set o.swapfile false)
   (set o.undofile true)
   (set o.undodir (.. (os.getenv :HOME) :/.local/share/nvim/undo//))
+  ;; Clipboard
+  (let [clipboard (require :nifoc.clipboard)]
+    (clipboard.setup))
   ;; Theme
   (let [theme (require :nifoc.theme)]
     (theme.setup))

home/config/nvim/nifoc/clipboard.fnl

@@ -0,0 +1,18 @@
+(let [mod {}
+      osc52 (require :vim.ui.clipboard.osc52)
+      uname (vim.loop.os_uname)
+      clip-name :nifocClipboard]
+  (fn mod.setup []
+    (if (= uname.sysname :Darwin)
+        (set vim.g.clipboard {:name clip-name
+                              :copy {:+ osc52.copy :* osc52.copy}
+                              :paste {:+ :pbpaste :* :pbpaste}
+                              :cache_enabled 0})
+        ;; Other OS
+        (set vim.g.clipboard
+             {:name clip-name
+              :copy {:+ osc52.copy :* osc52.copy}
+              :paste {:+ osc52.paste :* osc52.paste}}))
+    (vim.opt.clipboard:prepend :unnamedplus))
+
+  mod)

home/config/nvim/plugins/osc52.fnl

@@ -1,25 +0,0 @@
-(let [osc52 (require :osc52)
-      uname (vim.loop.os_uname)
-      clip-name :nifocClipboard]
-  (osc52.setup {:silent true})
-
-  (fn copy [lines _]
-    (-> lines
-        (table.concat "\n")
-        (osc52.copy)))
-
-  (fn paste []
-    [(vim.fn.split (vim.fn.getreg "") "\n") (vim.fn.getregtype "")])
-
-  (if (= uname.sysname :Darwin)
-      (set vim.g.clipboard {:name clip-name
-                            :copy {:+ :pbcopy :* :pbcopy}
-                            :paste {:+ :pbpaste :* :pbpaste}
-                            :cache_enabled 0})
-      ;; Other OS
-      (set vim.g.clipboard {:name clip-name
-                            :copy {:+ copy :* copy}
-                            :paste {:+ paste :* paste}
-                            :cache_enabled 0}))
-  (vim.opt.clipboard:prepend :unnamedplus))
-

home/programs/nvim/default.nix

@@ -123,12 +123,6 @@ in
         }
 
         # Keybindings
-        {
-          plugin = nvim-osc52;
-          config = builtins.readFile ../../config/nvim/plugins/osc52.fnl;
-          type = "fennel";
-        }
-
         {
           plugin = yanky-nvim;
           config = builtins.readFile ../../config/nvim/plugins/yanky.fnl;
@@ -318,7 +312,7 @@ in
   xdg.configFile."nvim" = {
     source = pkgs.runCommand "nvim-fennel-files"
       {
-        nativeBuildInputs = with pkgs; [ luajitPackages.fennel stylua ];
+        nativeBuildInputs = with pkgs; [ luajitPackages.fennel ];
       } ''
       mkdir -p $out/lua/configuration
       mkdir -p $out/lua/nifoc/utils
@@ -384,8 +378,6 @@ in
       # Other
       echo "Copying tree-sitter queries ..."
       cp -r "$after_store_path/queries" "$out/after/"
-
-      stylua "$out/"
     '';
     recursive = true;
   };

home/programs/nvim/plugins.nix

@@ -40,12 +40,12 @@ in
   };
   nvim-web-devicons = buildVimPlugin {
     pname = "nvim-web-devicons";
-    version = "2023-11-13";
+    version = "2023-11-16";
     src = fetchFromGitHub {
       owner = "kyazdani42";
       repo = "nvim-web-devicons";
-      rev = "11eb26fc166742db8d1e8a6f5a7de9df37b09aae";
-      sha256 = "0xshsc1wxgsvdb09klsddz0ipf43vimsya4rc4zi22xxjgj40dyh";
+      rev = "3523d6e6d40ab11fd66c1b2732b3d6b60affa951";
+      sha256 = "0lycvmfhx97gjdmjc7qchhllzv42jarm6j9y8pcfpvgaj5dqdq4w";
       fetchSubmodules = false;
     };
   };
@@ -60,17 +60,6 @@ in
       fetchSubmodules = false;
     };
   };
-  nvim-osc52 = buildVimPlugin {
-    pname = "nvim-osc52";
-    version = "2023-11-12";
-    src = fetchFromGitHub {
-      owner = "ojroques";
-      repo = "nvim-osc52";
-      rev = "89307570b3bffe115d8b6b6fd3a4066cde0ba2d7";
-      sha256 = "0alsh1r6c5b8zf3jcymmrp921mmmhvws38ih9hbw5yffcy0lqhl2";
-      fetchSubmodules = false;
-    };
-  };
   yanky-nvim = buildVimPlugin {
     pname = "yanky.nvim";
     version = "2023-11-03";
@@ -95,12 +84,12 @@ in
   };
   substitute-nvim = buildVimPlugin {
     pname = "substitute.nvim";
-    version = "2023-10-11";
+    version = "2023-11-17";
     src = fetchFromGitHub {
       owner = "gbprod";
       repo = "substitute.nvim";
-      rev = "cf35db50188f3d7de624ae391c9bb9f2e9de5610";
-      sha256 = "0v1svihxdh74ip1hmbc2aj95znlgvgb8z7ifxyz5sb1bk774460h";
+      rev = "17ffaeb5a1dc2dbef39cf0865d8a4b6000836714";
+      sha256 = "0jf6r6zxgr4709lfl2ry7z8qh4zql8w4x56bqj0jfkga35l9c7c1";
       fetchSubmodules = false;
     };
   };
@@ -117,34 +106,34 @@ in
   };
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2023-11-15";
+    version = "2023-11-17";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "8b9f99660294dcd11d42572c84ee33a1e284f70d";
-      sha256 = "09mkkkirp922018dvci32p9mfsa2fqkv9b6nd1srwicxydx1wzp7";
+      rev = "8199529bc42ab275786d2f2cc83903f35ff6db9e";
+      sha256 = "0831pmrlsplfkzpdyqx7zmygb977rx08n25ir3z8ifflbyvbyz5g";
       fetchSubmodules = false;
     };
   };
   vim-just = buildVimPlugin {
     pname = "vim-just";
-    version = "2023-11-14";
+    version = "2023-11-16";
     src = fetchFromGitHub {
       owner = "NoahTheDuke";
       repo = "vim-just";
-      rev = "8fa4691bc3b593b6deaf885a3af80aafb12f338b";
-      sha256 = "0gic7vfd3jbz5pwn0cchhx4xs05vil590mc90kfkvf97ksr94965";
+      rev = "fda7259fc3b16af1d16e467c1482aac3bcc4df9a";
+      sha256 = "0rfj8hknzwjp59x51wf99j4ymda4gnc2ly1rl3185dw4p3v7n4ph";
       fetchSubmodules = false;
     };
   };
   rainbow-delimiters-nvim = buildVimPlugin {
     pname = "rainbow-delimiters.nvim";
-    version = "2023-11-14";
+    version = "2023-11-16";
     src = fetchFromGitHub {
       owner = "HiPhish";
       repo = "rainbow-delimiters.nvim";
-      rev = "a3cfa42deb8ff13ef41e1fe81f2e60ab06150b7d";
-      sha256 = "1p0yxsdpyy6bvgwbj1k3ha45qv0z7h1rgkm4r2gcflg40gjh6k8g";
+      rev = "538b4aec989e05e86dd42eccafa84f27733f9cf7";
+      sha256 = "0ajfq3i0sm2xdqmfjfykfyzlmr3lcc9myk7zq07sx25lj6qzz41q";
       fetchSubmodules = false;
     };
   };
@@ -161,12 +150,12 @@ in
   };
   telescope-nvim = buildVimPlugin {
     pname = "telescope.nvim";
-    version = "2023-11-15";
+    version = "2023-11-16";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "721cdcae134eb5c564cb6c9df6c317c3854528ad";
-      sha256 = "12kizqyhknpp4931n2fkbdxhb04afpcnxyw6s4z7mf1vsfjz39w2";
+      rev = "18774ec7929c8a8003a91e9e1f69f6c32258bbfe";
+      sha256 = "1vihb6l5xiqbrs1g4c1blpkd0c995hwv2w6sr5b86zzmk70g0c7k";
       fetchSubmodules = false;
     };
   };
@@ -208,23 +197,23 @@ in
   };
   telescope-undo-nvim = buildVimPlugin {
     pname = "telescope-undo.nvim";
-    version = "2023-11-12";
+    version = "2023-11-16";
     src = fetchFromGitHub {
       owner = "debugloop";
       repo = "telescope-undo.nvim";
-      rev = "13c33c173e53f14df7eec5155c52a3d2ab022d8d";
-      sha256 = "0bc3c447491pbp6l20gn4kwd9n7wm4ayac0imsvswpmnvlrh0ibn";
+      rev = "d3afc1c105535a90caec092ce27a113f77ba7b84";
+      sha256 = "0cpkjl6pffwdrh1hawpd042gpnyqbg2r8f1nz0fwdk175bgsx2s8";
       fetchSubmodules = false;
     };
   };
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2023-11-15";
+    version = "2023-11-17";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "d5d7412ff267b92a11a94e6559d5507c43670a52";
-      sha256 = "1jqpsj2in41fv148zdvddpcwjzmll5kchzx9mnbas685xmzc4h0k";
+      rev = "29939f6f07bc0f3b9fc563fbfbee06ac88c8c439";
+      sha256 = "1xkqx4bsi87cgdgx50338igbjvdl9w1ssxpljcllai3l9pg56gwr";
       fetchSubmodules = false;
     };
   };
@@ -274,12 +263,12 @@ in
   };
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "2023-11-13";
+    version = "2023-11-17";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "4f2d968a827d86bb40b7b1fad28c11f7b764fef3";
-      sha256 = "0i60lyzhhnpzxi7k5dy4xacsg8mmc7ac8f8xwlbv32h8jqrblsab";
+      rev = "15fcab91e6a4e2a3e41dc55c5b3471f66c11ce39";
+      sha256 = "1aqycpp4h274bhgx284fy632p89wx54cgjmqd1f0x1i2i94rvgap";
       fetchSubmodules = false;
     };
   };
@@ -483,12 +472,12 @@ in
   };
   gitsigns-nvim = buildVimPlugin {
     pname = "gitsigns.nvim";
-    version = "2023-10-26";
+    version = "2023-11-16";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "gitsigns.nvim";
-      rev = "af0f583cd35286dd6f0e3ed52622728703237e50";
-      sha256 = "04qr0zm8cfrsf306jswah4cja8dsih3b41ikakcbvgq08qsngj86";
+      rev = "37d26d718f8120a8c5c107c580c8c98cf89fdf1f";
+      sha256 = "02w4xk0ps1swpj7fl73rxn15mf799ih04sx6k1wjrbxa5j3vwdqp";
       fetchSubmodules = false;
     };
   };
@@ -498,8 +487,8 @@ in
     src = fetchFromGitHub {
       owner = "j-hui";
       repo = "fidget.nvim";
-      rev = "98047f30e454dd36da00eb354506517166cfec7d";
-      sha256 = "08ib7dzcsn8rgnvfcsj5id6m1rhfd94fhh6s943k2631sc34kq0w";
+      rev = "f10103f8f30fed80a7ab07fff5756164fea87c70";
+      sha256 = "1qw2ib10mca7a8hjpr6sl792shrgn4zmybab3ldzw31v8wk1s24g";
       fetchSubmodules = false;
     };
   };

home/programs/nvim/plugins.yaml

@@ -5,7 +5,6 @@
 - src: kyazdani42/nvim-web-devicons
 - src: willothy/wezterm.nvim
 # Keybindings
-- src: ojroques/nvim-osc52
 - src: gbprod/yanky.nvim
 - src: gbprod/cutlass.nvim
 - src: gbprod/substitute.nvim

home/programs/wezterm.nix

@@ -35,7 +35,7 @@ in
   xdg.configFile."wezterm" = {
     source = pkgs.runCommand "wezterm-fennel-files"
       {
-        nativeBuildInputs = with pkgs; [ lua53Packages.fennel stylua ];
+        nativeBuildInputs = with pkgs; [ lua53Packages.fennel ];
       } ''
       mkdir -p $out
 
@@ -50,8 +50,6 @@ in
       # Config
       echo "Compiling config.fnl ..."
       $fennel "$config_store_path/config.fnl" > "$out/config.lua"
-
-      stylua "$out/"
     '';
     recursive = true;
   };