Compare commits

...

10 Commits

16 changed files with 120 additions and 163 deletions

128
flake.lock generated
View File

@@ -11,11 +11,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1770395915, "lastModified": 1771000778,
"narHash": "sha256-TEZVaPse17RzzdPtPyzDheFLgoXOAw89AdADDB5hnLU=", "narHash": "sha256-Co3VdFeXl7abbNGEHEkjS9raX6P3yhigu162Mg6DV14=",
"owner": "linyinfeng", "owner": "linyinfeng",
"repo": "angrr", "repo": "angrr",
"rev": "efe8e391524bceda8820ad0e5607688eda4f3fc6", "rev": "6bea47aa18c2fb33aa9a363e452c037228893453",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -130,11 +130,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770551880, "lastModified": 1771508520,
"narHash": "sha256-+cS5yXWsSLiK36+PP/+dcQdxpXSclx2d65p7l6Dis+A=", "narHash": "sha256-srt94sUlkaGEJHQg7k6gVrBF1QZcHUY/VBESjCgZmKI=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "db4dfe3f2a80e9c33492d839accd49f75c7324c2", "rev": "ec35c21e843e4748e60822cd5543983eb61dc87a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -150,11 +150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768777038, "lastModified": 1771363276,
"narHash": "sha256-q/6/bN3FW/iHO18MQxEJaZEmFQVgzeCcLH21Qevy+QQ=", "narHash": "sha256-bW0untIUe6QMygBPABCMyrnaZCo8E4pKRQGZgLO9aGI=",
"owner": "Bali10050", "owner": "Bali10050",
"repo": "Darkly", "repo": "Darkly",
"rev": "8f51dab9e3deb98e4f809aa5592d244bc825c68e", "rev": "b37438a974e39dea0c04a6d64633eab2125b9370",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -193,11 +193,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1770880474, "lastModified": 1771571526,
"narHash": "sha256-Kf20x94YuizV5TwAwCiG/zIS6cX9ajniWa9YfFFm5CE=", "narHash": "sha256-JvL7TMheC4pih3VbxVlPSgqhGxLiaFUppcsJoDnOg9Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "3c3ddb31fa1307ea08f3e17673da2b45b54dd877", "rev": "f677bc93ec72abced2828e2c7720df0f9c25f825",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -544,11 +544,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770936159, "lastModified": 1771531206,
"narHash": "sha256-INksKY2oo1hDNrDYh0r+uK0Fd4hBxkQwD4qQAl8lYyg=", "narHash": "sha256-1R3Wx6KUkMb4x4E5UOhW9p6rqiexzSGGWxZqSHqW5n0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9bdb6938109884cb8b6a79ab79ba18e7b585a881", "rev": "91be7cce763fa4022c7cf025a71b0c366d1b6e77",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -587,11 +587,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769872935, "lastModified": 1771102945,
"narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -706,11 +706,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1770946947, "lastModified": 1771514840,
"narHash": "sha256-gUkug+w3tT0fUUzOJDo1O05B8CZ350w5EybXWPFqH5Q=", "narHash": "sha256-t3WbZvwoDj/75YDX/nwkZuxanZLZaWr9meSfKswaN6g=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "8b83524f31886061ef2f677c39bb39918b5319e9", "rev": "4f69ab280e9bb34e2c0b67fdfa6f0978a170ef56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -739,11 +739,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1770735554, "lastModified": 1771305475,
"narHash": "sha256-8GzUa8bCyQ688jYW2waXrOqetTr7oV8UPTO2He+5Hsg=", "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "41b5de87692b8262fbdbff7faab93f04ff0be453", "rev": "a2a52911757cb3b497db9407592f9b4c439571ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -797,11 +797,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770184146, "lastModified": 1770922915,
"narHash": "sha256-DsqnN6LvXmohTRaal7tVZO/AKBuZ02kPBiZKSU4qa/k=", "narHash": "sha256-6J/JoK9iL7sHvKJcGW2KId2agaKv1OGypsa7kN+ZBD4=",
"owner": "nix-darwin", "owner": "nix-darwin",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "0d7874ef7e3ba02d58bebb871e6e29da36fa1b37", "rev": "6c5a56295d2a24e43bcd8af838def1b9a95746b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -840,11 +840,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770657009, "lastModified": 1771563879,
"narHash": "sha256-v/LA5ZSJ+JQYzMSKB4sySM0wKfsAqddNzzxLLnbsV/E=", "narHash": "sha256-vA5hocvdGhr+jfBN7A7ogeZqIz2qx01EixXwdVsQcnE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "5b50ea1aaa14945d4794c80fcc99c4aa1db84d2d", "rev": "379d20c55f552e91fb9f3f0382e4a97d3f452943",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -883,11 +883,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1770950915, "lastModified": 1771575107,
"narHash": "sha256-aj3KpLxWzlXNs4ekdB9kMtFEkR5pUJf4LKmvuuKNzxQ=", "narHash": "sha256-RMiV8PRAuFFtJ0l6EZcADdBW1JP+DUIPpDXnMJp0w/k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "29dd3361a0bbaf4b9f5de4f19644737eb89e67aa", "rev": "6b0f198fe0363867d9f8cea387a3b9212b468839",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -899,11 +899,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1770770419, "lastModified": 1771419570,
"narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", "rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -915,11 +915,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1770952381, "lastModified": 1771574726,
"narHash": "sha256-a+V8VJELRpy21Xye5AR2MMGFsbGxortj2cv0sh0RMas=", "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3605054e29967cd755595eb403315c6c1460227", "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -931,11 +931,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1770841267, "lastModified": 1771369470,
"narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "rev": "0182a361324364ae3f436a63005877674cf45efb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -995,11 +995,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1770841267, "lastModified": 1771369470,
"narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "rev": "0182a361324364ae3f436a63005877674cf45efb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1016,16 +1016,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770252745, "lastModified": 1771375091,
"narHash": "sha256-km0M26aaw1+NzBtbmXNtqcEnnOpHaCeGW20vk/EkSw8=", "narHash": "sha256-Y5P0RYO9NKxa4UZBoGmmxtz3mEwJrBOfvdLJRGjV2Os=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "repo": "noctalia-shell",
"rev": "c9444a5429992d0b8eba0018cdcb1614f318eea1", "rev": "dbfe3634df0c57faf9772cecae1f2e92bd04de66",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "noctalia-dev", "owner": "noctalia-dev",
"ref": "v4.3.3", "ref": "v4.5.0",
"repo": "noctalia-shell", "repo": "noctalia-shell",
"type": "github" "type": "github"
} }
@@ -1105,11 +1105,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1770829038, "lastModified": 1771505899,
"narHash": "sha256-0TGySug4z3Z+Ahk+gS2Fua7WToPzWlurjFHvZTInwPg=", "narHash": "sha256-MdRGkz3huAAhsHGnRv0XZV4RG/yO9HOrmhCbOclqcIk=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "4bb462fc04105d82f2198d9042d3dcfcd27b275a", "rev": "d8e0e96766968bfebca2360ae4cb8f08d7bbab18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1126,11 +1126,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770699870, "lastModified": 1771575468,
"narHash": "sha256-zoDj37LRy0urjwJklWmLo0RuoT2DJHVj6trVFuwvIbE=", "narHash": "sha256-4FMXl7wWiGesb7Udh5CBZ6LtisHoDszwPn9dpUiUhS0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "b1d0e03085617f48603b05b95fa7e38fab43b635", "rev": "6f54775bc534535d6a206135bca7455dc5c1a7d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1161,11 +1161,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1770914701, "lastModified": 1771541829,
"narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=", "narHash": "sha256-jtrIUcFoZuS6R4P18907H0pPyHaGoF5Tomez7j3KIHs=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "db03fed72e5ca02be34e1d24789345a943329738", "rev": "cb73f89d3ecef7e790c42f828e2228ff82975de5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1366,11 +1366,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1770583271, "lastModified": 1771195969,
"narHash": "sha256-Q75S8cEqJoZ92s1y4zArvk2U1ayAy2E4SaF7gbNXkYQ=", "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "86f5bd5d867ad6e120935dfe825f6b903ebbeddd", "rev": "536bd32efc935bf876d6de385ec18a1b715c9358",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1387,11 +1387,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770919290, "lastModified": 1771562861,
"narHash": "sha256-iJ9c0ZewfRRYUflaEOj43n5TWaB6Ezygn2UA/ZHGQJA=", "narHash": "sha256-6oT3rF68W8HERLXvFfEkpz8xpAVLKZsY1ZuR/BbDTO8=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "0078cf2d5e81eb56a9356d51f2738f7141194de1", "rev": "7783a3adf3d5a9599a82c75a44c7482e70398ac2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -81,7 +81,7 @@
}; };
niri.url = "github:sodiboo/niri-flake"; niri.url = "github:sodiboo/niri-flake";
noctalia = { noctalia = {
url = "github:noctalia-dev/noctalia-shell/v4.3.3"; url = "github:noctalia-dev/noctalia-shell/v4.5.0";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
zen.inputs.nixpkgs.follows = "nixpkgs"; zen.inputs.nixpkgs.follows = "nixpkgs";

View File

@@ -1,43 +0,0 @@
{
services.grafana = {
enable = true;
settings = {
server = {
http_addr = "0.0.0.0";
http_port = 8090;
domain = "grafana.imxyy.top";
};
};
};
services.prometheus = {
enable = true;
port = 8091;
exporters = {
node = {
enable = true;
port = 8092;
enabledCollectors = [
"systemd"
"zfs"
];
};
};
scrapeConfigs = [
{
job_name = "node";
static_configs = [
{
targets = [ "127.0.0.1:8092" ];
}
];
}
];
};
services.caddy.virtualHosts."grafana.imxyy.top" = {
extraConfig = ''
reverse_proxy :8090 {
header_up X-Real-IP {remote_host}
}
'';
};
}

View File

@@ -290,21 +290,6 @@
customDomains = [ "coder.imxyy.top" ]; customDomains = [ "coder.imxyy.top" ];
} }
{
name = "grafana-http";
type = "http";
localIP = "127.0.0.1";
localPort = 80;
customDomains = [ "grafana.imxyy.top" ];
}
{
name = "grafana-https";
type = "https";
localIP = "127.0.0.1";
localPort = 443;
customDomains = [ "grafana.imxyy.top" ];
}
{ {
name = "siyuan-http"; name = "siyuan-http";
type = "http"; type = "http";
@@ -499,7 +484,6 @@
"git" "git"
"vault" "vault"
"coder" "coder"
"grafana"
"matrix" "matrix"
"note" "note"
"oidc" "oidc"

View File

@@ -17,10 +17,10 @@
anki anki
ayugram-desktop ayugram-desktop
signal-desktop signal-desktop-wayland
element-desktop element-desktop
fractal fractal
qq qq-wayland
wechat wechat
gnome-clocks gnome-clocks

View File

@@ -17,10 +17,10 @@
anki anki
ayugram-desktop ayugram-desktop
signal-desktop signal-desktop-wayland
element-desktop element-desktop
fractal fractal
qq qq-wayland
wechat wechat
gnome-clocks gnome-clocks

View File

@@ -35,6 +35,9 @@ in
pciutils pciutils
usbutils usbutils
dust
dysk
lsof lsof
nmap nmap
@@ -67,6 +70,7 @@ in
fastfetch fastfetch
fd fd
fzf fzf
jq
keep-sorted keep-sorted
lsd lsd
neofetch neofetch

View File

@@ -28,6 +28,8 @@ in
ripgrep # telescope ripgrep # telescope
vscode-json-languageserver vscode-json-languageserver
vscode-langservers-extracted
taplo
typos-lsp typos-lsp
]; ];
}; };

