diff --git a/flake.lock b/flake.lock index 59f0c93..20aef74 100644 --- a/flake.lock +++ b/flake.lock @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1712759992, - "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", + "lastModified": 1713077896, + "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=", "owner": "nix-community", "repo": "home-manager", - "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", + "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0", "type": "github" }, "original": { @@ -250,11 +250,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1712835979, - "narHash": "sha256-m44SvLfwPc8qPpBQa5ObOtTe6RbVNfQLpn+bCdlHFxQ=", + "lastModified": 1713102840, + "narHash": "sha256-n0jsKZFFBUElY4Rwi8/KrKppiolCzexIHN1+1UlcJSs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "185a3b48814cc4a1afbf32a69792a6161c4038cd", + "rev": "83ab0f2d663503f5bf5842250698cec29d0a6037", "type": "github" }, "original": { @@ -376,11 +376,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1712793085, - "narHash": "sha256-vHOa0eZOksLCdXKe2fG2+bRpov9kUi0/ER3vo4Cb+Ls=", + "lastModified": 1713051308, + "narHash": "sha256-DaaiUHENmPl1vPrQIJY7sl/LspPBQ/XiLIVeLfqpkKw=", "owner": "neovim", "repo": "neovim", - "rev": "509c053161c0495ac41cf12343089059afb4e813", + "rev": "a92822835521574710a830a7de0e692bf7517fb8", "type": "github" }, "original": { @@ -399,11 +399,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1712793829, - "narHash": "sha256-HCMRXdMc1oGQt99o42DPJRCGzQSY5468HQ+wd8F1q+E=", + "lastModified": 1713053047, + "narHash": "sha256-x17vugcgPuF+w5MpeYUbOlmUw/8tz7W4UetHKCode0E=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "7b7f250e20797291aa46bddd3cd80b4eb080defc", + "rev": "8fa4fbe03aa7475441dd1b9c62e36feea083bfb0", "type": "github" }, "original": { @@ -448,11 +448,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712696601, - "narHash": "sha256-puFPFSa/RC83JilUgB48/VL387eu2QN066Jv6X971LY=", + "lastModified": 1712883908, + "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "062fc6cf99d809921ecef47317752fc92468e6ae", + "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", "type": "github" }, "original": { @@ -464,11 +464,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712837137, - "narHash": "sha256-9joaU/GD35J9Utb0ipelQbOcvsw5eoYTmSarLV3MbNk=", + "lastModified": 1713064665, + "narHash": "sha256-goBKZ4CKodTfkKaEGhpYOz545gnXmLfmn8gjiq7PLpU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "681d4a87b26b1dcaae7ffe6cf88c9912c575415f", + "rev": "bc59f72803cf40fb50f05cb73068d85b5ce21297", "type": "github" }, "original": { @@ -680,11 +680,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1712739632, - "narHash": "sha256-ft0ETC6x4noYnZcWJOn+zSQbQNKfZhtPGgeMxleBLZE=", + "lastModified": 1713083602, + "narHash": "sha256-anyId+jvF/uBFQ3VwpFU5S640rLSM9/FPT3X54OYcgo=", "owner": "Alexays", "repo": "Waybar", - "rev": "e8038ef9f3d85f41821a93fcc6de3310ececab2c", + "rev": "ddacb111a9953332f7cbf0b9812b67731c827a38", "type": "github" }, "original": { @@ -696,20 +696,18 @@ "wlroots": { "flake": false, "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "lastModified": 1712935342, + "narHash": "sha256-zzIbTFNFd/as42jyGx23fil2uBDYYv+8GA5JmRq5y9c=", + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "62eeffbe233d199f520a5755c344e85f8eab7940", + "type": "github" }, "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "62eeffbe233d199f520a5755c344e85f8eab7940", + "type": "github" } }, "xdph": { diff --git a/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua b/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua index c3983e1..ef838e9 100644 --- a/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua +++ b/modules/home-manager/vim/config/lua/plugins/lsp/server-plugins.lua @@ -1,23 +1,27 @@ return { - { "folke/neodev.nvim", ft = "lua", opts = {} }, - { - "b0o/schemastore.nvim", - ft = "json", - config = function() - require("lspconfig").jsonls.setup({ - capabilities = require("lsp.capabilities"), - settings = { - json = { - schemas = require("schemastore").json.schemas(), - validate = { enable = true }, - }, - }, - }) - end, - }, -{ - 'mrcjkb/rustaceanvim', - version = '^4', -- Recommended - ft = { 'rust' }, -} + { "folke/neodev.nvim", ft = "lua", opts = {} }, + { + "b0o/schemastore.nvim", + ft = "json", + config = function() + require("lspconfig").jsonls.setup({ + capabilities = require("lsp.capabilities"), + settings = { + json = { + schemas = require("schemastore").json.schemas(), + validate = { enable = true }, + }, + }, + }) + end, + }, + { + "mrcjkb/rustaceanvim", + version = "^4", -- Recommended + ft = { "rust" }, + }, + { + "christoomey/vim-tmux-navigator", + lazy = false, + }, } diff --git a/modules/shell/default.nix b/modules/shell/default.nix index a62c3ae..effae85 100644 --- a/modules/shell/default.nix +++ b/modules/shell/default.nix @@ -16,7 +16,7 @@ while inotifywait -e close_write $1; do pandoc $@; done ''; in { - imports = [./zsh ./zsh/tools.nix ./git.nix ./starship.nix]; + imports = [./zsh ./zsh/tools.nix ./tmux.nix ./git.nix ./starship.nix]; home.packages = with pkgs; [ texlive diff --git a/modules/shell/tmux.nix b/modules/shell/tmux.nix new file mode 100644 index 0000000..28788c5 --- /dev/null +++ b/modules/shell/tmux.nix @@ -0,0 +1,26 @@ +{pkgs, ...}: let + tmux-super-fingers = + pkgs.tmuxPlugins.mkTmuxPlugin + { + pluginName = "tmux-super-fingers"; + version = "unstable-2023-01-06"; + src = pkgs.fetchFromGitHub { + owner = "artemave"; + repo = "tmux_super_fingers"; + rev = "2c12044984124e74e21a5a87d00f844083e4bdf7"; + sha256 = "sha256-cPZCV8xk9QpU49/7H8iGhQYK6JwWjviL29eWabuqruc="; + }; + }; +in { + programs.tmux = { + enable = true; + shell = "${pkgs.zsh}/bin/zsh"; + historyLimit = 100000; + plugins = with pkgs; [ + tmuxPlugins.sensible + ]; + extraConfig = '' + + ''; + }; +}