From 32395011fdea50be84cb7b4d4370c2e36f3e4d92 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 3 Sep 2025 00:28:53 -0500 Subject: [PATCH] disable hyprland for now --- common/desktop_environment/default.nix | 10 +- common/flake.nix | 20 +- hosts/lio/flake.lock | 484 +------------------------ hosts/lio/flake.nix | 3 +- 4 files changed, 29 insertions(+), 488 deletions(-) diff --git a/common/desktop_environment/default.nix b/common/desktop_environment/default.nix index 4004ada..8c7f2a5 100644 --- a/common/desktop_environment/default.nix +++ b/common/desktop_environment/default.nix @@ -6,7 +6,7 @@ in { imports = [ ./gnome - ./hyprland + # ./hyprland ./sway ./cosmic ]; @@ -19,10 +19,10 @@ in name = "gnome"; enabled = cfg.gnome.enable; } - { - name = "hyprland"; - enabled = cfg.hyprland.enable; - } + # { + # name = "hyprland"; + # enabled = cfg.hyprland.enable; + # } { name = "sway"; enabled = cfg.sway.enable; diff --git a/common/flake.nix b/common/flake.nix index c0e87e8..3070bb6 100644 --- a/common/flake.nix +++ b/common/flake.nix @@ -5,7 +5,8 @@ ragenix.url = "github:yaxitech/ragenix"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; - hyprland.url = "github:hyprwm/Hyprland"; + # disabled for now + # hyprland.url = "github:hyprwm/Hyprland"; }; outputs = @@ -13,7 +14,7 @@ home-manager, ragenix, nix-flatpak, - hyprland, + # hyprland, ... }: { @@ -30,7 +31,7 @@ home-manager.nixosModules.default ragenix.nixosModules.age nix-flatpak.nixosModules.nix-flatpak - hyprland.nixosModules.default + # hyprland.nixosModules.default ./_home_manager ./options.nix ./general @@ -48,11 +49,12 @@ # }) ]; _module.args = { - inherit ragenix hyprland; - hyprlandPkgs = import hyprland.inputs.nixpkgs { - system = pkgs.stdenv.hostPlatform.system; - config = config.nixpkgs.config or { }; - }; + inherit ragenix; + # inherit hyprland; + # hyprlandPkgs = import hyprland.inputs.nixpkgs { + # system = pkgs.stdenv.hostPlatform.system; + # config = config.nixpkgs.config or { }; + # }; }; }; }; @@ -61,7 +63,7 @@ }; }; homeManagerModules = { - hyprland = hyprland.homeManagerModules.default; + # hyprland = hyprland.homeManagerModules.default; zsh = import ./_home_manager/mods/zsh.nix; tmux = import ./_home_manager/mods/tmux/tmux.nix; diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index c8870ef..dc4f61e 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -9,7 +9,7 @@ "ragenix", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1736955230, @@ -25,47 +25,9 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "common", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "common", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1755946532, - "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "common": { "inputs": { "home-manager": "home-manager", - "hyprland": "hyprland", "nix-flatpak": "nix-flatpak", "ragenix": "ragenix" }, @@ -118,25 +80,9 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -152,29 +98,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "common", - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs" @@ -217,287 +140,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "common", - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "common", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1755678602, - "narHash": "sha256-uEC5O/NIUNs1zmc1aH1+G3GRACbODjk2iS0ET5hXtuk=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "157cc52065a104fc3b8fa542ae648b992421d1c7", - "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_2", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1756498600, - "narHash": "sha256-09FSU9GTVyDlTcXjsjzumfUkIJUwht1DESNh41kufdc=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "ea42041f936d5810c5cfa45d6bece12dde2fd9b6", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "common", - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "common", - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "common", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "common", - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1753819801, - "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "common", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1753622892, - "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1756117388, - "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nix-flatpak": { "locked": { "lastModified": 1739444422, @@ -547,22 +189,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -578,7 +204,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1755471983, "narHash": "sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg=", @@ -594,7 +220,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1755648324, "narHash": "sha256-+2TxwJEXWXGC7JBsRGUHtmQ66lRGPcDI2kFKTTU5e2s=", @@ -1489,36 +1115,12 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1755960406, - "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "ragenix": { "inputs": { "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -1538,14 +1140,14 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1662,16 +1264,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1689,68 +1291,6 @@ "repo": "default", "type": "github" } - }, - "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" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "common", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "common", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "common", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "common", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "common", - "hyprland", - "nixpkgs" - ], - "systems": [ - "common", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1755354946, - "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 2432eae..22a142a 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -6,7 +6,6 @@ # Use relative to get current version for testing common.url = "path:../../common"; # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; - common.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; @@ -40,7 +39,7 @@ ./hardware-configuration.nix (import ./containers.nix { inherit inputs; }) # ./jails_text.nix - ./hyprland_customizations.nix + # ./hyprland_customizations.nix ./sway_customizations.nix ( {