View File

@@ -1,43 +1,44 @@
{ {
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
"LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" }, "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
"blink.cmp": { "branch": "main", "commit": "f9e855c4d96e1264f7c818844f5a0166ad48c212" }, "blink.cmp": { "branch": "main", "commit": "f9e855c4d96e1264f7c818844f5a0166ad48c212" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"gitsigns.nvim": { "branch": "main", "commit": "1ce96a464fdbc24208e24c117e2021794259005d" }, "gitsigns.nvim": { "branch": "main", "commit": "c7d37ca22b461f64e26f8f6701b2586128ed0bef" },
"glance.nvim": { "branch": "master", "commit": "bf86d8b79dce808e65fdb6e9269d0b4ed6d2eefc" }, "glance.nvim": { "branch": "master", "commit": "bf86d8b79dce808e65fdb6e9269d0b4ed6d2eefc" },
"guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
"inlay-hints.nvim": { "branch": "master", "commit": "11be32be3761c6263df2311afb6baa0de0863967" }, "inlay-hints.nvim": { "branch": "master", "commit": "990e1f96699b8293b6665b9e73b16128c66684e6" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
"leap.nvim": { "branch": "main", "commit": "d7316deae68dc93d6957020cdda6d7bb399218fb" }, "leap.nvim": { "branch": "main", "commit": "02bf52e49c72cc5dabb53ec9494d10d304f0b2c9" },
"lspkind.nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
"mini.nvim": { "branch": "main", "commit": "8c40d95931cbe6138391af9180e59439ed2e69df" }, "mini.nvim": { "branch": "main", "commit": "8c40d95931cbe6138391af9180e59439ed2e69df" },
"neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-lspconfig": { "branch": "master", "commit": "66fd02ad1c7ea31616d3ca678fa04e6d0b360824" }, "nvim-lspconfig": { "branch": "master", "commit": "276ce3bc878243dc63c32b75790c4296d11848f6" },
"nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, "nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" },
"nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" }, "nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" },
"nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" }, "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" },
"nvim-tree.lua": { "branch": "master", "commit": "037d89e60fb01a6c11a48a19540253b8c72a3c32" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
"nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" }, "nvim-web-devicons": { "branch": "master", "commit": "3362099de3368aa620a8105b19ed04c2053e38c0" },
"outline.nvim": { "branch": "main", "commit": "ead1820d49c8e79ce89cab1c2c318981b695c9d2" }, "outline.nvim": { "branch": "main", "commit": "0eb9289ab39c91caf8b3ed0e3a17764809d69558" },
"pest.vim": { "branch": "master", "commit": "7cfcb43f824e74d13dfe631359fff2ec23836a77" }, "pest.vim": { "branch": "master", "commit": "7cfcb43f824e74d13dfe631359fff2ec23836a77" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "d6b802552cbe7d643a3b6b31f419c248d1f1e220" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "97bf4b8ef9298644a29fcd9dd41a0210cf08cac7" },
"render-markdown.nvim": { "branch": "main", "commit": "48b4175dbca8439d30c1f52231cbe5a712c8f9d9" }, "render-markdown.nvim": { "branch": "main", "commit": "3da7bb459f6cff03980dd1e106c46f3e62ff4d9f" },
"ripgrep": { "branch": "master", "commit": "0a88cccd5188074de96f54a4b6b44a63971ac157" }, "ripgrep": { "branch": "master", "commit": "119a58a400ea948c2d2b0cd4ec58361e74478641" },
"telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
"tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
"tree-sitter-nu": { "branch": "main", "commit": "bb3f533e5792260291945e1f329e1f0a779def6e" }, "tree-sitter-nu": { "branch": "main", "commit": "6544c4383643cf8608d50def2247a7af8314e148" },
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
"vim-floaterm": { "branch": "master", "commit": "a11b930f55324e9b05e2ef16511fe713f1b456a7" }, "vim-floaterm": { "branch": "master", "commit": "fd4bdd66eca56c6cc59f2119e4447496d8cde2ea" },
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" } "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
"workspace-diagnostics.nvim": { "branch": "main", "commit": "60f9175b2501ae3f8b1aba9719c0df8827610c8e" }
} }

