From b3004669bbf9fd97e2da27b4ced693d171f34829 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 15 May 2024 18:24:16 -0600 Subject: update --- flake.lock | 68 ++++++++++++++++++++++---------------------------------------- 1 file changed, 24 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 417e213..439cf59 100644 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ "catppuccin-btop": { "flake": false, "locked": { - "lastModified": 1696688295, - "narHash": "sha256-jodJl4f2T9ViNqsY9fk8IV62CrpC5hy7WK3aRpu70Cs=", + "lastModified": 1715687124, + "narHash": "sha256-UXeTypc15MhjgGUiCrDUZ40m32yH2o1N+rcrEgY6sME=", "owner": "catppuccin", "repo": "btop", - "rev": "c6469190f2ecf25f017d6120bf4e050e6b1d17af", + "rev": "21b8d5956a8b07fa52519e3267fb3a2d2e693d17", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1714043624, - "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", + "lastModified": 1715381426, + "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "owner": "nix-community", "repo": "home-manager", - "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", + "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "type": "github" }, "original": { @@ -165,22 +165,20 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs-unstable" ], "systems": "systems", - "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1714772427, - "narHash": "sha256-O3x+I8JncOc8JioivSHJKwKpzV+WHTV3bVJxM/aPkrg=", + "lastModified": 1715817355, + "narHash": "sha256-2G0VU8TlL0S7aM2mbIMGOgfPjZrl+4soLi11hXcMScw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1237732b97fcf21a19aed16f2ef966118a3ca2aa", + "rev": "de9798fcf9494eb082bd168175390c0d47b8478b", "type": "github" }, "original": { @@ -193,10 +191,12 @@ "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1714755542, - "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", + "lastModified": 1715608589, + "narHash": "sha256-vimNaLjLcoNIvBhF37GaB6PRYEvKMamY3UnDE9M5MW8=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", + "rev": "65c2636484e5cb00583b8a7446c3fb657f568883", "type": "github" }, "original": { @@ -321,11 +321,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714531828, - "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", + "lastModified": 1715668745, + "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1", + "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843", "type": "github" }, "original": { @@ -352,11 +352,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -431,29 +431,9 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713731601, - "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" @@ -468,11 +448,11 @@ ] }, "locked": { - "lastModified": 1714060055, - "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", + "lastModified": 1714662532, + "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", + "rev": "1f228ba2f1f254195c0b571302b37482861abee3", "type": "github" }, "original": { -- cgit v1.2.3 From c89714f8d5fdd81bb66ce9cceffb737edaaeddbb Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 15 May 2024 18:34:46 -0600 Subject: testing hyprland build with nixpkgs stable --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 1e079c9..564aab6 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ # hyprland.url = "github:hyprwm/Hyprland"; hyprland = { url = "github:hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; nix-colors.url = "github:misterio77/nix-colors"; -- cgit v1.2.3 From 69e586190a2fa43250b9ee737ced6ffe76664b24 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 15 May 2024 20:00:50 -0600 Subject: messing with hyprland --- flake.lock | 2 +- flake.nix | 8 ++++---- modules/nixos/hyprland.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 439cf59..c7a498b 100644 --- a/flake.lock +++ b/flake.lock @@ -168,7 +168,7 @@ "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ], "systems": "systems", "xdph": "xdph" diff --git a/flake.nix b/flake.nix index 564aab6..bb77e61 100644 --- a/flake.nix +++ b/flake.nix @@ -15,10 +15,10 @@ # modern window compositor # hyprland.url = "github:hyprwm/Hyprland"; - hyprland = { - url = "github:hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # hyprland = { + # url = "github:hyprwm/Hyprland"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; nix-colors.url = "github:misterio77/nix-colors"; diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index f19f052..c6c97ed 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -32,7 +32,7 @@ programs = { hyprland = { enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; + # package = inputs.hyprland.packages.${pkgs.system}.hyprland; # nvidiaPatches = true; }; -- cgit v1.2.3 From be2417e860e5c63033ee579b2f0246013d4a4313 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 15 May 2024 20:02:42 -0600 Subject: removed inputs --- flake.lock | 177 ------------------------------------------------------------- 1 file changed, 177 deletions(-) diff --git a/flake.lock b/flake.lock index c7a498b..e090458 100644 --- a/flake.lock +++ b/flake.lock @@ -133,137 +133,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713612213, - "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprlang": "hyprlang", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1715817355, - "narHash": "sha256-2G0VU8TlL0S7aM2mbIMGOgfPjZrl+4soLi11hXcMScw=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "de9798fcf9494eb082bd168175390c0d47b8478b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1715608589, - "narHash": "sha256-vimNaLjLcoNIvBhF37GaB6PRYEvKMamY3UnDE9M5MW8=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "65c2636484e5cb00583b8a7446c3fb657f568883", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -391,7 +260,6 @@ "catppuccin-hyprland": "catppuccin-hyprland", "catppuccin-starship": "catppuccin-starship", "home-manager": "home-manager", - "hyprland": "hyprland", "nix-colors": "nix-colors", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", @@ -400,21 +268,6 @@ "wallpapers": "wallpapers" } }, - "systems": { - "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" - } - }, "wallpapers": { "flake": false, "locked": { @@ -430,36 +283,6 @@ "repo": "wallpapers", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1714662532, - "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "1f228ba2f1f254195c0b571302b37482861abee3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", -- cgit v1.2.3