From fe03115ead20db387da8c2c6f1a17fa3145f927b Mon Sep 17 00:00:00 2001 From: Kristian Krsnik Date: Fri, 25 Aug 2023 15:48:30 +0200 Subject: [PATCH] removed hyprland --- flake.lock | 123 +++++------------------------------------------------ flake.nix | 17 +++----- 2 files changed, 15 insertions(+), 125 deletions(-) diff --git a/flake.lock b/flake.lock index 057fcff..68f2755 100644 --- a/flake.lock +++ b/flake.lock @@ -105,60 +105,18 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1690047096, - "narHash": "sha256-VvZqoWLscSlRonCGq+OdIgA9GkZJJ/Z4yyoXn7m8kjY=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "b21644b61143de0835fef9c3fa69fbdd2553cdfa", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1684265364, - "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1688500189, - "narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=", - "owner": "NixOS", + "lastModified": 1689956312, + "narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "78419edadf0fabbe5618643bd850b2f2198ed060", + "rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -212,22 +170,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1689956312, - "narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1675309347, "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=", @@ -243,7 +185,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1689088367, "narHash": "sha256-Y2tl2TlKCWEHrOeM9ivjCLlRAKH3qoPUE/emhZECU14=", @@ -305,8 +247,7 @@ "root": { "inputs": { "home-manager": "home-manager", - "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", @@ -317,7 +258,7 @@ "wallpaper": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -334,55 +275,11 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1689611045, - "narHash": "sha256-3RTOlQabkNetQ4O4UzSf57JPco9VGVHhSU1ls5uKBeE=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e", - "type": "gitlab" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1685385764, - "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "zig": { "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1689899128, diff --git a/flake.nix b/flake.nix index 8ed6f4a..d3dadd4 100644 --- a/flake.nix +++ b/flake.nix @@ -10,9 +10,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Hyprland Window Manager - hyprland.url = "github:hyprwm/Hyprland"; - # Nix User Repository nur.url = "github:nix-community/NUR"; @@ -29,11 +26,10 @@ nixpkgs-unstable, nixpkgs-master, home-manager, - hyprland, nur, zig, wallpaper, - } @ inputs: let + }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; in { @@ -49,23 +45,20 @@ _module.args.wallpaper = wallpaper.packages.${system}.default; } - hyprland.homeManagerModules.default - nur.nixosModules.nur { nixpkgs.overlays = [ - hyprland.overlays.default # Adds waybar-hyprland zig.overlays.default # Adds zig ( # https://github.com/nix-community/home-manager/issues/1538#issuecomment-706627100 final: prev: { - unstable = import inputs.nixpkgs-unstable { + unstable = import nixpkgs-unstable { system = final.system; - config = {allowUnfreePredicate = _: true;}; + config.allowUnfreePredicate = _: true; }; - master = import inputs.nixpkgs-master { + master = import nixpkgs-master { system = final.system; - config = {allowUnfreePredicate = (_: true);}; + config.allowUnfreePredicate = _: true; }; } )