From 9a48c3c7f7d50abf752c6499544f736dde6d5d98 Mon Sep 17 00:00:00 2001 From: alisceon Date: Sun, 1 Feb 2026 15:53:16 +0100 Subject: [PATCH] sha issues abound --- flake.lock | 112 ++++++++++++++++++++++------ flake.nix | 4 +- home/wm/sway.nix | 2 +- hosts/tesla-nixos/configuration.nix | 23 ++++++ hosts/tower/configuration.nix | 1 + 5 files changed, 118 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 2e8c557..80cf211 100644 --- a/flake.lock +++ b/flake.lock @@ -84,6 +84,22 @@ "type": "github" } }, + "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -203,29 +219,49 @@ "type": "github" } }, - "nixpkgs": { + "nix-minecraft": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "systems": "systems" + }, "locked": { - "lastModified": 1769598131, - "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "lastModified": 1769936216, + "narHash": "sha256-ezgoxbHXGQMufga7aaZNhYZYiXQhaGV4jLAZy0fBhzA=", + "owner": "Infinidoge", + "repo": "nix-minecraft", + "rev": "ff6604fa8d25c1e1c135a261ddd6b3dcc4443129", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-25.11", + "owner": "Infinidoge", + "repo": "nix-minecraft", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1769789167, + "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5", "type": "github" }, "original": { @@ -235,6 +271,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1769741972, + "narHash": "sha256-RxSg1EioTWNpoLaykiT1UQKTo/K0PPdLqCyQgNjNqWs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "63590ac958a8af30ebd52c7a0309d8c52a94dd77", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts", @@ -243,11 +295,11 @@ ] }, "locked": { - "lastModified": 1769789024, - "narHash": "sha256-53/tQ2ZX/YoXJZD1wZr5CdoJXmklmkJvR8sDUr+hoOw=", + "lastModified": 1769956843, + "narHash": "sha256-168Ph9HgUlsqj/gj8xTfTK57/NX71M39D3jirfscknI=", "owner": "nix-community", "repo": "NUR", - "rev": "ac0fad704d368d566e7710be9307647b6025aeb9", + "rev": "3d1ab660049a2e95726ff75849124e981b6c271d", "type": "github" }, "original": { @@ -264,11 +316,11 @@ ] }, "locked": { - "lastModified": 1769789024, - "narHash": "sha256-53/tQ2ZX/YoXJZD1wZr5CdoJXmklmkJvR8sDUr+hoOw=", + "lastModified": 1769956843, + "narHash": "sha256-168Ph9HgUlsqj/gj8xTfTK57/NX71M39D3jirfscknI=", "owner": "nix-community", "repo": "NUR", - "rev": "ac0fad704d368d566e7710be9307647b6025aeb9", + "rev": "3d1ab660049a2e95726ff75849124e981b6c271d", "type": "github" }, "original": { @@ -305,7 +357,8 @@ "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nix-minecraft": "nix-minecraft", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "nur-unstable": "nur-unstable", @@ -325,7 +378,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -333,11 +386,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769782950, - "narHash": "sha256-bMJPPDyG/BV7Qx0r5JuO9oQG/o/VlnEOFnC8zKhJsBQ=", + "lastModified": 1769888473, + "narHash": "sha256-4KWbaJwaYnZ60bFyTudZYAKskjr7Sa17R3/yh+oXS7w=", "owner": "danth", "repo": "stylix", - "rev": "aad90ca763be126c0ed67c29826bbb9b5ca665d8", + "rev": "ae5c0239ae4f82a8c7e33ad8a456535d5a9ba813", "type": "github" }, "original": { @@ -361,6 +414,21 @@ "type": "github" } }, + "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" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 2e5bec1..d251132 100644 --- a/flake.nix +++ b/flake.nix @@ -20,9 +20,10 @@ url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-minecraft.url = "github:Infinidoge/nix-minecraft"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, nur, nur-unstable, home-manager, stylix, ... }: + outputs = { self, nixpkgs, nixpkgs-unstable, nur, nur-unstable, home-manager, stylix, nix-minecraft, ... }: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -108,6 +109,7 @@ modules = sharedModules ++ [ ./hosts/common/server.nix ./hosts/tesla-nixos/configuration.nix + nix-minecraft.nixosModules.minecraft-servers home-manager.nixosModules.home-manager ({ config, ...}: { home-manager.users.alisceon.imports = [ diff --git a/home/wm/sway.nix b/home/wm/sway.nix index 0428a14..2fb3c57 100644 --- a/home/wm/sway.nix +++ b/home/wm/sway.nix @@ -381,7 +381,7 @@ "clock" = { interval = 60; tooltip = true; - format = "| {:%H:%M}"; + format = "| {:%H:%M} "; tooltip-format = "{:%Y-%m-%d}"; }; "battery" = { diff --git a/hosts/tesla-nixos/configuration.nix b/hosts/tesla-nixos/configuration.nix index 4f38cde..670c4a4 100644 --- a/hosts/tesla-nixos/configuration.nix +++ b/hosts/tesla-nixos/configuration.nix @@ -1,5 +1,11 @@ { config, pkgs, lib, ... }: +let + modpack = pkgs.fetchPackwizModpack { + url = "https://git.malice.zone/alisceon/tfcpack/-/raw/main/pack.toml"; + packHash = "sha256-0f3ql6825fa7qx5lacjzhanfs87r4i4591x7y2lazc3vic8hp2i6"; + }; +in { security.sudo.wheelNeedsPassword = false; imports = @@ -34,6 +40,23 @@ "default-runtime" = "crun"; }; }; + + nixpkgs.overlays = [ inputs.nix-minecraft.overlay ]; + services.minecraft-servers = { + enable = true; + eula = true; + openFirewall = true; + servers.fabric = { + enable = true; + package = pkgs.neoforgeServers.neoforge-1_21_1.override { + loaderVersion = "21.1.219"; + }; + symlinks = { + "mods" = "${modpack}/mods"; + }; + }; + }; + users.users.gitlab-runner = { isNormalUser = true; home = "/var/lib/gitlab-runner"; diff --git a/hosts/tower/configuration.nix b/hosts/tower/configuration.nix index 64ac02c..e808322 100644 --- a/hosts/tower/configuration.nix +++ b/hosts/tower/configuration.nix @@ -61,6 +61,7 @@ }; systemPackages = [ pkgs.efibootmgr + pkgs.prismlauncher ]; }; } # end file