diff --git a/flake.lock b/flake.lock index 1481241..ec3e358 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1724273991, - "narHash": "sha256-+aUSOXKGpS5CRm1oTitgNAr05ThQNbKIXalZHl3nC6Y=", + "lastModified": 1724006173, + "narHash": "sha256-1ROh0buuxiMyc6eIb3CIbJsmYO7PhLqSYs55mOx1XTk=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9a3161ad4c78dc420d1cbb3aae638222608c7de4", + "rev": "7f8df01d4297b9068a9592400f16044602844f86", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1724329681, - "narHash": "sha256-cwYetPD6aAnER0KTLw3l6SvNuprLcPC5AsZBIcOCELY=", + "lastModified": 1724243887, + "narHash": "sha256-qa5TXlcANiWSEzLNZmenvXkqzzh3cDUYSfNniGi+LaU=", "ref": "refs/heads/main", - "rev": "f634b9e61af7dae0ca70379bd207eea45bb417d1", - "revCount": 5127, + "rev": "883463f9dd7f1cdc68c3e32017c0a71ccbe39b26", + "revCount": 5119, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -186,31 +186,6 @@ "type": "github" } }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "xdg-desktop-portal-hyprland", - "nixpkgs" - ], - "systems": [ - "xdg-desktop-portal-hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -226,29 +201,6 @@ "systems" ] }, - "locked": { - "lastModified": 1724174162, - "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "hyprutils": "hyprutils_2", - "nixpkgs": [ - "xdg-desktop-portal-hyprland", - "nixpkgs" - ], - "systems": "systems_3" - }, "locked": { "lastModified": 1721324361, "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", @@ -288,33 +240,6 @@ "type": "github" } }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "xdg-desktop-portal-hyprland", - "hyprlang", - "nixpkgs" - ], - "systems": [ - "xdg-desktop-portal-hyprland", - "hyprlang", - "systems" - ] - }, - "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -347,11 +272,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1724377000, - "narHash": "sha256-TITxaXuhO8vDScZoE7i7E2BTXoJzZmKTk6qRkmI2d+o=", + "lastModified": 1724117732, + "narHash": "sha256-YukZGv8DyHYWeKMX3e/f12ShvB1fuBjIYgRP91huP28=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "b464de49b4d6ea8faf1988e02fc59c4908a7ff91", + "rev": "a8e3133e397a53a3674837a0e8a1efa3b7378da7", "type": "github" }, "original": { @@ -362,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -394,32 +319,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1724221631, + "narHash": "sha256-zf3gNf0nX2yOb++h4jW9l4iG8R/LfazWZD+KhmW6fcc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "ac2df85f4d5c580786c7b4db031c199554152681", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -430,8 +339,7 @@ "hyprland": "hyprland", "nix-minecraft": "nix-minecraft", "nixpkgs": "nixpkgs_3", - "spicetify-nix": "spicetify-nix", - "xdg-desktop-portal-hyprland": "xdg-desktop-portal-hyprland" + "spicetify-nix": "spicetify-nix" } }, "spicetify-nix": { @@ -442,11 +350,11 @@ ] }, "locked": { - "lastModified": 1724386575, - "narHash": "sha256-BxhvQ5uX2W9oJ6f/lDuKmgiNVRusLN01mWhJogvHpak=", + "lastModified": 1724213823, + "narHash": "sha256-2IWw1IagCe1yb/y2hzB5ofxO5KKcLPzcJYYUdVP0hRk=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "0fc9765ae6e9dc0daaebf6549e5e14ff5acff498", + "rev": "24285dbcf8f0769c7af50a0b6e38ec4fd841389e", "type": "github" }, "original": { @@ -485,57 +393,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "xdg-desktop-portal-hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_2", - "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_4", - "systems": "systems_4" - }, - "locked": { - "lastModified": 1724073926, - "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "a08ecbbf33598924e93542f737fc6169a26b481e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -553,11 +410,11 @@ ] }, "locked": { - "lastModified": 1724073926, - "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=", + "lastModified": 1722365976, + "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a08ecbbf33598924e93542f737fc6169a26b481e", + "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cd5b946..2c23bdf 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ description = "NixOS System Flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + # FIXME: Use nixos-unstable when https://nixpk.gs/pr-tracker.html?pr=335559 lands + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/programs/hyprland/default.nix b/programs/hyprland/default.nix index f6c9415..2859c4d 100644 --- a/programs/hyprland/default.nix +++ b/programs/hyprland/default.nix @@ -137,8 +137,8 @@ autogenerated = 0 # remove this line to remove the warning # See https://wiki.hyprland.org/Configuring/Monitors/ - monitor = DP-3, 1920x1080@74.973, 2560x0, 1, bitdepth, 8 - monitor = DP-2, 2560x1440@165.00301, 0x0, 1, bitdepth, 8 + monitor = DP-3, 1920x1080@74.97, 2561x0, 1 + monitor = DP-2, 2560x1440@165.00, 0x0, 1 # See https://wiki.hyprland.org/Configuring/Keywords/ for more diff --git a/services/minecraft/default.nix b/services/minecraft/default.nix index 4caa35a..d9a033e 100644 --- a/services/minecraft/default.nix +++ b/services/minecraft/default.nix @@ -2,8 +2,8 @@ let modpack = pkgs.fetchPackwizModpack { - url = "https://git.thewizard.link/wizardlink/silly-pack/raw/tag/1.0.7/pack.toml"; - packHash = "sha256-BUGBlADOmtaWrUa7lm2pt27vA5UMW9CbHHWPJ9GfHg0="; + url = "https://git.thewizard.link/wizardlink/silly-pack/raw/tag/1.0.6/pack.toml"; + packHash = "sha256-u61XXRrKheicyOaI+0Y/GnovgjL4vEwbnjqjAF5L/+g="; }; in {