use Nix to handle mypkgs submodule

This commit is contained in:
arielherself 2024-08-21 16:24:01 +08:00
parent e2c7c58239
commit fb7b811b82
Signed by: arielherself
SSH Key Fingerprint: SHA256:AK3cyo9tFsp7Mox7K0sYphleC8hReXhnRKxwuDT5LBc
4 changed files with 21 additions and 18 deletions

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "mypkgs"]
path = mypkgs
url = https://github.com/arielherself/mypkgs

View File

@ -4,7 +4,12 @@
let let
unstable = import <nixos-unstable> { config = { allowUnfree = true; }; }; unstable = import <nixos-unstable> { 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 { in {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
@ -118,6 +123,7 @@ in {
# Networking # Networking
pkgs.wireshark pkgs.wireshark
# pkgs.clash-verge-rev # pkgs.clash-verge-rev
mypkgs.aria2
# Editor # Editor
unstable.neovim unstable.neovim
@ -296,6 +302,7 @@ in {
''; '';
initExtra = '' initExtra = ''
me() { mkdir -p "$1" && cd "$1" } me() { mkdir -p "$1" && cd "$1" }
unsetopt pathdirs
source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
source ${config.xdg.configHome}/p10k/p10k.zsh source ${config.xdg.configHome}/p10k/p10k.zsh

1
mypkgs

@ -1 +0,0 @@
Subproject commit 17af77d44389e7e74f8f82dbc920acb81990e849

View File

@ -135,19 +135,19 @@ local plugins = {
opts = {}, opts = {},
config = function(_, opts) require'lsp_signature'.setup(opts) end config = function(_, opts) require'lsp_signature'.setup(opts) end
}, },
{ -- {
"folke/which-key.nvim", -- "folke/which-key.nvim",
event = "VeryLazy", -- event = "VeryLazy",
init = function() -- init = function()
vim.o.timeout = true -- vim.o.timeout = true
vim.o.timeoutlen = 300 -- vim.o.timeoutlen = 300
end, -- end,
opts = { -- opts = {
-- your configuration comes here -- -- your configuration comes here
-- or leave it empty to use the default settings -- -- or leave it empty to use the default settings
-- refer to the configuration section below -- -- refer to the configuration section below
} -- }
}, -- },
{ {
'jdhao/better-escape.vim' -- `jk` without causing `j` to have delay 'jdhao/better-escape.vim' -- `jk` without causing `j` to have delay
}, },