ruinous changes

This commit is contained in:
2025-12-02 01:26:30 -06:00
parent e461c80c9d
commit 251c8b6683
3 changed files with 22 additions and 29 deletions
Generated
+7 -7
View File
@@ -28,11 +28,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1764561884, "lastModified": 1764648280,
"narHash": "sha256-vQ3iFPPhxsLqV3c5kgmYP53mVD6id6gsP0tN+oTmqok=", "narHash": "sha256-xniOnxIx/qhm+maO4mb9BZ7FytcUhNeTm1Y/QBjNf8o=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "aba4621459aec251d90d6452e3495b58a8a5e185", "rev": "119826bd51ad1a8012e0585f3a073571a35a812e",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -147,16 +147,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764560356, "lastModified": 1764522689,
"narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
+3 -3
View File
@@ -2,13 +2,13 @@
description = "System Wide Config Controller"; description = "System Wide Config Controller";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = { disko = {
@@ -45,7 +45,7 @@
home-manager.users.roy = { ... }: { home-manager.users.roy = { ... }: {
imports = [ imports = [
./home.nix ./home.nix
nixvim.homeManagerModules.nixvim nixvim.homeModules.nixvim
impermanence.homeManagerModules.impermanence impermanence.homeManagerModules.impermanence
sops-nix.homeManagerModules.sops sops-nix.homeManagerModules.sops
]; ];
+12 -19
View File
@@ -104,7 +104,7 @@
}; };
extensions.force = true; extensions.force = true;
extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [ extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
ublock-origin ublock-origin
vimium-c vimium-c
]; ];
@@ -304,10 +304,8 @@
options.silent = true; options.silent = true;
options.desc = "Focus up"; options.desc = "Focus up";
} }
]; ];
# LSP settings
lsp = { lsp = {
inlayHints.enable = true; inlayHints.enable = true;
servers = { servers = {
@@ -325,8 +323,6 @@
rust_analyzer = { rust_analyzer = {
enable = true; enable = true;
config = { config = {
installRustc = true;
installCargo = true;
cargo = { cargo = {
features = "all"; features = "all";
}; };
@@ -338,72 +334,73 @@
{ {
key = "gd"; key = "gd";
lspBufAction = "definition"; lspBufAction = "definition";
desc = "Goto Definition"; options.desc = "Goto Definition";
options.silent = true; options.silent = true;
mode = [ "n" ]; mode = [ "n" ];
} }
{ {
key = "gr"; key = "gr";
lspBufAction = "references"; lspBufAction = "references";
desc = "Goto References"; options.desc = "Goto References";
options.silent = true; options.silent = true;
mode = [ "n" ]; mode = [ "n" ];
} }
{ {
key = "gD"; key = "gD";
lspBufAction = "declaration"; lspBufAction = "declaration";
desc = "Goto Declaration"; options.desc = "Goto Declaration";
options.silent = true; options.silent = true;
mode = [ "n" ]; mode = [ "n" ];
} }
{ {
key = "gI"; key = "gI";
lspBufAction = "implementation"; lspBufAction = "implementation";
desc = "Goto Implementation"; options.desc = "Goto Implementation";
options.silent = true; options.silent = true;
mode = [ "n" ]; mode = [ "n" ];
} }
{ {
key = "gT"; key = "gT";
lspBufAction = "type_definition"; lspBufAction = "type_definition";
desc = "Type Definition"; options.desc = "Type Definition";
options.silent = true; options.silent = true;
mode = [ "n" ]; mode = [ "n" ];
} }
{ {
key = "K"; key = "K";
lspBufAction = "hover"; lspBufAction = "hover";
desc = "Hover"; options.desc = "Hover";
options.silent = true; options.silent = true;
mode = [ "n" ]; mode = [ "n" ];
} }
{ {
key = "<leader>cw"; key = "<leader>cw";
action = "workspace_symbol"; action = "workspace_symbol";
desc = "Workspace Symbol"; options.desc = "Workspace Symbol";
mode = [ "n" ]; mode = [ "n" ];
} }
{ {
key = "<leader>r"; key = "<leader>r";
action = "rename"; action = "rename";
options.desc = "Rename variable";
mode = [ "n" ]; mode = [ "n" ];
} }
{ {
key = "<leader>cd"; key = "<leader>cd";
action = "open_float"; action = "open_float";
desc = "Line Diagnostics"; options.desc = "Line Diagnostics";
mode = [ "n" ]; mode = [ "n" ];
} }
{ {
key = "]d"; key = "]d";
action = "goto_next"; action = "goto_next";
desc = "Next Diagnostic"; options.desc = "Next Diagnostic";
mode = [ "n" ]; mode = [ "n" ];
} }
{ {
key = "[d"; key = "[d";
action = "goto_prev"; action = "goto_prev";
desc = "Previous Diagnostic"; options.desc = "Previous Diagnostic";
mode = [ "n" ]; mode = [ "n" ];
} }
]; ];
@@ -411,8 +408,6 @@
plugins = { plugins = {
lualine.enable = true; lualine.enable = true;
lsp-lines.enable = true;
lsp-format.enable = true;
neo-tree = { neo-tree = {
enable = true; enable = true;
@@ -431,7 +426,6 @@
{name = "buffer";} {name = "buffer";}
{name = "luasnip";} {name = "luasnip";}
]; ];
mapping = { mapping = {
"<C-Space>" = "cmp.mapping.complete()"; "<C-Space>" = "cmp.mapping.complete()";
"<C-d>" = "cmp.mapping.scroll_docs(-4)"; "<C-d>" = "cmp.mapping.scroll_docs(-4)";
@@ -444,7 +438,6 @@
}; };
}; };
}; };
extraConfigLua = '' extraConfigLua = ''
local _border = "rounded" local _border = "rounded"