View File

@@ -75,11 +75,13 @@ local servers = {
biome = {}, biome = {},
clangd = {}, clangd = {},
cssls = {}, cssls = {},
eslint = {},
gopls = {}, gopls = {},
html = {}, html = {},
java_language_server = {}, java_language_server = {},
jsonls = {}, jsonls = {},
pyright = {}, pyright = {},
taplo = {},
ts_ls = {}, ts_ls = {},
typos_lsp = {}, typos_lsp = {},
-- keep-sorted end -- keep-sorted end

View File

@@ -13,10 +13,10 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
my.hm.programs.vscode.enable = true;
my.hm = { my.hm = {
programs.vscode = { programs.vscode = {
package = pkgs.vscodium; enable = true;
package = pkgs.vscodium-wayland;
}; };
}; };
my.persist.homeDirs = [ my.persist.homeDirs = [

View File

@@ -2,6 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
hostname,
... ...
}: }:
let let
@@ -16,6 +17,7 @@ in
my.hm.programs.zen-browser = { my.hm.programs.zen-browser = {
enable = true; enable = true;
nativeMessagingHosts = [ pkgs.firefoxpwa ]; nativeMessagingHosts = [ pkgs.firefoxpwa ];
suppressXdgMigrationWarning = hostname == "imxyy-nix";
policies = { policies = {
# find more options here: https://mozilla.github.io/policy-templates/ # find more options here: https://mozilla.github.io/policy-templates/
DisableAppUpdate = true; DisableAppUpdate = true;
@@ -23,7 +25,7 @@ in
}; };
}; };
my.persist.homeDirs = [ my.persist.homeDirs = [
".zen" ".config/zen"
]; ];
}; };
} }

