From bdb08351ce1afc15264658bcbb6ec03144874759 Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Mon, 28 Oct 2024 23:57:03 -0400 Subject: [PATCH] Changed firefox to nightly bin overlay. Flake will be impure for the time being while I try sidebar tabs... :/ --- home-config/nix-home-manager/flake.lock | 244 +++++++----------------- home-config/nix-home-manager/flake.nix | 11 +- home-config/nix-home-manager/home.nix | 2 +- 3 files changed, 73 insertions(+), 184 deletions(-) diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock index d350b50..b6d3733 100644 --- a/home-config/nix-home-manager/flake.lock +++ b/home-config/nix-home-manager/flake.lock @@ -2,10 +2,22 @@ "nodes": { "aquamarine": { "inputs": { - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", - "systems": "systems" + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] }, "locked": { "lastModified": 1729527199, @@ -21,22 +33,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -52,28 +48,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "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": [ @@ -130,26 +104,25 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1729553322, - "narHash": "sha256-CjdhWsojvgZEr2t8eK6HaaWmLxirnaEckeXt/kveQNs=", + "lastModified": 1728478479, + "narHash": "sha256-AbfdIlK92oWpI39xlIaUekPeL9u95sXzxVsSqhIMfIc=", "owner": "hyprwm", "repo": "hyprland", - "rev": "5e96d738e698f22969ca502d042d5751711c6d8a", + "rev": "4520b30d498daca8079365bdb909a8dea38e8d55", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "main", + "ref": "v0.44.1", "repo": "hyprland", "type": "github" } @@ -179,6 +152,33 @@ "type": "github" } }, + "hyprland-protocols_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "xdph", + "nixpkgs" + ], + "systems": [ + "hyprland", + "xdph", + "systems" + ] + }, + "locked": { + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -210,12 +210,12 @@ }, "hyprpicker-git": { "inputs": { - "hyprutils": "hyprutils_3", - "hyprwayland-scanner": "hyprwayland-scanner_3", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1727705155, @@ -236,12 +236,10 @@ "inputs": { "nixpkgs": [ "hyprland", - "aquamarine", "nixpkgs" ], "systems": [ "hyprland", - "aquamarine", "systems" ] }, @@ -260,31 +258,6 @@ } }, "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprpicker-git", @@ -313,12 +286,10 @@ "inputs": { "nixpkgs": [ "hyprland", - "aquamarine", "nixpkgs" ], "systems": [ "hyprland", - "aquamarine", "systems" ] }, @@ -339,11 +310,11 @@ "hyprwayland-scanner_2": { "inputs": { "nixpkgs": [ - "hyprland", + "hyprpicker-git", "nixpkgs" ], "systems": [ - "hyprland", + "hyprpicker-git", "systems" ] }, @@ -361,28 +332,18 @@ "type": "github" } }, - "hyprwayland-scanner_3": { - "inputs": { - "nixpkgs": [ - "hyprpicker-git", - "nixpkgs" - ], - "systems": [ - "hyprpicker-git", - "systems" - ] - }, + "mozff": { "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "lastModified": 1704373101, + "narHash": "sha256-+gi59LRWRQmwROrmE1E2b3mtocwueCQqZ60CwLG+gbg=", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "rev": "9b11a87c0cc54e308fa83aac5b4ee1816d5418a2", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", "type": "github" } }, @@ -409,38 +370,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1729168305, "narHash": "sha256-jmhxZnrlOyLEMUL2+JkVfkN0XWXI5uE6EB5kVZFR0fo=", @@ -456,37 +385,14 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", "hyprpicker-git": "hyprpicker-git", + "mozff": "mozff", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } }, "systems": { @@ -519,27 +425,9 @@ "type": "github" } }, - "systems_3": { - "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" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols_2", "hyprlang": [ "hyprland", "hyprlang" diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix index 419cf50..becb34f 100644 --- a/home-config/nix-home-manager/flake.nix +++ b/home-config/nix-home-manager/flake.nix @@ -13,23 +13,24 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprland = { - url = "github:hyprwm/hyprland/main"; + url = "github:hyprwm/hyprland/v0.44.1"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.aquamarine.url = "github:hyprwm/aquamarine/main"; }; nixgl = { url = "github:nix-community/nixGL/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a"; inputs.nixpkgs.follows = "nixpkgs"; }; + mozff.url = "github:mozilla/nixpkgs-mozilla"; }; - outputs = { nixpkgs, home-manager, hyprpicker-git, hyprland, nixgl, ... }@inputs: + outputs = { nixpkgs, home-manager, hyprpicker-git, hyprland, nixgl, mozff, ... }@inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; overlays = [ hyprpicker-git.overlays.default nixgl.overlay + mozff.overlays.firefox ]; in { homeConfigurations."ryan" = home-manager.lib.homeManagerConfiguration { @@ -38,8 +39,8 @@ # Specify your home configuration modules here, for example, # the path to your home.nix. modules = [ - ./home.nix {nixpkgs.overlays = overlays;} + ./home.nix { _module.args = { inherit hyprland; @@ -50,7 +51,7 @@ # Optionally use extraSpecialArgs # to pass through arguments to home.nix - #extraSpecialArgs = { inherit inputs; }; + # extraSpecialArgs = { inherit overlays; }; }; }; } diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 031e76a..65afdd3 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -58,7 +58,7 @@ libvdpau wpaperd hypridle - firefox + latest.firefox-nightly-bin eza # Wrapped programs for some env variables