diff --git a/flake.lock b/flake.lock index fa03511..4f0e116 100644 --- a/flake.lock +++ b/flake.lock @@ -3,14 +3,15 @@ "api-lyte-dev": { "inputs": { "flake-utils": "flake-utils", + "lexical": "lexical", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1690574004, - "narHash": "sha256-1bF8WGiYe9AwhVaRN2VcyIPmQsnxRL5BPQC1hAe3K64=", + "lastModified": 1699309665, + "narHash": "sha256-oUCS7X3D/Kl7zzuP9DKwXGsgFm02lSK0GTHxAkzExQU=", "ref": "refs/heads/master", - "rev": "02bf4481bc8d057a7ef4ae01467f8bd574ccb1c1", - "revCount": 71, + "rev": "f07257fea4ef4bf4915cd30cde663e006ee02c76", + "revCount": 77, "type": "git", "url": "ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git" }, @@ -106,6 +107,24 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1689068808, "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", @@ -138,7 +157,7 @@ "helix": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, @@ -180,7 +199,7 @@ "inputs": { "hyprland-protocols": "hyprland-protocols", "nixpkgs": "nixpkgs_5", - "systems": "systems_3", + "systems": "systems_4", "wlroots": "wlroots", "xdph": "xdph" }, @@ -223,18 +242,40 @@ "type": "github" } }, + "lexical": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "api-lyte-dev", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699016103, + "narHash": "sha256-8uMDgg/YnyaSn8IvlG14PVSCHQl6ZHdgB8CWNDnYd5s=", + "owner": "lexical-lsp", + "repo": "lexical", + "rev": "059bbbe516a4dff66bc3febc953ac2eddabc78a4", + "type": "github" + }, + "original": { + "owner": "lexical-lsp", + "repo": "lexical", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "lastModified": 1699186365, + "narHash": "sha256-Pxrw5U8mBsL3NlrJ6q1KK1crzvSUcdfwb9083sKDrcU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "rev": "a0b3b06b7a82c965ae0bb1d59f6e386fe755001d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -491,6 +532,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", diff --git a/modules/home-manager/mako.nix b/modules/home-manager/mako.nix index e4adc90..a531ca4 100644 --- a/modules/home-manager/mako.nix +++ b/modules/home-manager/mako.nix @@ -15,6 +15,7 @@ textColor = text; borderColor = primary; progressColor = primary; + anchor = "bottom-left"; extraConfig = '' [urgency=high] diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix index 49f1e0b..f1fdef7 100644 --- a/modules/home-manager/sway.nix +++ b/modules/home-manager/sway.nix @@ -135,20 +135,20 @@ "swayidle -w" "timeout 300 'notify-send \"Idling in 300 seconds\"'" "resume 'notify-send \"Idling cancelled.\"'" - "timeout 480 'notify-send \"Idling in 120 seconds\"'" - "timeout 510 'notify-send \"Idling in 90 seconds\"'" - "timeout 540 'notify-send \"Idling in 60 seconds!\"'" - "timeout 570 'notify-send \"Idling in 30 seconds!\"'" - "timeout 590 'notify-send \"Idling in 10 seconds!\"'" - "timeout 591 'notify-send \"Idling in 9 seconds!\"'" - "timeout 592 'notify-send \"Idling in 8 seconds!\"'" - "timeout 593 'notify-send \"Idling in 7 seconds!\"'" - "timeout 594 'notify-send \"Idling in 6 seconds!\"'" - "timeout 595 'notify-send \"Idling in 5 seconds!\"'" - "timeout 596 'notify-send \"Idling in 4 seconds!\"'" - "timeout 597 'notify-send \"Idling in 3 seconds!\"'" - "timeout 598 'notify-send \"Idling in 2 seconds!\"'" - "timeout 599 'notify-send \"Idling in 1 second!\"'" + "timeout 480 'notify-send -u critical \"Idling in 120 seconds\"'" + "timeout 510 'notify-send -u critical \"Idling in 90 seconds\"'" + "timeout 540 'notify-send -u critical \"Idling in 60 seconds!\"'" + "timeout 570 'notify-send -u critical \"Idling in 30 seconds!\"'" + "timeout 590 'notify-send -u critical \"Idling in 10 seconds!\"'" + "timeout 591 'notify-send -u critical \"Idling in 9 seconds!\"'" + "timeout 592 'notify-send -u critical \"Idling in 8 seconds!\"'" + "timeout 593 'notify-send -u critical \"Idling in 7 seconds!\"'" + "timeout 594 'notify-send -u critical \"Idling in 6 seconds!\"'" + "timeout 595 'notify-send -u critical \"Idling in 5 seconds!\"'" + "timeout 596 'notify-send -u critical \"Idling in 4 seconds!\"'" + "timeout 597 'notify-send -u critical \"Idling in 3 seconds!\"'" + "timeout 598 'notify-send -u critical \"Idling in 2 seconds!\"'" + "timeout 599 'notify-send -u critical \"Idling in 1 second!\"'" "timeout 600 'swaylock -f'" "timeout 600 'swaymsg \"output * dpms off\"'" "resume 'swaymsg \"output * dpms on\" & maybe-good-morning &'" diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix index 7d80a74..ab534f5 100644 --- a/modules/nixos/common.nix +++ b/modules/nixos/common.nix @@ -49,6 +49,7 @@ less mosh nmap + nettools openssl pciutils pv diff --git a/nixos/beefcake/default.nix b/nixos/beefcake/default.nix index b0a1864..5e763d3 100644 --- a/nixos/beefcake/default.nix +++ b/nixos/beefcake/default.nix @@ -709,6 +709,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 TYPE = "FORGE"; FORGE_VERSION = "43.3.2"; ALLOW_FLIGHT = "true"; + ENABLE_QUERY = "true"; MODPACK = "/data/origination-files/Monumental+Experience-2.2.53.zip"; @@ -728,7 +729,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 environmentFiles = [ config.sops.secrets."jland.env".path ]; - ports = ["25565:25565"]; + ports = ["26965:25565"]; volumes = [ "/storage/jland/data:/data" "/storage/jland/worlds:/worlds"