diff --git a/flake.lock b/flake.lock index b93aedb..004bc88 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": 1739103745, - "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "f1multiviewer": { "inputs": { "nixpkgs": [ @@ -125,106 +92,9 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739049071, - "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": [ - "hyprland-qtutils" - ], - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": [], - "systems": [ - "systems" - ], - "xdph": "xdph" - }, - "locked": { - "lastModified": 1739368482, - "narHash": "sha256-t/YNy0Z/gpXTMyL9uPNg1IYCkwVj5H1dbBu+XbqiNjA=", - "ref": "refs/heads/main", - "rev": "68bb3e7f0a1d528a8b2da1f92d2005889587561d", - "revCount": 5809, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland/" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland/" - } - }, "hyprland-contrib": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1739218873, @@ -240,125 +110,6 @@ "type": "github" } }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": [ - "hyprland-qt-support" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048914, - "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a7334904d591f38757c46fbe2ab68651877d9099", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "hyprman": { "inputs": { "nim2nix": [ @@ -382,56 +133,6 @@ "url": "https://git.dayl.in/daylin/hyprman.git" } }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048933, - "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739049028, - "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "04146df74a8d5ec0b579657307be01f1e241125f", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "jj": { "inputs": { "flake-utils": [ @@ -625,15 +326,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", - "owner": "nixos", + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -678,6 +379,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pixi": { "inputs": { "nixpkgs": [ @@ -732,10 +449,7 @@ "NixVirt": "NixVirt", "f1multiviewer": "f1multiviewer", "flake-utils": "flake-utils", - "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", - "hyprland-qt-support": "hyprland-qt-support", - "hyprland-qtutils": "hyprland-qtutils", "hyprman": "hyprman", "jj": "jj", "lib-aggregate": "lib-aggregate", @@ -745,7 +459,7 @@ "nim2nix": "nim2nix", "nix-index-database": "nix-index-database", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-lib": "nixpkgs-lib", "nixpkgs-wayland": "nixpkgs-wayland", "pixi": "pixi", @@ -897,47 +611,6 @@ "type": "git", "url": "https://git.dayl.in/daylin/utils.git" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7e8ad1e..a07dbc4 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ nixos-wsl.url = "github:nix-community/NixOS-WSL"; nix-index-database.url = "github:nix-community/nix-index-database"; sops-nix.url = "github:Mic92/sops-nix"; - hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; + # hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; hyprland-contrib.url = "github:hyprwm/contrib"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; @@ -46,8 +46,8 @@ ## nixpkgs f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.inputs.nixpkgs.follows = "nixpkgs"; - hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; + # hyprland.inputs.nixpkgs.follows = "nixpkgs"; + # hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; hyprman.inputs.nixpkgs.follows = "nixpkgs"; jj.inputs.nixpkgs.follows = "nixpkgs"; nim2nix.inputs.nixpkgs.follows = "nixpkgs"; @@ -68,20 +68,20 @@ utils.inputs.nim2nix.follows = "nim2nix"; # further flake.lock minimization shenanigans - hyprland-qt-support.url = "github:hyprwm/hyprland-qt-support"; - hyprland-qt-support.inputs.hyprlang.follows = "hyprland/hyprlang"; - hyprland-qt-support.inputs.nixpkgs.follows = "hyprland/nixpkgs"; - hyprland-qt-support.inputs.systems.follows = "hyprland/systems"; - hyprland-qtutils.url = "github:hyprwm/hyprland-qtutils"; - hyprland-qtutils.inputs.hyprland-qt-support.follows = "hyprland-qt-support"; - hyprland-qtutils.inputs.hyprlang.follows = "hyprland/hyprlang"; - hyprland-qtutils.inputs.hyprutils.follows = "hyprland/hyprutils"; - hyprland-qtutils.inputs.nixpkgs.follows = "hyprland/nixpkgs"; - hyprland-qtutils.inputs.systems.follows = "hyprland/systems"; - hyprland.inputs.hyprland-qtutils.follows = "hyprland-qtutils"; + # hyprland-qt-support.url = "github:hyprwm/hyprland-qt-support"; + # hyprland-qt-support.inputs.hyprlang.follows = "hyprland/hyprlang"; + # hyprland-qt-support.inputs.nixpkgs.follows = "hyprland/nixpkgs"; + # hyprland-qt-support.inputs.systems.follows = "hyprland/systems"; + # hyprland-qtutils.url = "github:hyprwm/hyprland-qtutils"; + # hyprland-qtutils.inputs.hyprland-qt-support.follows = "hyprland-qt-support"; + # hyprland-qtutils.inputs.hyprlang.follows = "hyprland/hyprlang"; + # hyprland-qtutils.inputs.hyprutils.follows = "hyprland/hyprutils"; + # hyprland-qtutils.inputs.nixpkgs.follows = "hyprland/nixpkgs"; + # hyprland-qtutils.inputs.systems.follows = "hyprland/systems"; + # hyprland.inputs.hyprland-qtutils.follows = "hyprland-qtutils"; systems.url = "github:nix-systems/x86_64-linux"; - hyprland.inputs.systems.follows = "systems"; + # hyprland.inputs.systems.follows = "systems"; flake-utils.inputs.systems.follows = "systems"; flake-utils.url = "github:numtide/flake-utils"; @@ -101,7 +101,7 @@ roc.inputs.rust-overlay.follows = "rust-overlay"; ## nil inputs, I don't *ALL* your flake inputs... - hyprland.inputs.pre-commit-hooks.follows = ""; + # hyprland.inputs.pre-commit-hooks.follows = ""; nixos-wsl.inputs.flake-compat.follows = ""; nixpkgs-wayland.inputs.flake-compat.follows = ""; diff --git a/modules/desktop/window-managers/hyprland.nix b/modules/desktop/window-managers/hyprland.nix index f85f37d..470e235 100644 --- a/modules/desktop/window-managers/hyprland.nix +++ b/modules/desktop/window-managers/hyprland.nix @@ -1,5 +1,4 @@ { - inputs, pkgs, config, lib, @@ -13,9 +12,9 @@ let cfg = config.oizys.hyprland; in { - imports = [ - inputs.hyprland.nixosModules.default - ]; + # imports = [ + # inputs.hyprland.nixosModules.default + # ]; options.oizys.hyprland.enable = mkEnableOption "hyprland";