diff --git a/flake.lock b/flake.lock index a787f6f..90a9b8c 100644 --- a/flake.lock +++ b/flake.lock @@ -58,16 +58,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, @@ -144,7 +145,7 @@ }, "devshell": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1741473158, @@ -160,6 +161,27 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1746728054, + "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=", + "owner": "nix-community", + "repo": "disko", + "rev": "ff442f5d1425feb86344c028298548024f21256d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "latest", + "repo": "disko", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -200,6 +222,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -241,11 +279,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1762040540, + "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "0010412d62a25d959151790968765a70c436598b", "type": "github" }, "original": { @@ -293,6 +331,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -370,24 +426,6 @@ "type": "github" } }, - "heartsmp": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1759516787, - "narHash": "sha256-FR+amHKKg2a2e9ngUE83t+7qmup4rVZNkFxXiOlP7Ss=", - "ref": "refs/heads/main", - "rev": "a6ea4efa2031ac6b02244c7fb72824a9c7114a5e", - "revCount": 4, - "type": "git", - "url": "file:///home/guz/.projects/heart-smp" - }, - "original": { - "type": "git", - "url": "file:///home/guz/.projects/heart-smp" - } - }, "hercules-ci-effects": { "inputs": { "flake-parts": [ @@ -400,11 +438,11 @@ ] }, "locked": { - "lastModified": 1755233722, - "narHash": "sha256-AavrbMltJKcC2Fx0lfJoZfmy7g87ebXU0ddVenhajLA=", + "lastModified": 1761230615, + "narHash": "sha256-pLE7U5gOtlA/2wbKCsVRYf5DqMQ5TWBCrCfZGytDDeo=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "99e03e72e3f7e13506f80ef9ebaedccb929d84d0", + "rev": "7db2b867219a26781437d840ce457b75b7645154", "type": "github" }, "original": { @@ -420,11 +458,11 @@ ] }, "locked": { - "lastModified": 1756245065, - "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "54b2879ce622d44415e727905925e21b8f833a98", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -436,14 +474,14 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1751990210, - "narHash": "sha256-krWErNDl9ggMLSfK00Q2BcoSk3+IRTSON/DiDgUzzMw=", + "lastModified": 1756842514, + "narHash": "sha256-XbtRMewPGJwTNhBC4pnBu3w/xT1XejvB0HfohC2Kga8=", "owner": "nix-community", "repo": "home-manager", - "rev": "218da00bfa73f2a61682417efe74549416c16ba6", + "rev": "30fc1b532645a21e157b6e33e3f8b4c154f86382", "type": "github" }, "original": { @@ -526,9 +564,9 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems_3", "xdph": "xdph" }, "locked": { @@ -754,7 +792,7 @@ "blink-cmp": "blink-cmp", "go-grip": "go-grip", "mdfmt": "mdfmt", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1756571933, @@ -786,6 +824,28 @@ "type": "github" } }, + "nix-minecraft": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1762480864, + "narHash": "sha256-OD3/2nATIXFEyTq3cxGUjZyBf8YlCSpIX/iJzSJbWag=", + "owner": "infinidoge", + "repo": "nix-minecraft", + "rev": "4f3414fdfce0ddf85c35e95d07809aeb93d2f0ad", + "type": "github" + }, + "original": { + "owner": "infinidoge", + "repo": "nix-minecraft", + "type": "github" + } + }, "nixpak": { "inputs": { "flake-parts": "flake-parts_2", @@ -795,11 +855,11 @@ ] }, "locked": { - "lastModified": 1756349098, - "narHash": "sha256-B+XjnwjXuOT+yyZCUY7F24mgNE8Fmx5Pw6FlvCDTLZc=", + "lastModified": 1762396580, + "narHash": "sha256-riBOo30D8DhqQobcIYAC6sDl9PHBUq9ukjS4NjnjEM4=", "owner": "nixpak", "repo": "nixpak", - "rev": "d73116f6b9eb8cd5f1acc1a3dc9e9979ba5c3131", + "rev": "e4bcce21a735a07c409b696b31c17f6640ca0aa2", "type": "github" }, "original": { @@ -810,11 +870,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1756386758, + "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", "type": "github" }, "original": { @@ -824,22 +884,6 @@ "type": "github" } }, - "nixpkgs-ente": { - "locked": { - "lastModified": 1754679830, - "narHash": "sha256-lQIi0eGZ5VOGraniTX+7+4eV4uJ+VizXeIik5+H7KFQ=", - "owner": "oddlama", - "repo": "nixpkgs", - "rev": "aabbf91c16d4c78a5b4c67a8c0750d549f964cca", - "type": "github" - }, - "original": { - "owner": "oddlama", - "ref": "ente-modules", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1733096140, @@ -869,11 +913,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1756386758, - "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -885,27 +929,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756386758, - "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", + "lastModified": 1762498405, + "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1756469547, - "narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "41d292bfc37309790f70f4c120b79280ce40af16", + "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "type": "github" }, "original": { @@ -915,7 +943,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1722073938, "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", @@ -931,13 +959,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1751637120, - "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -947,7 +975,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1751792365, "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", @@ -963,7 +991,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1747958103, "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", @@ -1007,7 +1035,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "xremap", @@ -1051,13 +1079,13 @@ }, "root": { "inputs": { - "heartsmp": "heartsmp", + "disko": "disko", "home-manager": "home-manager", "neovim": "neovim", "nix-flatpak": "nix-flatpak", + "nix-minecraft": "nix-minecraft", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_3", - "nixpkgs-ente": "nixpkgs-ente", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "rec-sh": "rec-sh", "sops-nix": "sops-nix", @@ -1090,11 +1118,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1760998189, + "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "type": "github" }, "original": { @@ -1116,7 +1144,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1124,11 +1152,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755710103, - "narHash": "sha256-VmheUy4UzWDy/u0TvCCHptgF30peL7wRxkHy7EVpDrQ=", + "lastModified": 1762295027, + "narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=", "owner": "danth", "repo": "stylix", - "rev": "79be65b20d7b8fb7e8f39ba8121cfe41b7f46808", + "rev": "91b9a270523361268ba6a8772152fde31103869f", "type": "github" }, "original": { @@ -1154,6 +1182,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1273,7 +1316,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1750931469, @@ -1350,11 +1393,11 @@ "xremap": "xremap_2" }, "locked": { - "lastModified": 1754250371, - "narHash": "sha256-DJe71fhVQkW0vNEHXH8H3hAfnJgow4hCWo9Nb0qawHU=", + "lastModified": 1762222968, + "narHash": "sha256-sdeaXvOItorlV0WQgF9CDiVquQllVspWx1fmxU2dgLY=", "owner": "xremap", "repo": "nix-flake", - "rev": "baf69e1d250e1543f7a3bd6815930ad4019486ce", + "rev": "066fd14ac7dd824fa6bba5a6fc83adfa41640528", "type": "github" }, "original": { @@ -1366,16 +1409,16 @@ "xremap_2": { "flake": false, "locked": { - "lastModified": 1754246378, - "narHash": "sha256-7bkLn8cGDxUjy9rMcGmgrzm1YGouScQEmQMlg1k+HCY=", + "lastModified": 1762012494, + "narHash": "sha256-UHkwTz5KEDAqXKpN/YVzY0xP7b6nN8WkPilzpF8YU3A=", "owner": "k0kubun", "repo": "xremap", - "rev": "1d09a5fdb84634b32076780481884c121328a710", + "rev": "99d8c2b93ec04dc189531ca499f155178823e733", "type": "github" }, "original": { "owner": "k0kubun", - "ref": "v0.10.14", + "ref": "v0.14.3", "repo": "xremap", "type": "github" } @@ -1390,11 +1433,11 @@ ] }, "locked": { - "lastModified": 1756524600, - "narHash": "sha256-uORxiu9IMsTcapawMwXs7fXrk5rNnY4MNlRL0tgLMuI=", + "lastModified": 1762575755, + "narHash": "sha256-XOeYONAhmYfqGR6W0UapzbIfmnh/WEdpdECIvSVHyww=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "79ce4212f93e81e0e37572645b419c0a954c5486", + "rev": "5ba60c02a601fafb9661200e390c6995a6b596e3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2cbe4cd..7303f21 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + disko = { + url = "github:nix-community/disko/latest"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + stylix = { url = "github:danth/stylix/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -24,9 +29,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - heart-modpack = { - url = "git+file:///home/guz/.projects/heart-modpack"; - }; + # heart-modpack = { + # url = "git+file:///home/guz/.projects/heart-modpack"; + # }; nix-flatpak = { url = "github:gmodena/nix-flatpak/?ref=latest"; @@ -134,6 +139,20 @@ ./home/guz-lite/configuration.nix ]; }; + "rusty" = nixpkgs.lib.nixosSystem rec { + system = "x86_64-linux"; + specialArgs = { + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfreePredicate = _: true; + }; + inherit inputs self; + }; + modules = [ + ./modules/nixos/context.nix + ./hosts/rusty/configuration.nix + ]; + }; }; homeConfigurations = forAllSystems ({ diff --git a/hosts/rusty/configuration.nix b/hosts/rusty/configuration.nix new file mode 100644 index 0000000..b4d5262 --- /dev/null +++ b/hosts/rusty/configuration.nix @@ -0,0 +1,50 @@ +{ + lib, + inputs, + ... +}: { + imports = [ + ../../configuration.nix + inputs.disko.nixosModules.disko + ]; + + # Network + networking = { + hostName = lib.mkForce "rusty"; + #wireless.enable = lib.mkForce true; + }; + + disko.devices.disk.main = { + device = "/dev/sda"; # This will be overwritten by disko-install + type = "disk"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "500M"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot/efi"; + mountOptions = ["dmask=0022" "fmask=0022" "nofail"]; + }; + }; + root = { + size = "100%"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; + }; + }; + }; + }; + + boot.loader.efi.canTouchEfiVariables = lib.mkForce false; + boot.loader.grub = { + efiSupport = true; + efiInstallAsRemovable = true; + device = "nodev"; + }; +}