View File

@@ -14,16 +14,13 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
my.hm.home.packages = [ my.hm.home.packages = [
(pkgs.hmcl.overrideAttrs { pkgs.hmcl
postFixup = ''
substituteInPlace $out/share/applications/HMCL.desktop --replace-fail 'Exec=hmcl' 'Exec=sh -c "cd ~/.local/share/hmcl; hmcl"'
'';
})
]; ];
my.persist.homeDirs = [ my.persist.homeDirs = [
".minecraft" ".minecraft"
".local/share/hmcl" ".local/share/hmcl"
".hmcl"
]; ];
}; };
} }

View File

@@ -164,6 +164,7 @@ in
{ {
"Mod+Return".action.spawn = [ "Mod+Return".action.spawn = [
"kitty" "kitty"
"-1"
]; ];
"Mod+G".action.spawn = [ config.my.desktop.browser.default.command ]; "Mod+G".action.spawn = [ config.my.desktop.browser.default.command ];
"Mod+E".action.spawn = [ "nautilus" ]; "Mod+E".action.spawn = [ "nautilus" ];

View File

@@ -169,6 +169,10 @@ in
id = "Microphone"; id = "Microphone";
displayMode = "onhover"; displayMode = "onhover";
} }
{
id = "Battery";
hideIfNotDetected = true;
}
]; ];
}; };
}; };
@@ -197,7 +201,10 @@ in
]; ];
position = "top_left"; position = "top_left";
shortcuts = { shortcuts = {
left = [ { id = "Bluetooth"; } ]; left = [
{ id = "Bluetooth"; }
{ id = "Network"; }
];
right = [ { id = "Notifications"; } ]; right = [ { id = "Notifications"; } ];
}; };
}; };

View File

@@ -115,7 +115,7 @@ in
desktop, desktop,
}: }:
{ {
${pkg} = final.symlinkJoin { "${pkg}-wayland" = final.symlinkJoin {
pname = prev.${pkg}.pname; pname = prev.${pkg}.pname;
version = prev.${pkg}.version; version = prev.${pkg}.version;
paths = [ prev.${pkg} ]; paths = [ prev.${pkg} ];