Compare commits

..

No commits in common. "main" and "update-inputs-2024-10-16-04-20" have entirely different histories.

7 changed files with 29 additions and 31 deletions

View file

@ -62,7 +62,7 @@
programs.eza = {
enable = true;
icons = "auto";
icons = true;
git = true;
extraOptions = [
"--color-scale=all"

View file

@ -52,7 +52,7 @@
programs.eza = {
enable = true;
icons = "auto";
icons = true;
git = true;
extraOptions = [
"--color-scale=all"

View file

@ -62,7 +62,6 @@
};
};
root = {
type = "8300";
size = "100%";
};
};

View file

@ -1,7 +1,6 @@
{ config, inputs, lib, ... }: {
imports = [
./nix-config.nix
inputs.hydra.nixosModules.hydra
];
sops.secrets."services/hydra/signKey" = {
owner = "hydra-queue-runner";
@ -19,7 +18,7 @@
};
kyouma.deployment.auto-upgrade.cache = "daemon";
services.hydra-dev = {
services.hydra = {
enable = true;
package = inputs.hydra.packages.${config.nixpkgs.hostPlatform.system}.hydra;
hydraURL = "https://hydra.kyouma.net";

View file

@ -11,11 +11,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1729116596,
"narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=",
"lastModified": 1728577371,
"narHash": "sha256-f3bKclEV5t1eP1OH7kTGv/tLzlToSRIe0ktkdl1jihw=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782",
"rev": "e5c8d2d50981a34602358d917e7be011b2c397a8",
"type": "github"
},
"original": {
@ -155,11 +155,11 @@
]
},
"locked": {
"lastModified": 1729099656,
"narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=",
"lastModified": 1729010169,
"narHash": "sha256-AjgIlXcreagCs6ltT8mzI1UYEiYgfhlwe4Tl3taxQSU=",
"owner": "nix-community",
"repo": "disko",
"rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b",
"rev": "9ab6ae4e632016caac1c7e82e15b12b8c672ed76",
"type": "github"
},
"original": {
@ -521,11 +521,11 @@
]
},
"locked": {
"lastModified": 1729174520,
"narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=",
"lastModified": 1729027341,
"narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268",
"rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
"type": "github"
},
"original": {
@ -543,17 +543,17 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1728321752,
"narHash": "sha256-GbBAoBF7ZObz0IP+g0LZKxMafpMvNKjTEu9haiZbV54=",
"lastModified": 1724696781,
"narHash": "sha256-oDLfi7PdElAdhGK8i+mQ4OOn6Hu3vzHiYnuFcHoJ0IU=",
"ref": "refs/heads/main",
"rev": "ee1234c15cdcb427dbd4828e0add09d02cd606c9",
"revCount": 4220,
"rev": "ab6d81fad404af05dfeae7f74d1783a2f7367826",
"revCount": 4205,
"type": "git",
"url": "https://git.lix.systems/lix-project/hydra"
"url": "https://git.lix.systems/snaakey/hydra.git"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/hydra"
"url": "https://git.lix.systems/snaakey/hydra.git"
}
},
"iceshrimp": {
@ -842,11 +842,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1728193676,
"narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
"lastModified": 1723688146,
"narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
"rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
"type": "github"
},
"original": {
@ -905,11 +905,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1729196897,
"narHash": "sha256-xftdQl0kxWJZNWCDSl0pU2E7zCmGjhD/N9ZWgPXK0A0=",
"lastModified": 1729015933,
"narHash": "sha256-raKxsI2SGe/vF2PvzFatd/Sl9eVUCuCUUVg7cINFVbQ=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "3c7b6ae5d1524c691a1b65f7290facd0dc296e40",
"rev": "429f2e8d1aa61181c0ec72bdafe022fbb6a092d6",
"type": "github"
},
"original": {

View file

@ -26,7 +26,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
hydra = {
url = "git+https://git.lix.systems/lix-project/hydra";
url = "git+https://git.lix.systems/snaakey/hydra.git";
inputs.lix.follows = "lix";
};
iceshrimp = {

View file

@ -161,8 +161,8 @@
};
servers = {
bashls.enable = true;
lua_ls.enable = true;
nil_ls = {
lua-ls.enable = true;
nil-ls = {
enable = true;
settings.formatting.command = [ "nixfmt" "-w" "140" ];
};
@ -175,8 +175,8 @@
options.enable = true;
};
};
ruff_lsp.enable = true;
rust_analyzer = {
ruff-lsp.enable = true;
rust-analyzer = {
enable = true;
installRustc = true;
installCargo = true;