servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[feat] Update to latest

Browse Source
This commit is contained in:
uttarayan21
2024-03-13 03:15:23 +05:30
parent 5b83bd79c0
commit 3d2ef975b8
5 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/nix/common/home.nix
View File

@@ -15,9 +15,9 @@ in
home.packages = with pkgs; home.packages = with pkgs;
[ [
gnupg gnupg
gpg-tui # gpg-tui
comma comma
neovide # neovide
sqls sqls
vcpkg vcpkg
file file
@@ -29,7 +29,7 @@ in
just just
jq jq
tldr tldr
spotify-player # spotify-player
bottom bottom
qmk qmk
nodejs nodejs

22
config/nix/common/nvim/default.nix
View File

@@ -3,8 +3,6 @@
programs.nixneovim = { programs.nixneovim = {
enable = true; enable = true;
options = { options = {
foldexpr = "nvim_treesitter#foldexpr()";
foldmethod = "expr";
number = true; number = true;
relativenumber = true; relativenumber = true;
tabstop = 4; tabstop = 4;
@@ -48,7 +46,7 @@
lua-language-server.enable = true; lua-language-server.enable = true;
jsonls.enable = true; jsonls.enable = true;
html.enable = true; html.enable = true;
pylyzer.enable = true; # pylyzer.enable = true;
sqls = { sqls = {
enable = true; enable = true;
onAttachExtra = onAttachExtra =
@@ -60,7 +58,7 @@
# rust-analyzer.enable = true; # rust-analyzer.enable = true;
}; };
extraLua.pre = extraLua.pre =
# lua /* lua */
'' ''
local lsp_zero = require'lsp-zero' local lsp_zero = require'lsp-zero'
local lspconfig = require 'lspconfig' local lspconfig = require 'lspconfig'
@@ -88,6 +86,7 @@
enable = true; enable = true;
autoStart = true; autoStart = true;
}; };
treesitter-context.enable = true;
ts-context-commentstring.enable = true; ts-context-commentstring.enable = true;
treesitter = { treesitter = {
@@ -97,9 +96,10 @@
refactor = { refactor = {
smartRename = { smartRename = {
enable = true; enable = true;
keymaps = { smartRename = "<leader>rn"; };
}; };
}; };
grammars = [ pkgs.tree-sitter-grammars.tree-sitter-just ];
installAllGrammars = true;
}; };
mini = { mini = {
@@ -177,18 +177,6 @@
trouble-nvim trouble-nvim
crates-nvim crates-nvim
sqls-nvim sqls-nvim
# (nvim-treesitter.withPlugins (_: nvim-treesitter.allGrammars ++ [
# (pkgs.tree-sitter.buildGrammar {
# language = "just";
# version = "8af0aab";
# src = pkgs.fetchFromGitHub {
# owner = "IndianBoy42";
# repo = "tree-sitter-just";
# rev = "8af0aab79854aaf25b620a52c39485849922f766";
# sha256 = "sha256-hYKFidN3LHJg2NLM1EiJFki+0nqi1URnoLLPknUbFJY=";
# };
# })
# ]))
# No more postman # No more postman
rest-nvim rest-nvim

78
config/nix/flake.lock generated
View File

@@ -123,11 +123,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709485267, "lastModified": 1710003968,
"narHash": "sha256-bunOdYTK9YNiy+u0D6YN8q40oAeHoQ+9EgoatF3InJ8=", "narHash": "sha256-g8+K+mLiNG5uch35Oy9oDQBAmGSkCcqrd0Jjme7xiG0=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "e4a71521a8eafc07524c55326ecc4ea942b06e25", "rev": "10484f86201bb94bd61ecc5335b1496794fedb78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -236,11 +236,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706830856, "lastModified": 1709336216,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -311,11 +311,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1709126324, "lastModified": 1710146030,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -445,11 +445,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704029560, "lastModified": 1708547820,
"narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", "narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", "rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -465,11 +465,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709988192, "lastModified": 1710273215,
"narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=", "narHash": "sha256-AfVYEQIhOK6vaYVndgqFV4Vb5REXG9R0ylv83QInsT0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030", "rev": "a500de54b2e3067201a40cefa5f210f719423ddf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -509,11 +509,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1709596966, "lastModified": 1710170683,
"narHash": "sha256-0aLjtDt6UzJNsY/Xl8F46LmXLTq6RHtAoZtAskv55JU=", "narHash": "sha256-ya+kRZ/37f0fdR+9BegJlx7TL6PxXzc4Vd52jf5xvSs=",
"owner": "JakeStanger", "owner": "JakeStanger",
"repo": "ironbar", "repo": "ironbar",
"rev": "59307f3aef37d39bd61304ab665af90d5048259e", "rev": "18ee921fab20578f08b229d0fdbe72db02d45927",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -535,11 +535,11 @@
"rust-overlay": "rust-overlay_4" "rust-overlay": "rust-overlay_4"
}, },
"locked": { "locked": {
"lastModified": 1709641033, "lastModified": 1710171982,
"narHash": "sha256-Eegyvq56NiXgrDrZ6FgE1lNCD2Mi6aLY/HFOeVG8ZtI=", "narHash": "sha256-WFMB+Yohcvego1/vOtaq+MJ8Wvp5meOANfNifg26Ie4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "3881267e84cc966ded48601390e88fc13d960319", "rev": "19ad7fd5724f30868748b8156ff25be838cd2bc5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -576,11 +576,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1708040042, "lastModified": 1710199222,
"narHash": "sha256-8iloeE/jALIKcOcYKgTlI9i7iDW7n52Epqps27jGklU=", "narHash": "sha256-iZ8v1gkzUVVI9t5BKHAxRHgMpUjJq/yJgB7VyCUMTag=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "04dfa2eea914086a9f42a5a00a33e9524f9fded4", "rev": "b02a4d8ac39bafdbfd490bfbab35e3202e6f709c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -601,11 +601,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709942621, "lastModified": 1710201806,
"narHash": "sha256-8VHrHzAOR1N8VxJm4i4D1EoNHhN1gfVOUOUidxMGZZI=", "narHash": "sha256-ySFpQv1cVsm1uGr/cbtfvWht6Kszfy/aP3TjiLQ8h0w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "055a08233a86e7fe538db9d42fe5a92340e8de92", "rev": "a6185e08ac09b6528b7120cd2886610eaffd68de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -621,11 +621,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709771483, "lastModified": 1710255615,
"narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=", "narHash": "sha256-DFooGP2D6cNfOj35qkptUgG0r+VxuI38QgNAoYxmVE0=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6", "rev": "c7ae5dc969b93f3221f5c228f0ec3de3e2b8084e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -856,11 +856,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1709703039, "lastModified": 1709961763,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -905,11 +905,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1709999056, "lastModified": 1710276687,
"narHash": "sha256-YZBLyvYRIsT9jSo9rxhFLq4XvE9woduFdxyzTaOwZys=", "narHash": "sha256-S53VF0PA1pTz87oi3NKID7BnOqUFrKOflLXA/9DL46M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "b9fdd3dace5a629c585a2e137563c2a04fe59e40", "rev": "b221a8e8493458bf33a754d86970bc656fdc43cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1067,11 +1067,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709431943, "lastModified": 1710036830,
"narHash": "sha256-CqTcEJGITB3rfSuAcWC1QZnbVnIipXmIDbZHfxsAy80=", "narHash": "sha256-pnV4gO3N/7/GzyRSKTRlSfS/19KJiPSvYcL4apnSkoQ=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "362184acf4a991f27fc222864e94a2e81b3c3c9f", "rev": "d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c",
"type": "github" "type": "github"
}, },
"original": { "original": {

31
config/nix/overlays.nix
View File

@@ -9,7 +9,21 @@ let
}; };
vimPlugins = final: prev: { vimPlugins = final: prev: {
vimPlugins = prev.vimPlugins // { vimPlugins = prev.vimPlugins // {
# nvim-treesitter # nvim-treesitter = prev.vimPlugins.nvim-treesitter.override(.allGrammars ++ [
# (prev.vimPlugins.nvim-treesitter.allGrammars ++ [
# (prev.vimPluginspkgs.tree-sitter.buildGrammar {
# language = "just";
# version = "8af0aab";
# src = final.pkgs.fetchFromGitHub {
# owner = "IndianBoy42";
# repo = "tree-sitter-just";
# rev = "613b3fd39183bec94bc741addc5beb6e6f17969f";
# sha256 = final.pkgs.lib.fakeSha256;
# # sha256 = "sha256-hYKFidN3LHJg2NLM1EiJFki+0nqi1URnoLLPknUbFJY=";
# };
# })
# ]);
comfortable-motion = final.pkgs.vimUtils.buildVimPlugin { comfortable-motion = final.pkgs.vimUtils.buildVimPlugin {
name = "comfortable-motion"; name = "comfortable-motion";
src = final.pkgs.fetchFromGitHub { src = final.pkgs.fetchFromGitHub {
@@ -43,7 +57,7 @@ let
owner = "rest-nvim"; owner = "rest-nvim";
repo = "rest.nvim"; repo = "rest.nvim";
rev = "main"; rev = "main";
sha256 = "sha256-EclCwr0Oi6+5zF47niO0nt8wjNmb6cAADxd7S71DAiI"; sha256 = "sha256-3EC0j/hEbdQ8nJU0I+LGmE/zNnglO/FrP/6POer0338=";
}; };
}; };
}; };
@@ -74,6 +88,18 @@ let
ln -s ${inputs.nix-index-database.legacyPackages.${prev.system}.database} $out/files ln -s ${inputs.nix-index-database.legacyPackages.${prev.system}.database} $out/files
''; '';
}); });
treesitterGrammars = (final: prev: {
treesitter-just = prev.pkgs.tree-sitter.buildGrammar {
language = "just";
version = "8af0aab";
src = final.pkgs.fetchFromGitHub {
owner = "IndianBoy42";
repo = "tree-sitter-just";
rev = "613b3fd39183bec94bc741addc5beb6e6f17969f";
sha256 = "sha256-OBlXwWriE6cdGn0dhpfSMnJ6Rx1Z7KcXehaamdi/TxQ";
};
};
});
in in
[ [
catppuccinThemes catppuccinThemes
@@ -85,4 +111,5 @@ in
# inputs.nixneovimplugins.overlays.default # inputs.nixneovimplugins.overlays.default
inputs.nur.overlay inputs.nur.overlay
nix-index-db nix-index-db
treesitterGrammars
] ]

2
config/nix/themes/catppuccin.nix
View File

@@ -25,7 +25,7 @@ in
bat = mkCatppuccin { bat = mkCatppuccin {
item = "bat"; item = "bat";
sha256 = "sha256-PLbTLj0qhsDj+xm+OML/AQsfRQVPXLYQNEPllgKcEx4"; sha256 = "sha256-yHt3oIjUnljARaihalcWSNldtaJfVDfmfiecYfbzGs0";
}; };
hyprland = mkCatppuccin { hyprland = mkCatppuccin {