diff --git a/config/common/users/emily/default.nix b/config/common/users/emily/default.nix index c26d2b0..4086a05 100644 --- a/config/common/users/emily/default.nix +++ b/config/common/users/emily/default.nix @@ -62,7 +62,7 @@ programs.eza = { enable = true; - icons = true; + icons = "auto"; git = true; extraOptions = [ "--color-scale=all" diff --git a/config/hosts/_minimal/configuration.nix b/config/hosts/_minimal/configuration.nix index 51a64de..e585e98 100644 --- a/config/hosts/_minimal/configuration.nix +++ b/config/hosts/_minimal/configuration.nix @@ -52,7 +52,7 @@ programs.eza = { enable = true; - icons = true; + icons = "auto"; git = true; extraOptions = [ "--color-scale=all" diff --git a/config/hosts/emilia/disko.nix b/config/hosts/emilia/disko.nix index 7eb15c2..31a4adc 100644 --- a/config/hosts/emilia/disko.nix +++ b/config/hosts/emilia/disko.nix @@ -62,6 +62,7 @@ }; }; root = { + type = "8300"; size = "100%"; }; }; diff --git a/config/services/hydra/default.nix b/config/services/hydra/default.nix index 103c0ad..5073636 100644 --- a/config/services/hydra/default.nix +++ b/config/services/hydra/default.nix @@ -1,6 +1,7 @@ { config, inputs, lib, ... }: { imports = [ ./nix-config.nix + inputs.hydra.nixosModules.hydra ]; sops.secrets."services/hydra/signKey" = { owner = "hydra-queue-runner"; @@ -18,7 +19,7 @@ }; kyouma.deployment.auto-upgrade.cache = "daemon"; - services.hydra = { + services.hydra-dev = { enable = true; package = inputs.hydra.packages.${config.nixpkgs.hostPlatform.system}.hydra; hydraURL = "https://hydra.kyouma.net"; diff --git a/flake.lock b/flake.lock index 6506ccc..eb0e562 100644 --- a/flake.lock +++ b/flake.lock @@ -521,11 +521,11 @@ ] }, "locked": { - "lastModified": 1729027341, - "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", + "lastModified": 1729174520, + "narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", + "rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268", "type": "github" }, "original": { @@ -543,17 +543,17 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1724696781, - "narHash": "sha256-oDLfi7PdElAdhGK8i+mQ4OOn6Hu3vzHiYnuFcHoJ0IU=", + "lastModified": 1728321752, + "narHash": "sha256-GbBAoBF7ZObz0IP+g0LZKxMafpMvNKjTEu9haiZbV54=", "ref": "refs/heads/main", - "rev": "ab6d81fad404af05dfeae7f74d1783a2f7367826", - "revCount": 4205, + "rev": "ee1234c15cdcb427dbd4828e0add09d02cd606c9", + "revCount": 4220, "type": "git", - "url": "https://git.lix.systems/snaakey/hydra.git" + "url": "https://git.lix.systems/lix-project/hydra" }, "original": { "type": "git", - "url": "https://git.lix.systems/snaakey/hydra.git" + "url": "https://git.lix.systems/lix-project/hydra" } }, "iceshrimp": { @@ -842,11 +842,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723688146, - "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", + "lastModified": 1728193676, + "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "type": "github" }, "original": { @@ -905,11 +905,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1729093974, - "narHash": "sha256-gQ0Zb0YN5+wqzq5v8vh0ssWZgyYzoiiT7La6WWOFiXM=", + "lastModified": 1729196897, + "narHash": "sha256-xftdQl0kxWJZNWCDSl0pU2E7zCmGjhD/N9ZWgPXK0A0=", "owner": "nix-community", "repo": "nixvim", - "rev": "717e7060fafa2c3822a64e3f5bbfd4895577fdbf", + "rev": "3c7b6ae5d1524c691a1b65f7290facd0dc296e40", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a1573dd..9a54db8 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hydra = { - url = "git+https://git.lix.systems/snaakey/hydra.git"; + url = "git+https://git.lix.systems/lix-project/hydra"; inputs.lix.follows = "lix"; }; iceshrimp = { diff --git a/modules/graphical/nixvim.nix b/modules/graphical/nixvim.nix index 415ca5b..5271579 100644 --- a/modules/graphical/nixvim.nix +++ b/modules/graphical/nixvim.nix @@ -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;