diff --git a/flake.lock b/flake.lock
index e05b227..1bab2a7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,39 +21,6 @@
"type": "github"
}
},
- "aquamarine": {
- "inputs": {
- "hyprutils": [
- "hyprland",
- "hyprutils"
- ],
- "hyprwayland-scanner": [
- "hyprland",
- "hyprwayland-scanner"
- ],
- "nixpkgs": [
- "hyprland",
- "nixpkgs"
- ],
- "systems": [
- "hyprland",
- "systems"
- ]
- },
- "locked": {
- "lastModified": 1725199881,
- "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
- "owner": "hyprwm",
- "repo": "aquamarine",
- "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
- "type": "github"
- },
- "original": {
- "owner": "hyprwm",
- "repo": "aquamarine",
- "type": "github"
- }
- },
"darwin": {
"inputs": {
"nixpkgs": [
@@ -191,11 +158,11 @@
]
},
"locked": {
- "lastModified": 1722623071,
- "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
+ "lastModified": 1718450675,
+ "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
"owner": "hyprwm",
"repo": "hyprcursor",
- "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
+ "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
"type": "github"
},
"original": {
@@ -206,7 +173,6 @@
},
"hyprland": {
"inputs": {
- "aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
@@ -216,16 +182,16 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1725814101,
- "narHash": "sha256-+wE97utoDfhQP6AMdZHUmBeL8grbce/Jv2i5M+6AbaE=",
- "rev": "0f594732b063a90d44df8c5d402d658f27471dfe",
- "revCount": 5196,
+ "lastModified": 1719317162,
+ "narHash": "sha256-JmfnYz+9a4TjNl3mAus1VpoWtTI9d1xkW9MHbkcV0Po=",
+ "rev": "918d8340afd652b011b937d29d5eea0be08467f5",
+ "revCount": 4886,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
},
"original": {
- "rev": "0f594732b063a90d44df8c5d402d658f27471dfe",
+ "rev": "918d8340afd652b011b937d29d5eea0be08467f5",
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -245,11 +211,11 @@
]
},
"locked": {
- "lastModified": 1721326555,
- "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
+ "lastModified": 1714869498,
+ "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
- "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
+ "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
"type": "github"
},
"original": {
@@ -274,11 +240,11 @@
]
},
"locked": {
- "lastModified": 1725188252,
- "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
+ "lastModified": 1717881852,
+ "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
"owner": "hyprwm",
"repo": "hyprlang",
- "rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
+ "rev": "ec6938c66253429192274d612912649a0cfe4d28",
"type": "github"
},
"original": {
@@ -299,11 +265,11 @@
]
},
"locked": {
- "lastModified": 1724966483,
- "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
+ "lastModified": 1719316102,
+ "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
"owner": "hyprwm",
"repo": "hyprutils",
- "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
+ "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
"type": "github"
},
"original": {
@@ -324,11 +290,11 @@
]
},
"locked": {
- "lastModified": 1721324119,
- "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
+ "lastModified": 1719067853,
+ "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
- "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
+ "rev": "914f083741e694092ee60a39d31f693d0a6dc734",
"type": "github"
},
"original": {
@@ -371,11 +337,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1725103162,
- "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+ "lastModified": 1719075281,
+ "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+ "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
"type": "github"
},
"original": {
@@ -608,11 +574,11 @@
]
},
"locked": {
- "lastModified": 1725203932,
- "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
+ "lastModified": 1718619174,
+ "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
+ "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index e378880..f678f70 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,7 +33,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
- hyprland.url = "git+https://github.com/hyprwm/Hyprland?rev=0f594732b063a90d44df8c5d402d658f27471dfe&submodules=1";
+ hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&rev=918d8340afd652b011b937d29d5eea0be08467f5";
};
outputs =
diff --git a/modules/nix/overlays.nix b/modules/nix/overlays.nix
index 555355d..f15b9c7 100644
--- a/modules/nix/overlays.nix
+++ b/modules/nix/overlays.nix
@@ -6,8 +6,8 @@
}:
{
nixpkgs.overlays = [
- # Add env vars to calibre so they may get propagated to a plugin that needs them
(final: prev: {
+ # Add env vars to calibre so they may get propagated to a plugin that needs them
calibre = prev.calibre.overrideAttrs (old: {
postInstall = ''
wrapProgram $out/bin/calibre \
@@ -16,32 +16,24 @@
--set-default ACSM_LIBSSL ${prev.openssl.out}/lib/libssl.so
'';
});
- })
- (final: prev: {
lollypop = prev.lollypop.override {
#lastFMSupport = false;
youtubeSupport = false;
};
- })
- (final: prev: {
scripts = import ../../home/scripts {
inherit lib config;
pkgs = prev.pkgs;
};
- })
- (final: prev: {
rofi-obsidian = inputs.rofi-obsidian.outputs.packages.${prev.pkgs.system}.rofi-obsidian;
- })
+ nysh = inputs.nysh.defaultPackage.${prev.pkgs.system};
- (final: prev: { nysh = inputs.nysh.defaultPackage.${prev.pkgs.system}; })
+ hyprland = inputs.hyprland.packages.${prev.pkgs.system}.hyprland;
- (final: prev: { hyprland = inputs.hyprland.packages.${final.stdenv.hostPlatform.system}.hyprland; })
- (final: prev: {
xdg-desktop-portal-hyprland =
- inputs.hyprland.packages.${final.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+ inputs.hyprland.packages.${prev.pkgs.system}.xdg-desktop-portal-hyprland;
})
];
}