From a4b5f5994ed65cdbaa480aeb3ba51920ac9ef55e Mon Sep 17 00:00:00 2001 From: Nydragon Date: Mon, 23 Dec 2024 21:12:46 +0100 Subject: [PATCH] chore: clean programs, remove hyprlock --- flake.lock | 158 ++--------------------------- flake.nix | 10 +- home/graphical/firefox/default.nix | 2 +- hosts/marr/home.nix | 4 +- modules/nix/overlays.nix | 2 - 5 files changed, 14 insertions(+), 162 deletions(-) diff --git a/flake.lock b/flake.lock index 33438a8..f05ce9a 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,9 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager", + "home-manager": [ + "home-manager" + ], "nixpkgs": "nixpkgs", "systems": "systems" }, @@ -84,27 +86,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -124,113 +105,6 @@ "type": "github" } }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprlock", - "hyprutils" - ], - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1733248371, - "narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprlock", - "hyprutils" - ], - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlock": { - "inputs": { - "hyprgraphics": "hyprgraphics", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1733672536, - "narHash": "sha256-bCtJwEmKG114e0y5GDj5fZ24KkgVVunbN9xgCjQa1OQ=", - "owner": "hyprwm", - "repo": "hyprlock", - "rev": "8010b81e7b4100a1f2ef937be5268a13c27987e9", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlock", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1733502241, - "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "104117aed6dd68561be38b50f218190aa47f2cd8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, "naersk": { "inputs": { "nixpkgs": "nixpkgs_3" @@ -317,11 +191,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1734786551, - "narHash": "sha256-AlipP5iSDGUb/OBDLz2NPhaDN1znohVxFgZbcXJc1Iw=", + "lastModified": 1734976403, + "narHash": "sha256-6xkAUq6PRkQ6KCheVaGDaF47DowJznk6vrhRr8JIVso=", "ref": "refs/heads/main", - "rev": "4566e0d4495f5a2ebab266aefc9893478e1baf3d", - "revCount": 98, + "rev": "20d66304f87cd829c01e0842bb26fb593ab35a9d", + "revCount": 100, "type": "git", "url": "https://git.ccnlc.eu/nydragon/nysh.git" }, @@ -356,8 +230,7 @@ "agenix": "agenix", "disko": "disko", "flake-parts": "flake-parts", - "home-manager": "home-manager_2", - "hyprlock": "hyprlock", + "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nysh": "nysh", @@ -416,21 +289,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "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" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4d0e7a8..5b9e473 100644 --- a/flake.nix +++ b/flake.nix @@ -21,18 +21,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - agenix.url = "github:ryantm/agenix"; + agenix = { + url = "github:ryantm/agenix"; + inputs.home-manager.follows = "home-manager"; + }; nysh = { url = "git+https://git.ccnlc.eu/nydragon/nysh.git"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprlock = { - url = "github:hyprwm/hyprlock"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - rustypaste = { url = "git+https://git.ccnlc.eu/Nydragon/flakey-rustypaste.git"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/graphical/firefox/default.nix b/home/graphical/firefox/default.nix index f412c88..96edd1e 100644 --- a/home/graphical/firefox/default.nix +++ b/home/graphical/firefox/default.nix @@ -77,7 +77,7 @@ lib.mkIf osConfig.programs.firefox.enable { } #sidebar-box:hover > #sidebar { min-width: var(--sidebar-hovered-width) !important; - transition-delay: 20ms !important; + transition-delay: 100ms !important; } ''; search = { diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix index 1064a63..549d428 100644 --- a/hosts/marr/home.nix +++ b/hosts/marr/home.nix @@ -31,8 +31,6 @@ nix-direnv.enable = true; }; beets.enable = true; - waybar.enable = true; - rofi.enable = true; vscode.enable = true; ssh.enable = true; }; @@ -43,8 +41,8 @@ }; home = { - stateVersion = config.system.stateVersion; inherit username; + stateVersion = config.system.stateVersion; packages = with pkgs; [ digikam diff --git a/modules/nix/overlays.nix b/modules/nix/overlays.nix index 0858431..1208097 100644 --- a/modules/nix/overlays.nix +++ b/modules/nix/overlays.nix @@ -29,8 +29,6 @@ }; nysh = inputs'.nysh.packages.nysh; - - hyprlock = inputs'.hyprlock.packages.hyprlock; }) inputs.rustypaste.overlays.default ];