diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 05ee16d..0c4fa4a 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,21 +1,21 @@ { - "LuaSnip": { "branch": "master", "commit": "faf3c94a44508cec1b961406d36cc65113ff3b98" }, + "LuaSnip": { "branch": "master", "commit": "776a29c3e1ac61029ac3f57ac6b5937df2340162" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, - "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" }, + "conform.nvim": { "branch": "master", "commit": "f643d1b51d1d3d14c8641a46ce44f6bce73c2697" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "luau-lsp.nvim": { "branch": "main", "commit": "f81c6c713e4598abc484cbeabca918475d176c54" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "67da97f8c2fd12d05427bb485ce07ee6418e0a51" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c2682b0d9732bf52cbc34862056f143e71dc4a6d" }, "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, - "mini.nvim": { "branch": "main", "commit": "de0a88d925c8e69fdbb498141207ee43504e5cd1" }, + "mini.nvim": { "branch": "main", "commit": "5a10dfb3ab49b3ee2425bc2c215b5067ccce1c79" }, "neovim": { "branch": "main", "commit": "6b9840790cc7acdfadde07f308d34b62dd9cc675" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "03bc581e05e81d33808b42b2d7e76d70adb3b595" }, - "nvim-tree.lua": { "branch": "master", "commit": "ebcaccda1c575fa19a8087445276e6671e2b9b37" }, + "nvim-lspconfig": { "branch": "master", "commit": "8adb3b5938f6074a1bcc36d3c3916f497d2e8ec4" }, + "nvim-tree.lua": { "branch": "master", "commit": "1c733e8c1957dc67f47580fe9c458a13b5612d5b" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, diff --git a/nix/modules/commonPackages.nix b/nix/modules/commonPackages.nix index dc2aee6..89071da 100644 --- a/nix/modules/commonPackages.nix +++ b/nix/modules/commonPackages.nix @@ -46,8 +46,10 @@ gnumake watchman bat - cargo - rustc + rustup + emote + pkg-config + openssl ]; programs.nix-ld.enable = lib.mkDefault true; programs.zsh.enable = lib.mkDefault true; diff --git a/nix/modules/default.nix b/nix/modules/default.nix index 79f2395..38be5d8 100644 --- a/nix/modules/default.nix +++ b/nix/modules/default.nix @@ -12,6 +12,5 @@ ./kanata.nix ./pipewire.nix ./keys.nix - ./keyd.nix ]; } diff --git a/nix/modules/i3.nix b/nix/modules/i3.nix index a124c94..1a2fce0 100644 --- a/nix/modules/i3.nix +++ b/nix/modules/i3.nix @@ -66,6 +66,7 @@ enable = true; vSync = true; }; + services.copyq.enable = true; xsession.initExtra = '' xset s off diff --git a/nix/modules/keyd.nix b/nix/modules/keyd.nix deleted file mode 100644 index d95162d..0000000 --- a/nix/modules/keyd.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -{ - options.keyd = { - enable = lib.mkEnableOption "enable keyd"; - }; - - config = lib.mkIf config.keyd.enable { - users.extraGroups.keyd = { - name = "keyd"; - }; - users.users.luca.extraGroups = [ "keyd" ]; - environment.systemPackages = with pkgs; [ - keyd - ]; - services.keyd = { - enable = true; - keyboards.main = { - settings = { - main = { - capslock = "esc"; - }; - }; - }; - }; - }; -} diff --git a/nix/users/luca/zsh.nix b/nix/users/luca/zsh.nix index 5d16c34..c3173ad 100644 --- a/nix/users/luca/zsh.nix +++ b/nix/users/luca/zsh.nix @@ -23,6 +23,7 @@ in export GOPATH="$HOME/go" export GOBIN="$HOME/go/bin" export PATH="$GOBIN:$PATH" + alias cat="bat" '' + "\n" + aliases;