Compare commits

..

No commits in common. "86e8bb500a3fe3f28c716dd2a9ff20020734f431" and "a7e75316d0ad58015adfb2f1bb76d662c837778f" have entirely different histories.

6 changed files with 33 additions and 51 deletions

50
flake.lock generated
View file

@ -254,11 +254,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1747742635, "lastModified": 1746902926,
"narHash": "sha256-fZNk+9hibQkULxY8c+ETnFQQopA2WRdPEXdwmjleXys=", "narHash": "sha256-PNZeR2LT4NuP+5IMQUGvXvzKvqs35JuFMZLQgnyOLYA=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "3a6c9747b8de3350c38ba504916233d9d4c33c5c", "rev": "63a1a94d924edc3fadb9ca632a37d71abe6a202c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -393,11 +393,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1747610850, "lastModified": 1746981380,
"narHash": "sha256-b41pc9J8b9fxRFHBQRKoTXZHpAsKW5eJbNsTMris2Mo=", "narHash": "sha256-DtbrvHzKF4diOJWx1FB5wIh8SCSk1Iq5pkA7mh3JAJc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland", "repo": "hyprland",
"rev": "eb3b38d40baca5c05ddbc1507b3d3f02a0ccb164", "rev": "04124988e8b4a9cdfc5995388ebfaad0005b4b31",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -605,11 +605,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1747056319, "lastModified": 1746809399,
"narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", "narHash": "sha256-rMYfYaUpKuyMpDnodIfgFOnj6Wn0duItZvG4kQODcZo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", "rev": "8f27abb5e623d83db4988ee3e864df48181e7c30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -709,11 +709,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1747542820, "lastModified": 1746904237,
"narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -749,11 +749,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747372754, "lastModified": 1746537231,
"narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -795,11 +795,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747638064, "lastModified": 1747013431,
"narHash": "sha256-juEWrS6mOnlU5hva6sewhlRxTFc3cV8bV2Tt3xyTlcg=", "narHash": "sha256-gCQprMblYaezaC/vkqeIXeayJvzgg5UMEY/kb/Ivp/k=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "02e06ea5774eeb3af982a483e5c7e949d276eafc", "rev": "ca26210cc48bf48a42ad820e25fa884cc122b7b4",
"revCount": 535, "revCount": 508,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
@ -851,11 +851,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747017456, "lastModified": 1746671794,
"narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", "narHash": "sha256-V+mpk2frYIEm85iYf+KPDmCGG3zBRAEhbv0E3lHdG2U=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5b07506ae89b025b14de91f697eba23b48654c52", "rev": "ceec434b8741c66bb8df5db70d7e629a9d9c598f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -918,11 +918,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747578749, "lastModified": 1747458668,
"narHash": "sha256-MR8NuCe3Xq2MNLPdKE3+4VVw2e+UlwwDTM3U3RMJRig=", "narHash": "sha256-5/PsESjQUuEbPTd+8rHHUItN/cW9USFJAm6y5yksTDQ=",
"owner": "notashelf", "owner": "notashelf",
"repo": "superfreq", "repo": "superfreq",
"rev": "6bdbc7e0ecd06866b940765942c6abe2fbad5ec7", "rev": "6ef0a60002cd95861e3b30e74b62d89bf7f7b905",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -35,7 +35,7 @@ in {
name = mkOption { name = mkOption {
type = nullOr (enum ["Catppuccin Mocha" "Zenburn" "Black Metal Venom" "Gruvbox"]); type = nullOr (enum ["Catppuccin Mocha" "Zenburn" "Black Metal Venom" "Gruvbox"]);
description = "The colorscheme that should be used globally to theme your system."; description = "The colorscheme that should be used globally to theme your system.";
default = "Catppuccin Mocha"; default = "Black Metal Venom";
}; };
slug = mkOption { slug = mkOption {

View file

@ -25,7 +25,6 @@ in {
"Fira Code Nerd Font" "Fira Code Nerd Font"
"Symbols Nerd Font" "Symbols Nerd Font"
"Noto Color Emoji" "Noto Color Emoji"
"JetbrainsMono Nerd Font"
]; ];
in in
mapAttrs (_: fonts: fonts ++ common) { mapAttrs (_: fonts: fonts ++ common) {

View file

@ -14,7 +14,6 @@
formats, formats,
gdb, gdb,
golangci-lint-langserver, golangci-lint-langserver,
deadnix,
gopls, gopls,
lazygit, lazygit,
lib, lib,
@ -142,7 +141,6 @@
# typst lsp # typst lsp
vscode-langservers-extracted vscode-langservers-extracted
deadnix
# zig language server # zig language server
zls zls
]; ];

View file

@ -17,10 +17,9 @@
typescript-language-server, typescript-language-server,
vscode-langservers-extracted, vscode-langservers-extracted,
simple-completion-language-server, simple-completion-language-server,
zls,
... ...
}: let }: let
inherit (lib.meta) getExe getExe'; inherit (lib.meta) getExe;
toml = formats.toml {}; toml = formats.toml {};
@ -103,10 +102,6 @@
auto-format = true; auto-format = true;
language-servers = ["clangd"]; language-servers = ["clangd"];
} }
{
name = "zig";
auto-format = true;
}
{ {
name = "c"; name = "c";
debugger = { debugger = {
@ -159,7 +154,7 @@
}; };
deno-lsp = { deno-lsp = {
command = getExe deno; command = lib.getExe deno;
args = ["lsp"]; args = ["lsp"];
environment.NO_COLOR = "1"; environment.NO_COLOR = "1";
config.deno = { config.deno = {
@ -206,7 +201,7 @@
}; };
typescript-language-server = { typescript-language-server = {
command = getExe typescript-language-server; command = lib.getExe typescript-language-server;
args = ["--stdio"]; args = ["--stdio"];
config = { config = {
typescript-language-server.source = { typescript-language-server.source = {
@ -219,12 +214,12 @@
}; };
}; };
ruff = { ruff = {
command = getExe ruff; command = lib.getExe ruff;
args = ["server"]; args = ["server"];
}; };
qmlls = { qmlls = {
command = getExe' kdePackages.qtdeclarative "qmlls"; command = lib.getExe' kdePackages.qtdeclarative "qmlls";
args = ["-E"]; args = ["-E"];
}; };
basedpyright.command = "${basedpyright}/bin/basedpyright-langserver"; basedpyright.command = "${basedpyright}/bin/basedpyright-langserver";
@ -238,16 +233,6 @@
scss.validate.enable = true; scss.validate.enable = true;
}; };
}; };
zls = {
command = getExe zls;
config = {
enable_build_on_save = true;
build_on_save_args = ["check" "-fincremental" "--watch"];
enable_autofix = false;
warn_style = true;
highlight_global_var_declarations = true;
};
};
}; };
}; };
in in

View file

@ -1,8 +1,8 @@
{pkgs, ...}: let {pkgs, ...}: let
inherit (pkgs.lib) getExe; inherit (pkgs.lib) getExe;
in { in {
ls = "${getExe pkgs.eza} --icons=never"; ls = "${getExe pkgs.eza} --icons";
la = "${getExe pkgs.eza} --icons=never -lha --git"; la = "${getExe pkgs.eza} --icons -lha --git";
g = "git"; g = "git";
n = "nix"; n = "nix";