Compare commits

..

No commits in common. "86ffef568e41d12675c15ddb4b23678027a0c949" and "4b985274f8c0a8a19934b9c188769bbba7869502" have entirely different histories.

8 changed files with 111 additions and 117 deletions

138
flake.lock generated
View file

@ -96,11 +96,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1771353108, "lastModified": 1770834979,
"narHash": "sha256-5Xtei4UKrqRC6IYLgI1KEBaPN9Xfef5JeOexdqDWVeg=", "narHash": "sha256-gh7GOW1y06dsfCnzBlx+qkkDUqnr1AhXBRjihUTB3w4=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "98e777cdcc39e6bd0312a9d756507ef9cbd284cb", "rev": "36658048dacf3e409f17dfd1465eee1e4e217432",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -112,11 +112,11 @@
"cachyos-kernel": { "cachyos-kernel": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1771263855, "lastModified": 1770747435,
"narHash": "sha256-akyds1g8cb742d2OrnQ4YciscpynsQ0+0YD2a8aZdvo=", "narHash": "sha256-MR4xm9zQZ5LuoHWWdrlWJyEJablzx36nY19dXpY4VE4=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "linux-cachyos", "repo": "linux-cachyos",
"rev": "5ece16c7b4a7d1261da68153cafc318a60b78ce8", "rev": "661da6f123bf3984e462fe9f932a38e643d6e081",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -128,11 +128,11 @@
"cachyos-kernel-patches": { "cachyos-kernel-patches": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1771246613, "lastModified": 1770760828,
"narHash": "sha256-GftqKiyIgMcSgVkbNqXQq7oNnoL1+EB9V71XG4lPBRs=", "narHash": "sha256-bcAZJG390mv9fFJwzyFl3iRyrTpSTWsra14qBJujR4A=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "kernel-patches", "repo": "kernel-patches",
"rev": "cb320a13e3c92f32ada27acb1fba8a828a22ae60", "rev": "87a5bb45dfee4cf31a57472591cb5013a7e9afcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -155,11 +155,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771409623, "lastModified": 1771296113,
"narHash": "sha256-1IhHueuQTVCVrui700IP9DfLXwb3kU2rnEWPSdxQY0k=", "narHash": "sha256-a7yA8+RCLnNh/ZMljgzX286z85XxtVTaeQe8mGWgbcA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "d5211287bd3cb96078f2053488d67d557848a8f2", "rev": "59d1028e19d9ac5f43122d08119e90d77e56a7da",
"revCount": 176, "revCount": 169,
"type": "git", "type": "git",
"url": "https://tearforge.net/cry/cerulean" "url": "https://tearforge.net/cry/cerulean"
}, },
@ -384,11 +384,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1769996383, "lastModified": 1768135262,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -483,11 +483,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771269455, "lastModified": 1770910055,
"narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", "narHash": "sha256-6HJVLBtbf2ub4a3P9YG+a3CTzzUcy4HpLz4IQdiyVxY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", "rev": "0825a0922a5d677f5f984bb79524569bbd1f9954",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -505,11 +505,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771102945, "lastModified": 1769872935,
"narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=", "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ff5e5d882c51f9a032479595cbab40fd04f56399", "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -983,11 +983,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1771365290, "lastModified": 1770310890,
"narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", "narHash": "sha256-lyWAs4XKg3kLYaf4gm5qc5WJrDkYy3/qeV5G733fJww=",
"owner": "microvm-nix", "owner": "microvm-nix",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "789c90b164b55b4379e7a94af8b9c01489024c18", "rev": "68c9f9c6ca91841f04f726a298c385411b7bfcd5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1004,11 +1004,11 @@
"spectrum": "spectrum_2" "spectrum": "spectrum_2"
}, },
"locked": { "locked": {
"lastModified": 1771365290, "lastModified": 1770310890,
"narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", "narHash": "sha256-lyWAs4XKg3kLYaf4gm5qc5WJrDkYy3/qeV5G733fJww=",
"owner": "microvm-nix", "owner": "microvm-nix",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "789c90b164b55b4379e7a94af8b9c01489024c18", "rev": "68c9f9c6ca91841f04f726a298c385411b7bfcd5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1128,11 +1128,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1771150922, "lastModified": 1768904356,
"narHash": "sha256-+oQJun4CFDlOQRocbZpqQDj7agoy56/4ZjT1oUR7NOs=", "narHash": "sha256-TIG8J+Or8nOydy8TztvtIshnprlf1q6XDIJnopLtMlA=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "96045e886ba0dd45b27590e7c0c6e77bbb54033d", "rev": "d95b25a4dd6da2a1dfeaaf66163d0a281a8270e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1172,11 +1172,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771130777, "lastModified": 1765267181,
"narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "efec7aaad8d43f8e5194df46a007456093c40f88", "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1232,11 +1232,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1771375681, "lastModified": 1770365342,
"narHash": "sha256-qDDw0ruBZ1kt63j4uVP5Xrd1OxGKIYrSFnig0z6ozSw=", "narHash": "sha256-jV5tAs67HSBWz/ePEp1eyoUK3Lqfc1fEAvt2wC6reFc=",
"owner": "FlameFlag", "owner": "FlameFlag",
"repo": "nixcord", "repo": "nixcord",
"rev": "d030dbb48ab020092681a39c878c1d48a553ffc1", "rev": "51db830336715209a4a213aa985f4d405ff0be69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1278,11 +1278,11 @@
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1769909678, "lastModified": 1761114652,
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"owner": "nix-community", "owner": "NixOS",
"repo": "nixpkgs.lib", "repo": "nixpkgs",
"rev": "72716169fe93074c333e8d0173151350670b824c", "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1293,11 +1293,11 @@
}, },
"nixpkgs-staging": { "nixpkgs-staging": {
"locked": { "locked": {
"lastModified": 1771384451, "lastModified": 1770984692,
"narHash": "sha256-rFs7+EFjAglrHFhRz3N/M+fyn28q+dR4gVC9/9yoWS0=", "narHash": "sha256-n6HUgG2+cvLcQkZEgXu14qgl/SrKC4EZerQXod0HGDg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f8a766def570768a6cefe8ea42f839eff9dc1eb", "rev": "e7b82c0fddf16a5e3fee29bbd8e0c8c67158176d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1309,11 +1309,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1771008912, "lastModified": 1770841267,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a82ccc39b39b621151d6732718e3e250109076fa", "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1325,11 +1325,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1771008912, "lastModified": 1769461804,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a82ccc39b39b621151d6732718e3e250109076fa", "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1341,11 +1341,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1771309086, "lastModified": 1770818322,
"narHash": "sha256-25aY7PIHMmoVW5w/x8Bs4vsfSV94A5htwiLINJ4KMuY=", "narHash": "sha256-tttCN+yrhM7svQW6DqtS3JV9POrRJAaS/e0xuUHBTEM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e17f00eb60368a4b4b110a89f1c250f9a12c053", "rev": "d9ca3a4b73f19ea147c9d977d3dde8f612ac648f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1421,11 +1421,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1771008912, "lastModified": 1768305791,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a82ccc39b39b621151d6732718e3e250109076fa", "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1437,11 +1437,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1770617025, "lastModified": 1770770419,
"narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1453,11 +1453,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1771208521, "lastModified": 1771043024,
"narHash": "sha256-X01Q3DgSpjeBpapoGA4rzKOn25qdKxbPnxHeMLNoHTU=", "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8", "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1650,11 +1650,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771268051, "lastModified": 1770846656,
"narHash": "sha256-nGqPcngnezoT+/xAvw3UDjwdKP2MC4fO315A/Otb9eE=", "narHash": "sha256-wdYpo8++TqKp3GdRgLFykjuIVW1m9GlUnxID2FG74cE=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "b930de84c561f62a0c39a6a57c2ab553a97e8495", "rev": "40e65cfc4608402674e1efaac3fccce20d2a72d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1843,11 +1843,11 @@
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1771381854, "lastModified": 1770910552,
"narHash": "sha256-6uEDuQYEGuyuFnvOdSx+fW75tRbNiLswAl6+4qyTdJ4=", "narHash": "sha256-iJ9c0ZewfRRYUflaEOj43n5TWaB6Ezygn2UA/ZHGQJA=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "0fa995bec0e391b45b032fbd9d6e03609a30c115", "rev": "15656b755cf2e75bd3e67ded6c7709bc09262c27",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -14,6 +14,7 @@
}; };
cerulean = { cerulean = {
#url = "git+https://tearforge.net/cry/cerulean?ref=refs/tags/v0.2.2-alpha";
url = "git+https://tearforge.net/cry/cerulean"; url = "git+https://tearforge.net/cry/cerulean";
inputs = { inputs = {
systems.follows = "systems"; systems.follows = "systems";

View file

@ -1,9 +0,0 @@
{
lib,
config,
...
}: {
nixpkgs.channels.default = {
default = lib.mkForce config.nixpkgs.channels.default.upkgs;
};
}

View file

@ -45,8 +45,6 @@
XDG_DATA_HOME = "$HOME/.local/share"; XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state"; XDG_STATE_HOME = "$HOME/.local/state";
XDG_BIN_HOME = "$HOME/.local/bin"; # not official spec XDG_BIN_HOME = "$HOME/.local/bin"; # not official spec
NIXOS_OZONE_WL = "1";
}; };
home.sessionPath = [ home.sessionPath = [
@ -305,6 +303,13 @@
}; };
}; };
# Environment / Session Variables
home = {
sessionVariables = {
NIXOS_OZONE_WL = "1";
};
};
# The state version is required and should stay the version you originally installed # The state version is required and should stay the version you originally installed
home.stateVersion = "24.11"; home.stateVersion = "24.11";
} }

