diff --git a/flake.lock b/flake.lock index 322ea3f..7fbc82c 100644 --- a/flake.lock +++ b/flake.lock @@ -70,7 +70,9 @@ "awww": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs-unstable" + ], "rust-overlay": "rust-overlay" }, "locked": { @@ -93,7 +95,7 @@ "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1771353108, @@ -310,21 +312,6 @@ } }, "flake-compat_5": { - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -494,18 +481,18 @@ "type": "github" } }, - "home-manager_2": { + "home-manager-unstable": { "inputs": { "nixpkgs": [ "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1771269455, - "narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", + "lastModified": 1772164835, + "narHash": "sha256-zRcwrZDeBfYipqv/7K7TqsfPb87LFU6b7JhoNUGSnvQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", + "rev": "2a39b0828bbffce0d73769a61e46e780488d098b", "type": "github" }, "original": { @@ -515,6 +502,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772020340, + "narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-25.11", + "repo": "home-manager", + "type": "github" + } + }, "home-manager_3": { "inputs": { "nixpkgs": [ @@ -893,7 +901,9 @@ "crane": "crane", "fenix": "fenix", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgs-unstable" + ] }, "locked": { "lastModified": 1768868561, @@ -1041,7 +1051,7 @@ "microvm_2": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ], "spectrum": "spectrum_2" }, @@ -1074,7 +1084,9 @@ "minhook-src": "minhook-src", "mini-src": "mini-src", "minizip-src": "minizip-src", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "nixpkgs-unstable" + ], "re2-src": "re2-src", "websocketpp-src": "websocketpp-src", "zlib-src": "zlib-src" @@ -1163,26 +1175,6 @@ "type": "github" } }, - "nix-alien": { - "inputs": { - "flake-compat": "flake-compat_5", - "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1771150922, - "narHash": "sha256-+oQJun4CFDlOQRocbZpqQDj7agoy56/4ZjT1oUR7NOs=", - "owner": "thiagokokada", - "repo": "nix-alien", - "rev": "96045e886ba0dd45b27590e7c0c6e77bbb54033d", - "type": "github" - }, - "original": { - "owner": "thiagokokada", - "repo": "nix-alien", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -1206,27 +1198,6 @@ "type": "github" } }, - "nix-index-database": { - "inputs": { - "nixpkgs": [ - "nix-alien", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1771130777, - "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", - "owner": "nix-community", - "repo": "nix-index-database", - "rev": "efec7aaad8d43f8e5194df46a007456093c40f88", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index-database", - "type": "github" - } - }, "nix-unit": { "inputs": { "flake-parts": "flake-parts_2", @@ -1269,9 +1240,11 @@ }, "nixcord": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_7" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1771375681, @@ -1289,16 +1262,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763934636, - "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=", - "owner": "nixos", + "lastModified": 1771309086, + "narHash": "sha256-25aY7PIHMmoVW5w/x8Bs4vsfSV94A5htwiLINJ4KMuY=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261", + "rev": "5e17f00eb60368a4b4b110a89f1c250f9a12c053", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -1397,22 +1370,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1771309086, - "narHash": "sha256-25aY7PIHMmoVW5w/x8Bs4vsfSV94A5htwiLINJ4KMuY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e17f00eb60368a4b4b110a89f1c250f9a12c053", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1767313136, "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", @@ -1428,71 +1385,7 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1770115704, - "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1770617025, - "narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { + "nixpkgs_3": { "locked": { "lastModified": 1771208521, "narHash": "sha256-X01Q3DgSpjeBpapoGA4rzKOn25qdKxbPnxHeMLNoHTU=", @@ -1508,26 +1401,10 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nt": { "inputs": { "nix-unit": "nix-unit", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems_2" }, "locked": { @@ -1590,16 +1467,16 @@ "cachyos": "cachyos", "cerulean": "cerulean", "home-manager": "home-manager_2", + "home-manager-unstable": "home-manager-unstable", "hyprland-git": "hyprland-git", "hyprland-plugins": "hyprland-plugins", "iamb": "iamb", "mango": "mango", "microvm": "microvm_2", "millennium": "millennium", - "nix-alien": "nix-alien", "nixcats": "nixcats", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_3", "nixpkgs-master": "nixpkgs-master", "nixpkgs-staging": "nixpkgs-staging", "nixpkgs-unstable": "nixpkgs-unstable", @@ -1920,7 +1797,9 @@ "zen": { "inputs": { "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_9" + "nixpkgs": [ + "nixpkgs-unstable" + ] }, "locked": { "lastModified": 1771381854, diff --git a/flake.nix b/flake.nix index c6b0682..3383c0b 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,10 @@ nixpkgs-master.url = "github:NixOS/nixpkgs/master"; home-manager = { + url = "github:nix-community/home-manager/release-25.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager-unstable = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; @@ -24,17 +28,11 @@ microvm = { url = "github:microvm-nix/microvm.nix"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; cachyos.url = "github:xddxdd/nix-cachyos-kernel"; - nix-alien = { - # silly alien :3 - url = "github:thiagokokada/nix-alien"; - # inputs.nixpkgs.follows = "nixpkgs"; - }; - # wm/de/apps/theming flakes hyprland-git = { # pinned rev because color management is broken on hyprland @@ -53,16 +51,32 @@ }; nixcats.url = "github:BirdeeHub/nixCats-nvim"; - awww.url = "git+https://codeberg.org/LGFae/awww"; - zen.url = "github:0xc000022070/zen-browser-flake"; - iamb.url = "github:ulyssa/iamb"; - nixcord.url = "github:FlameFlag/nixcord"; - millennium.url = "github:trivaris/millennium?dir=packages/nix"; + + awww = { + url = "git+https://codeberg.org/LGFae/awww"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + zen = { + url = "github:0xc000022070/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + iamb = { + url = "github:ulyssa/iamb"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + nixcord = { + url = "github:FlameFlag/nixcord"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + millennium = { + url = "github:trivaris/millennium?dir=packages/nix"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; spicetify-nix = { url = "github:Gerg-L/spicetify-nix"; inputs = { - systems.follows = "systems"; nixpkgs.follows = "nixpkgs-unstable"; + systems.follows = "systems"; }; }; @@ -77,6 +91,5 @@ extra-experimental-features = "pipe-operators"; }; - outputs = inputs: - import ./snow.nix inputs; + outputs = inputs: import ./snow.nix inputs; } diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index 93b0c86..a9d308f 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -314,6 +314,7 @@ zen-browser = { enable = true; package = inputs.zen.packages.${system}.twilight; + suppressXdgMigrationWarning = true; }; mpv = { diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index 84b8e6d..fda310c 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -322,8 +322,6 @@ libxscrnsaver ]; }).run - - inputs.nix-alien.packages.${stdenv.hostPlatform.system}.nix-alien ]; system.stateVersion = "24.11"; diff --git a/snow.nix b/snow.nix index 18ca261..b29ba1a 100644 --- a/snow.nix +++ b/snow.nix @@ -1,126 +1,136 @@ -{cerulean, ...} @ inputs: +{ cerulean, ... }@inputs: cerulean.mkNexus ./. (self: { nexus = { - args = {inherit inputs;}; + args = { inherit inputs; }; - modules = with inputs; []; + modules = with inputs; [ ]; base = inputs.nixpkgs; + homeManager = inputs.home-manager; groups = { - servers = {}; + servers = { }; }; - nodes = let - inherit - (self.nexus) - groups - ; - in { - nixarawrui = { - system = "x86_64-linux"; + nodes = + let + inherit (self.nexus) + groups + ; + in + { + nixarawrui = { + system = "x86_64-linux"; - base = inputs.nixpkgs-unstable; + base = inputs.nixpkgs-unstable; + homeManager = inputs.home-manager-unstable; - modules = with inputs; [ - sddm-silent.nixosModules.default - inputs.mango.nixosModules.mango - ]; - }; + modules = with inputs; [ + sddm-silent.nixosModules.default + inputs.mango.nixosModules.mango + ]; + }; - arcturus = { - system = "x86_64-linux"; + arcturus = { + system = "x86_64-linux"; - groups = [ - groups.servers - ]; + groups = [ + groups.servers + ]; - modules = with inputs; [ - microvm.nixosModules.host + modules = with inputs; [ + microvm.nixosModules.host - { - microvm.vms = { - home-assistant = { - autostart = true; + { + microvm.vms = { + home-assistant = { + autostart = true; - config = { - imports = [./vms/home-assistant/default.nix]; + config = { + imports = [ ./vms/home-assistant/default.nix ]; - networking.hostName = "home-assistant"; + networking.hostName = "home-assistant"; - boot.kernelParams = ["console=ttyS0" "console=ttyS1" "8250.nr_uarts=2"]; - systemd.services."serial-getty@ttyS1".enable = true; - - microvm = { - hypervisor = "qemu"; - - # 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" + boot.kernelParams = [ + "console=ttyS0" + "console=ttyS1" + "8250.nr_uarts=2" ]; + systemd.services."serial-getty@ttyS1".enable = true; - # memory cannot be 2GB so i doubled it and used 4GB: - # https://github.com/microvm-nix/microvm.nix/issues/171 - # TODO: can be fixed by turning off acpi in qemu - mem = 4096; # 4GB - vcpu = 2; + microvm = { + hypervisor = "qemu"; - interfaces = [ - { - type = "tap"; - id = "vm-hass"; - mac = "0a:00:a0:70:01:01"; - } - ]; + # 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" + ]; - volumes = [ - #{ - #image = "/var/lib/microvms/home-assistant/data.img"; - #mountPoint = "/var/lib/hass"; - #autoCreate = false; - #} - ]; - }; + # memory cannot be 2GB so i doubled it and used 4GB: + # https://github.com/microvm-nix/microvm.nix/issues/171 + # TODO: can be fixed by turning off acpi in qemu + mem = 4096; # 4GB + vcpu = 2; - systemd.network.enable = true; - systemd.network.networks."20-lan" = { - matchConfig.Type = "ether"; - networkConfig = { - Address = ["10.16.1.127/24"]; - Gateway = "10.16.1.1"; - DNS = ["10.16.1.1"]; - IPv6AcceptRA = true; - DHCP = "yes"; + interfaces = [ + { + type = "tap"; + id = "vm-hass"; + mac = "0a:00:a0:70:01:01"; + } + ]; + + volumes = [ + #{ + #image = "/var/lib/microvms/home-assistant/data.img"; + #mountPoint = "/var/lib/hass"; + #autoCreate = false; + #} + ]; + }; + + systemd.network.enable = true; + systemd.network.networks."20-lan" = { + matchConfig.Type = "ether"; + networkConfig = { + Address = [ "10.16.1.127/24" ]; + Gateway = "10.16.1.1"; + DNS = [ "10.16.1.1" ]; + IPv6AcceptRA = true; + DHCP = "yes"; + }; }; }; }; }; - }; - } - ]; + } + ]; - deploy.ssh = { - host = "10.16.1.163"; - port = 2222; - user = "foxora"; + deploy.ssh = { + host = "10.16.1.163"; + port = 2222; + user = "foxora"; + }; + }; + + lyra = { + system = "x86_64-linux"; + + groups = [ + groups.servers + ]; + + deploy.ssh = { + host = "10.16.1.58"; + port = 2222; + user = "foxora"; + }; }; }; - - lyra = { - system = "x86_64-linux"; - - groups = [ - groups.servers - ]; - - deploy.ssh = { - host = "10.16.1.58"; - port = 2222; - user = "foxora"; - }; - }; - }; }; })