diff --git a/flake.lock b/flake.lock index 7482dc6..984dd1c 100644 --- a/flake.lock +++ b/flake.lock @@ -281,35 +281,6 @@ "type": "github" } }, - "hyprland-plugins": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nixpkgs": [ - "hyprland-plugins", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1771865848, - "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", - "owner": "hyprwm", - "repo": "hyprland-plugins", - "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-plugins", - "type": "github" - } - }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -712,7 +683,6 @@ "fred": "fred", "home-manager": "home-manager", "hyprland": "hyprland", - "hyprland-plugins": "hyprland-plugins", "hyprpwcenter": "hyprpwcenter", "nixpkgs": "nixpkgs_2", "quickshell": [ diff --git a/flake.nix b/flake.nix index 71fe500..d35b690 100644 --- a/flake.nix +++ b/flake.nix @@ -25,11 +25,6 @@ url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland"; - inputs.systems.follows = "hyprland/systems"; - }; hyprpwcenter = { url = "github:hyprwm/hyprpwcenter"; inputs.hyprgraphics.follows = "hyprland/hyprgraphics"; @@ -57,20 +52,12 @@ hyprland = inputs.hyprland.packages.${system}.hyprland; hyprsysteminfo = inputs.hyprsysteminfo.packages.${system}.hyprsysteminfo; hyprpwcenter = inputs.hyprpwcenter.packages.${system}.hyprpwcenter; - hyprPluginPkgs = inputs.hyprland-plugins.packages.${system}; quickshell = inputs.quickshell.packages.${system}.quickshell; xdg-desktop-portal-hyprland = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland; }) ]; }; - hypr-plugin-dir = pkgs.symlinkJoin { - name = "hyprland-plugins"; - paths = with pkgs.hyprPluginPkgs; [ - hyprexpo - ]; - }; - defaultCfg = rec { username = "liamm"; homeDirectory = "/home/${username}"; @@ -81,7 +68,7 @@ { nixosConfigurations = { darp8 = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; cfg = defaultCfg; hypr-plugin-dir = hypr-plugin-dir; }; + specialArgs = { inherit inputs; cfg = defaultCfg; }; modules = [ hyprland.nixosModules.default ./hosts/darp8/configuration.nix @@ -89,7 +76,7 @@ ]; }; desktop = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; cfg = defaultCfg; hypr-plugin-dir = hypr-plugin-dir; }; + specialArgs = { inherit inputs; cfg = defaultCfg; }; modules = [ hyprland.nixosModules.default ./hosts/desktop/configuration.nix diff --git a/hosts/graphical/configuration.nix b/hosts/graphical/configuration.nix index 18df912..d981c04 100644 --- a/hosts/graphical/configuration.nix +++ b/hosts/graphical/configuration.nix @@ -1,4 +1,4 @@ -{ cfg, config, lib, pkgs, inputs, hypr-plugin-dir, ... }: +{ cfg, config, lib, pkgs, inputs, ... }: { imports = [ inputs.dms.nixosModules.greeter @@ -202,9 +202,7 @@ zip ]; - environment.sessionVariables = { - HYPR_PLUGIN_DIR = hypr-plugin-dir; - }; + environment.sessionVariables = {}; zramSwap = { enable = true;