View file

@ -294,7 +294,7 @@
via via
# wine - needed for lutris :3 # wine - needed for lutris :3
wineWow64Packages.stable wineWowPackages.stable
# utils, apps, important default stuff ig :3 # utils, apps, important default stuff ig :3
neovim neovim
@ -317,8 +317,8 @@
(steam.override { (steam.override {
extraPkgs = upkgs: [ extraPkgs = upkgs: [
nss nss
libx11 xorg.libX11
libxscrnsaver xorg.libXScrnSaver
]; ];
}).run }).run

View file

@ -1,26 +1,28 @@
{inputs, ...} @ args: { {
nixpkgs.channels = { inputs,
default = { system,
overlays = [(import ./overlays.nix args)]; ...
config.allowUnfree = true; } @ args: {
}; nixpkgs.channels.default = rec {
default = upkgs;
# nixpkgs # nixpkgs
pkgs = { pkgs = {
inherit system;
source = inputs.nixpkgs; source = inputs.nixpkgs;
overlays = [ overlays = [];
(import ./overlays.nix args)
];
config.allowUnfree = true; config.allowUnfree = true;
}; };
# nixpkgs-unstable # nixpkgs-unstable
upkgs = { upkgs = {
inherit system;
source = inputs.nixpkgs-unstable; source = inputs.nixpkgs-unstable;
overlays = with inputs; [ overlays = with inputs; [
cachyos.overlays.pinned cachyos.overlays.pinned
millennium.overlays.default millennium.overlays.default
# XXX: WARNING: TODO: cerulean will
(import ./overlays.nix args) (import ./overlays.nix args)
]; ];
@ -29,10 +31,9 @@
# nixpkgs-staging # nixpkgs-staging
spkgs = { spkgs = {
inherit system;
source = inputs.nixpkgs-staging; source = inputs.nixpkgs-staging;
overlays = [ overlays = [];
(import ./overlays.nix args)
];
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };

View file

@ -1,3 +1,4 @@
# NOTE: `system` is provided by Cerulean
{ {
inputs, inputs,
system, system,

View file

@ -16,7 +16,8 @@ cerulean.mkNexus ./. (self: {
(self.nexus) (self.nexus)
groups groups
; ;
in { in
{
nixarawrui = { nixarawrui = {
system = "x86_64-linux"; system = "x86_64-linux";
@ -43,7 +44,7 @@ cerulean.mkNexus ./. (self: {
autostart = true; autostart = true;
config = { config = {
imports = [./vms/home-assistant/default.nix]; imports = [ ./vms/home-assistant/default.nix ];
networking.hostName = "home-assistant"; networking.hostName = "home-assistant";
@ -56,32 +57,26 @@ cerulean.mkNexus ./. (self: {
mem = 4096; # 4GB mem = 4096; # 4GB
vcpu = 2; vcpu = 2;
interfaces = [ interfaces = [{
{ type = "tap";
type = "tap"; id = "vm-hass";
id = "vm-hass"; mac = "0a:00:a0:70:01:01";
mac = "0a:00:a0:70:01:01"; }];
}
];
volumes = [ volumes = [{
{ image = "/var/lib/microvms/home-assistant/data.img";
image = "/var/lib/microvms/home-assistant/data.img"; mountPoint = "/var/lib/hass";
mountPoint = "/var/lib/hass"; size = 16384; # 16GB
size = 16384; # 16GB }];
}
];
}; };
networking = { networking = {
interfaces.eth0 = { interfaces.eth0 = {
useDHCP = false; useDHCP = false;
ipv4.addresses = [ ipv4.addresses = [{
{ address = "10.16.1.127";
address = "10.16.1.127"; prefixLength = 24;
prefixLength = 24; }];
}
];
}; };
}; };
}; };