diff --git a/flake.lock b/flake.lock index 11f517b..86a844c 100644 --- a/flake.lock +++ b/flake.lock @@ -155,18 +155,18 @@ ] }, "locked": { - "lastModified": 1772900511, - "narHash": "sha256-JTEO5WzqgrU61EBz2UFQ2jtN8de+RnMC1FnJExJtCpw=", - "owner": "cry128", - "repo": "cerulean", - "rev": "02ded5d4f0d53eaeb68f1b68469926fd21acc6db", - "type": "github" + "lastModified": 1772502315, + "narHash": "sha256-DHE6jU97GZ+QfUdPi4plZRnXtAvtGubOxqA5sQ4DD9M=", + "ref": "bleeding", + "rev": "9bab917d8cc3b16f3c73b1980fcb55a4b5ce5239", + "revCount": 191, + "type": "git", + "url": "https://tearforge.net/cry/cerulean" }, "original": { - "owner": "cry128", - "ref": "v0.2.5-alpha", - "repo": "cerulean", - "type": "github" + "ref": "bleeding", + "type": "git", + "url": "https://tearforge.net/cry/cerulean" } }, "crane": { diff --git a/flake.nix b/flake.nix index be16461..2571502 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ }; cerulean = { - url = "github:cry128/cerulean/v0.2.5-alpha"; + url = "git+https://tearforge.net/cry/cerulean?ref=bleeding"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; diff --git a/groups/unstable-base/default.nix b/groups/unstable-base/default.nix new file mode 100644 index 0000000..9ee1305 --- /dev/null +++ b/groups/unstable-base/default.nix @@ -0,0 +1,9 @@ +{ + lib, + config, + ... +}: { + nixpkgs.channels.default = { + default = lib.mkForce config.nixpkgs.channels.default.upkgs; + }; +} diff --git a/hosts/nixarawrui/modules/amdgpu-ignore-ctx-privileges.nix b/hosts/nixarawrui/modules/amdgpu-ignore-ctx-privileges.nix index 8adf2f0..3174fb2 100644 --- a/hosts/nixarawrui/modules/amdgpu-ignore-ctx-privileges.nix +++ b/hosts/nixarawrui/modules/amdgpu-ignore-ctx-privileges.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf enabled { - nixpkgs.channels = { + nixpkgs.channels.default = { upkgs.overlays = [ (self: super: { amdgpu-ignore-ctx-privileges = super.fetchpatch { diff --git a/nixpkgs.nix b/nixpkgs.nix index 5bedfeb..1470160 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1,6 +1,6 @@ {inputs, ...} @ args: { nixpkgs.channels = { - base = { + default = { overlays = [(import ./overlays.nix args)]; config.allowUnfree = true; }; diff --git a/snow.nix b/snow.nix index 50da6a7..f71314c 100644 --- a/snow.nix +++ b/snow.nix @@ -1,4 +1,8 @@ -{inputs, ...} @ args: { +{ + inputs, + cerulean, + ... +} @ args: { nodes = { base = inputs.nixpkgs; homeManager = inputs.home-manager; @@ -49,12 +53,9 @@ # needed to get interface working qemu.extraArgs = [ - "-monitor" - "unix:/var/lib/microvms/home-assistant/monitor.sock,server,nowait" - "-chardev" - "socket,id=serial1,path=/var/lib/microvms/home-assistant/serial.sock,server=on,wait=off" - "-serial" - "chardev:serial1" + "-monitor" "unix:/var/lib/microvms/home-assistant/monitor.sock,server,nowait" + "-chardev" "socket,id=serial1,path=/var/lib/microvms/home-assistant/serial.sock,server=on,wait=off" + "-serial" "chardev:serial1" ]; # memory cannot be 2GB so i doubled it and used 4GB: @@ -100,7 +101,7 @@ deploy.ssh = { host = "10.16.1.163"; port = 2222; - publicKeys = []; + user = "foxora"; }; }; @@ -114,7 +115,7 @@ deploy.ssh = { host = "10.16.1.58"; port = 2222; - publicKeys = []; + user = "foxora"; }; }; };