diff --git a/.gitmodules b/.gitmodules index 6b6bc40..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "mypkgs"] - path = mypkgs - url = https://github.com/arielherself/mypkgs diff --git a/home-manager/home.nix b/home-manager/home.nix index bb38e99..926d43c 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -4,7 +4,12 @@ let unstable = import { config = { allowUnfree = true; }; }; - mypkgs = import ../mypkgs/default.nix; + mypkgs = import (pkgs.fetchFromGitHub { + owner = "arielherself"; + repo = "mypkgs"; + rev = "75f9b72"; + hash = "sha256-vlfIPxOJ/wxlpLrOIUrxISzysFZ+kZ2nE/ELU2IaJqg="; + }); in { nixpkgs.config.allowUnfree = true; # Home Manager needs a bit of information about you and the paths it should @@ -118,6 +123,7 @@ in { # Networking pkgs.wireshark # pkgs.clash-verge-rev + mypkgs.aria2 # Editor unstable.neovim @@ -296,6 +302,7 @@ in { ''; initExtra = '' me() { mkdir -p "$1" && cd "$1" } + unsetopt pathdirs source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh source ${config.xdg.configHome}/p10k/p10k.zsh diff --git a/mypkgs b/mypkgs deleted file mode 160000 index 17af77d..0000000 --- a/mypkgs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 17af77d44389e7e74f8f82dbc920acb81990e849 diff --git a/nvim/lua/config.lua b/nvim/lua/config.lua index 04df266..c62dc68 100644 --- a/nvim/lua/config.lua +++ b/nvim/lua/config.lua @@ -135,19 +135,19 @@ local plugins = { opts = {}, config = function(_, opts) require'lsp_signature'.setup(opts) end }, - { - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - } - }, + -- { + -- "folke/which-key.nvim", + -- event = "VeryLazy", + -- init = function() + -- vim.o.timeout = true + -- vim.o.timeoutlen = 300 + -- end, + -- opts = { + -- -- your configuration comes here + -- -- or leave it empty to use the default settings + -- -- refer to the configuration section below + -- } + -- }, { 'jdhao/better-escape.vim' -- `jk` without causing `j` to have delay },