From f77555e18fb06010118d0576aff10acc39242452 Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Sat, 12 Apr 2025 19:53:02 -0400 Subject: updated zen (broken policies for now) and hyprland --- home-config/nix-home-manager/flake.lock | 109 ++++++++++++++++++++------------ home-config/nix-home-manager/flake.nix | 16 +++-- home-config/nix-home-manager/home.nix | 33 +++------- 3 files changed, 86 insertions(+), 72 deletions(-) (limited to 'home-config/nix-home-manager') diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock index 842043e..0b9b192 100644 --- a/home-config/nix-home-manager/flake.lock +++ b/home-config/nix-home-manager/flake.lock @@ -103,7 +103,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -163,17 +163,17 @@ ] }, "locked": { - "lastModified": 1742996658, - "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=", + "lastModified": 1743639371, + "narHash": "sha256-eywYn8ayhVUzFFvIiAIIHn+00Irmhyjqe2cNdyPCLNE=", "owner": "nix-community", "repo": "home-manager", - "rev": "693840c01b9bef9e54100239cef937e53d4661bf", + "rev": "579a71b948533667c6c65e603f18990bdffc8530", "type": "github" }, "original": { "owner": "nix-community", "repo": "home-manager", - "rev": "693840c01b9bef9e54100239cef937e53d4661bf", + "rev": "579a71b948533667c6c65e603f18990bdffc8530", "type": "github" } }, @@ -188,17 +188,17 @@ ] }, "locked": { - "lastModified": 1743278085, - "narHash": "sha256-tbFdT9irSXfM1hPaLIW6uBLy65JbI7kQ7jP0Puo3alM=", + "lastModified": 1744109570, + "narHash": "sha256-wYBn/AETdeQH866IWvNgNt7YrUeLxjhUSWnJzl3+zLM=", "owner": "VirtCode", "repo": "hypr-dynamic-cursors", - "rev": "fecc7b9b828d5b58e58d395c6544ed16b180008f", + "rev": "07a9ca62466edf58a251a3d9d1470f8d502ffee0", "type": "github" }, "original": { "owner": "VirtCode", "repo": "hypr-dynamic-cursors", - "rev": "fecc7b9b828d5b58e58d395c6544ed16b180008f", + "rev": "07a9ca62466edf58a251a3d9d1470f8d502ffee0", "type": "github" } }, @@ -303,21 +303,21 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1743517238, - "narHash": "sha256-yJaShaC/XQL4bevEB4KmvUav2fns8Ugh+UmB06AYOXE=", + "lastModified": 1744324490, + "narHash": "sha256-NddZqhX+75btNvcxhZD0AVXuAAM4Lnip2c+yrQThSVU=", "owner": "hyprwm", "repo": "hyprland", - "rev": "1f0fd79b910b798e650d6f0c546273bc83422526", + "rev": "382f0f23f144e11bdccac6c5d3c1ed415b4b1855", "type": "github" }, "original": { "owner": "hyprwm", "repo": "hyprland", - "rev": "1f0fd79b910b798e650d6f0c546273bc83422526", + "rev": "382f0f23f144e11bdccac6c5d3c1ed415b4b1855", "type": "github" } }, @@ -481,7 +481,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1743294814, @@ -505,7 +505,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1737635601, @@ -524,25 +524,20 @@ }, "hyprutils": { "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] + "nixpkgs": "nixpkgs", + "systems": "systems" }, "locked": { - "lastModified": 1741534688, - "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", + "lastModified": 1743950287, + "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", + "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", "type": "github" }, "original": { "owner": "hyprwm", + "ref": "v0.6.0", "repo": "hyprutils", "type": "github" } @@ -756,17 +751,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", - "owner": "nixos", + "lastModified": 1744232761, + "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" } }, @@ -785,6 +780,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -818,7 +829,7 @@ "hyprpicker-git": "hyprpicker-git", "mozff": "mozff", "nixgl": "nixgl", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "wpaperd": "wpaperd", "zen-browser": "zen-browser" } @@ -890,6 +901,21 @@ } }, "systems_4": { + "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" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -904,7 +930,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -925,7 +951,7 @@ "nixpkgs" ], "rust-overlay": "rust-overlay", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1734445299, @@ -985,22 +1011,25 @@ }, "zen-browser": { "inputs": { + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1743216975, - "narHash": "sha256-29xgm8F3DCcTNrQZ9V3Pwj6BkjalkKvGyjd+sF9/+3k=", + "lastModified": 1744280439, + "narHash": "sha256-oiLN1kt71v19w5/4muZhXf9SGb7mkMjvLAi7wJQA2ms=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "165ee672e6b17a8bcc0a3fb51fab3f79715cc1f3", + "rev": "5667f0661aa52587f1f86ed7206ddf87327616a9", "type": "github" }, "original": { "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "165ee672e6b17a8bcc0a3fb51fab3f79715cc1f3", + "rev": "5667f0661aa52587f1f86ed7206ddf87327616a9", "type": "github" } } diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix index 096ec4b..5b87cdd 100644 --- a/home-config/nix-home-manager/flake.nix +++ b/home-config/nix-home-manager/flake.nix @@ -3,9 +3,9 @@ inputs = { # Specify the source of Home Manager and Nixpkgs. - nixpkgs.url = "github:nixos/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc"; + nixpkgs.url = "github:nixos/nixpkgs/2c8d3f48d33929642c1c12cd243df4cc7d2ce434"; home-manager = { - url = "github:nix-community/home-manager/693840c01b9bef9e54100239cef937e53d4661bf"; + url = "github:nix-community/home-manager/579a71b948533667c6c65e603f18990bdffc8530"; inputs.nixpkgs.follows = "nixpkgs"; }; hyprlock = { @@ -17,8 +17,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprland = { - url = "github:hyprwm/hyprland/1f0fd79b910b798e650d6f0c546273bc83422526"; + url = "github:hyprwm/hyprland/382f0f23f144e11bdccac6c5d3c1ed415b4b1855"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.hyprutils.url = "github:hyprwm/hyprutils/v0.6.0"; }; nixgl = { url = "github:ryan77627/nixGL/3865170cbc23b32ec7cc8df1ec811fd44b6c2a58"; @@ -37,13 +38,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hypr-dynamic-cursors = { - url = "github:VirtCode/hypr-dynamic-cursors/fecc7b9b828d5b58e58d395c6544ed16b180008f"; + url = "github:VirtCode/hypr-dynamic-cursors/07a9ca62466edf58a251a3d9d1470f8d502ffee0"; inputs.hyprland.follows = "hyprland"; inputs.nixpkgs.follows = "hyprland/nixpkgs"; }; zen-browser = { - url = "github:0xc000022070/zen-browser-flake/165ee672e6b17a8bcc0a3fb51fab3f79715cc1f3"; + url = "github:0xc000022070/zen-browser-flake/5667f0661aa52587f1f86ed7206ddf87327616a9"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; }; }; @@ -52,7 +54,7 @@ system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; overlays = [ - #nixgl.overlay + #zen-browser.homeModules ]; in { homeConfigurations."ryan" = home-manager.lib.homeManagerConfiguration { @@ -63,6 +65,7 @@ modules = [ {nixpkgs.overlays = overlays;} ./home.nix + zen-browser.homeModules.beta { _module.args = { inherit hyprland; @@ -73,7 +76,6 @@ inherit mozff; inherit clipboard-sync; inherit hypr-dynamic-cursors; - inherit zen-browser; }; } ]; diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 4c2c5f7..06096de 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -1,24 +1,4 @@ -{ config, pkgs, hyprland, nixgl, wpaperd, hyprpicker-git, hyprlock, mozff, clipboard-sync, hypr-dynamic-cursors, zen-browser, ... }: -let - # THIS IS NOT PERFECT AT ALL YET!!! Gets the basics done (my important - # policies regarding accounts and extensions. Does not set up profile - # stuff, like search. Most importantly, it DOES NOT add system CAs. - # To do that, run: - # `certutil -A -n "name" -t "CT,c" -i ./path/to/cert -d ~/.zen/profile-folder` - # I do this for my root and intermediate. BEWARE WHEN INSTALLING NEW - # SYSTEMS!!!! - ffPolicies = import ./zenPolicies.nix; - customZen = zen-browser.packages.${pkgs.system}.default.overrideAttrs (old: { - installPhase = old.installPhase + '' - rm -f $out/lib/zen-${old.version}/distribution/policies.json - rm -rf $out/lib - mkdir $out/opt/zen/distribution - ln -s ${pkgs.writeText "firefox-policies.json" (builtins.toJSON ffPolicies)} \ - "$out/opt/zen/distribution/policies.json" - ''; - }); - -in +{ config, pkgs, hyprland, nixgl, wpaperd, hyprpicker-git, hyprlock, mozff, clipboard-sync, hypr-dynamic-cursors, home-manager, ... }: { imports = [ @@ -78,13 +58,18 @@ in }; }; + programs.zen-browser = { + enable = true; + policies = import ./zenPolicies.nix; + }; + # The home.packages option allows you to install Nix packages into your # environment. home.packages = with pkgs; [ # # Adds the 'hello' command to your environment. It prints a friendly # # "Hello, world!" when run. # pkgs.hello - nix # Used to keep nix up to date when I don't update the guix package + # nix # Used to keep nix up to date when I don't update the guix package yt-dlp #pass rustup @@ -115,14 +100,12 @@ in starship taskwarrior3 delta + pyprland #(flameshot.override { enableWlrSupport = true; }) # Here until i can fix firefox's stupid devtools issue chromium - # Maybe will work? - customZen - # Wrapped programs for some env variables (pkgs.writeScriptBin "hyprlock" '' #! ${pkgs.bash}/bin/bash -- cgit v1.2.3