Compare commits

..

No commits in common. "b4ad21962e142aff6057f8aa286855f934e1baa6" and "9bf0eadaa04cd48e1af0118e314df59c750b208f" have entirely different histories.

4 changed files with 29 additions and 74 deletions

View file

@ -70,7 +70,6 @@ with builtins; {
aria2 aria2
usbutils usbutils
numbat numbat
devd
]; ];
}; };

View file

@ -8,11 +8,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1709606645, "lastModified": 1707923576,
"narHash": "sha256-yObjAl8deNvx1uIfQn7/vkB9Rnr0kqTo1HVrsk46l30=", "narHash": "sha256-vch1hvgoB2TEl1+0J9h5uPkTrL4zNFUxE/razagkqQQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "arion", "repo": "arion",
"rev": "d2d48c9ec304ac80c84ede138b8c6f298d07d995", "rev": "2b1fa9a8e9e40bb8e65a677c6fdd66dae4f4676e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -49,11 +49,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709336216, "lastModified": 1706830856,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -170,11 +170,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708547820, "lastModified": 1704029560,
"narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=", "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a", "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -190,11 +190,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710423955, "lastModified": 1709445365,
"narHash": "sha256-6N/65EqYVqCaz5SVoPMx2HgA+DJZAlw5lW+U9VHSSbE=", "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "587719494ed18a184c98c4d55dde9469af4446bf", "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +329,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709479366, "lastModified": 1707689078,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -345,11 +345,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1710283656, "lastModified": 1709309926,
"narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", "rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -466,11 +466,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1710272261, "lastModified": 1709237383,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -16,10 +16,6 @@ in
home.packages = with pkgs; [ home.packages = with pkgs; [
lutris lutris
prismlauncher prismlauncher
legendary-gl
wineWowPackages.stable
dxvk_2
vkd3d-proton
]; ];
}; };
}; };

View file

@ -30,31 +30,11 @@
line-number = "relative"; line-number = "relative";
bufferline = "multiple"; bufferline = "multiple";
color-modes = true; color-modes = true;
cursorline = true;
lsp = { lsp = {
display-messages = true; display-messages = true;
display-inlay-hints = true; display-inlay-hints = true;
}; };
shell = ["nu" "-c"]; shell = ["nu" "-c"];
statusline.left = [
"mode"
"spinner"
"spacer"
"version-control"
"file-name"
"diagnostics"
"read-only-indicator"
"file-modification-indicator"
"spacer"
];
statusline.right = [
"workspace-diagnostics"
"register"
"position"
"file-encoding"
"file-type"
];
idle-timeout = 30; idle-timeout = 30;
indent-guides = { indent-guides = {
render = true; render = true;
@ -110,36 +90,20 @@
scope = "type"; scope = "type";
}; };
}; };
completion.termSearch.enable = true;
diagnostics.enable = true;
inlayHints = {
bindingModeHints.enable = true;
closureCaptureHints.enable = true;
closureReturnTypeHints.enable = true;
discriminantHints.enable = true;
expressionAdjustmentHints = {
hideOutsideUnsafe = true;
};
lifetimeElisionHints.enable = "skip_trivial";
};
interpret.tests = true;
lens = {
references = {
adt.enable = true;
trait.enable = true;
};
};
typing.autoClosingAngleBrackets.enable = true;
}; };
}; };
"emmet-language-server" = { "emmet-language-server" = {
command = "emmet-language-server"; command = "emmet-language-server";
args = ["--stdio"]; args = ["--stdio"];
}; };
"psalm" = { # "php" = {
command = "psalm"; # name = "php";
args = ["--language-server"]; # file-types = [ "php" ];
}; # language-server = {
# command = "psalm";
# args = ["--language-server"];
# };
# };
"typst-lsp" = { "typst-lsp" = {
command = "typst-lsp"; command = "typst-lsp";
config = { config = {
@ -162,10 +126,6 @@
name = "nu"; name = "nu";
language-servers = ["nu-builtin-lsp"]; language-servers = ["nu-builtin-lsp"];
} }
{
name = "php";
language-servers = ["psalm"];
}
{ {
name = "typst"; name = "typst";
scope = "source.typst"; scope = "source.typst";