chore: unpin _7zz from master

fix: disable stylix for swaync
flake.lock: Update
2024-11-24 17:53:51 -08:00 · 2024-11-10 20:40:13 -08:00 · 2024-11-10 20:39:37 -08:00 · 2024-11-10 20:37:19 -08:00 · 2024-11-10 20:36:47 -08:00 · 2024-11-10 20:36:09 -08:00
8 changed files with 144 additions and 54 deletions
--- a/flake.lock
+++ b/flake.lock
@ -106,11 +106,11 @@
    },
    "bleedingpkgs": {
      "locked": {
-        "lastModified": 1730781761,
-        "narHash": "sha256-/0gVcFiZaQAROSySTXXblCzGZc6ZvQQzLpxuF40AoJ0=",
+        "lastModified": 1731295903,
+        "narHash": "sha256-9T4S/rndz6zD9suTtJMBnAbIDMb1Kkqi6IERvYngaTA=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "aa689c679c90ea9a84c99cfb1ef5a7ab4ddbbf9b",
+        "rev": "e635cf8d9fb548dd4190988696621180a3114601",
        "type": "github"
      },
      "original": {
@ -324,6 +324,24 @@
        "type": "github"
      }
    },
+    "flake-parts_4": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_3"
+      },
+      "locked": {
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
@ -494,11 +512,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730633670,
-        "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
+        "lastModified": 1731235328,
+        "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
+        "rev": "60bb110917844d354f3c18e05450606a435d2d10",
        "type": "github"
      },
      "original": {
@ -531,11 +549,11 @@
    "homebrew-cask": {
      "flake": false,
      "locked": {
-        "lastModified": 1730704640,
-        "narHash": "sha256-Xp6uQdt80HeW76ROtm03gpUYbKuH2exvH1nSTB9Roug=",
+        "lastModified": 1731298349,
+        "narHash": "sha256-ty2AUv6YTmFU0JISG6crCozMiTE6Xk/xO10n2LLP15Q=",
        "owner": "homebrew",
        "repo": "homebrew-cask",
-        "rev": "6f41db5aa7c094c2110636424a36479720a9bc8f",
+        "rev": "4d8bfd8aa018fce108a94edb6cfc6613e5496180",
        "type": "github"
      },
      "original": {
@ -547,11 +565,11 @@
    "homebrew-core": {
      "flake": false,
      "locked": {
-        "lastModified": 1730704733,
-        "narHash": "sha256-n3wuR4SrSh/5v0NkDMFIRayUC65xCs9ZsdA7917etWQ=",
+        "lastModified": 1731297151,
+        "narHash": "sha256-Vh3aAXZcWhqWSt71ljsQO6uEni4KXC+v7jYJQKu7SQY=",
        "owner": "homebrew",
        "repo": "homebrew-core",
-        "rev": "7c518d7624b76c30cf8d82e7f929bdb75ab09d23",
+        "rev": "657ccb0474732c9fae87685393775f9bab87928c",
        "type": "github"
      },
      "original": {
@ -629,11 +647,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730698801,
-        "narHash": "sha256-sq68bCmk4tCXSt5CoRNimfigIZSLJSpNi/gjFtNLjRE=",
+        "lastModified": 1731153869,
+        "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "189d2d422c773fa065cc9c72e6806f007ebb9be0",
+        "rev": "5c74ab862c8070cbf6400128a1b56abb213656da",
        "type": "github"
      },
      "original": {
@ -690,11 +708,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730604744,
-        "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=",
+        "lastModified": 1731209121,
+        "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318",
+        "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3",
        "type": "github"
      },
      "original": {
@ -755,6 +773,18 @@
        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
      }
    },
+    "nixpkgs-lib_3": {
+      "locked": {
+        "lastModified": 1730504152,
+        "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+      }
+    },
    "nixpkgs-stable": {
      "locked": {
        "lastModified": 1710695816,
@ -773,11 +803,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1730531603,
-        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
+        "lastModified": 1731139594,
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
        "type": "github"
      },
      "original": {
@ -803,6 +833,22 @@
        "type": "github"
      }
    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1731139594,
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "plugins-lsp-progress": {
      "flake": false,
      "locked": {
@ -882,7 +928,8 @@
        "vesktop-bin": "vesktop-bin",
        "viminal": "viminal",
        "wallpapers": "wallpapers",
-        "zen-browser": "zen-browser"
+        "zen-browser": "zen-browser",
+        "zen-browser-source": "zen-browser-source"
      }
    },
    "rust-analyzer-src": {
@ -951,11 +998,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730693770,
-        "narHash": "sha256-jepwWtXntoBDQGJ/d7Myc9SFsYT6DwTqjAZJFGC2Akc=",
+        "lastModified": 1731298576,
+        "narHash": "sha256-l2m0LcSohbU7FXhdlJC/jbxt9PEvFfIcdEXQdSzbvL4=",
        "owner": "Gerg-L",
        "repo": "spicetify-nix",
-        "rev": "2d871e2a5fb8c9d8d04a3bdd8f206aec81df2d6d",
+        "rev": "c503d1e7521af93013b6253a5f4899ea62a3c5a3",
        "type": "github"
      },
      "original": {
@ -981,11 +1028,11 @@
        "tinted-tmux": "tinted-tmux"
      },
      "locked": {
-        "lastModified": 1729963473,
-        "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
+        "lastModified": 1731090365,
+        "narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b",
+        "rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68",
        "type": "github"
      },
      "original": {
@ -1072,16 +1119,17 @@
    "tinted-foot": {
      "flake": false,
      "locked": {
-        "lastModified": 1696725948,
-        "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
+        "lastModified": 1726913040,
+        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
        "owner": "tinted-theming",
        "repo": "tinted-foot",
-        "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
        "type": "github"
      },
      "original": {
        "owner": "tinted-theming",
        "repo": "tinted-foot",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
        "type": "github"
      }
    },
@ -1186,11 +1234,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730231756,
-        "narHash": "sha256-x9NUlceUFCKg5sc+MaAQtDXl5413HX5N3aU8Zdwu/HU=",
+        "lastModified": 1730925960,
+        "narHash": "sha256-S5zn2So/kwgZcW+2ICsXS1E+yJPBAFx1fQXyC2DfIZM=",
        "owner": "youwen5",
        "repo": "zen-browser-flake",
-        "rev": "3a15e3f2c835f95ae211a8a973a1e30994880fcc",
+        "rev": "29ef2755b4ba40f3c0c00cf89b7a8c9c62b977b2",
        "type": "github"
      },
      "original": {
@ -1198,6 +1246,25 @@
        "repo": "zen-browser-flake",
        "type": "github"
      }
+    },
+    "zen-browser-source": {
+      "inputs": {
+        "flake-parts": "flake-parts_4",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1731292739,
+        "narHash": "sha256-c0ED1Yu1AamD3RXsH1kLvvP8gdhGp/HB8AJfzJw7Ph0=",
+        "owner": "youwen5",
+        "repo": "zen-browser-source-flake",
+        "rev": "dc72f9d9456cd732ad9eb78f8e3d676aa807d554",
+        "type": "github"
+      },
+      "original": {
+        "owner": "youwen5",
+        "repo": "zen-browser-source-flake",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -86,6 +86,8 @@
      url = "github:youwen5/zen-browser-flake";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+
+    zen-browser-source.url = "github:youwen5/zen-browser-source-flake";
  };

  outputs =
--- a/modules/linux/core/default.nix
+++ b/modules/linux/core/default.nix
@ -25,10 +25,6 @@
  services.gnome.gnome-keyring.enable = true;

  nix = {
-    settings.experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
    optimise.automatic = true;
    # gc = {
    #   automatic = true;
@ -40,6 +36,21 @@
      min-free = ${toString (100 * 1024 * 1024)}
      max-free = ${toString (1024 * 1024 * 1024)}
    '';
+
+    settings = {
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+      substituters = [
+        "https://cache.nixos.org"
+        "https://zen-browser.cachix.org"
+      ];
+      trusted-public-keys = [
+        "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
+        "zen-browser.cachix.org-1:z/QLGrEkiBYF/7zoHX1Hpuv0B26QrmbVBSy9yDD2tSs="
+      ];
+    };
  };

  programs.nh = {
--- a/overlays/default.nix
+++ b/overlays/default.nix
@ -4,14 +4,21 @@
  ...
 }:
 let
-  bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
+  # bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
+  inherit (pkgs) system;
 in
 # stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
 # nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
 {
  nixpkgs.overlays = [
    (self: super: {
-      _7zz = bleedingpkgs._7zz;
+      zen-browser =
+        if system == "x86_64-linux" then
+          inputs.zen-browser.packages.${system}.default
+        else if system == "aarch64-linux" then
+          inputs.zen-browser-source.packages.${system}.default
+        else
+          null;
    })
  ];
 }
--- a/users/youwen/linux/packages/aarch-64/default.nix
+++ b/users/youwen/linux/packages/aarch-64/default.nix
@ -1,8 +1,11 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 let
  createCommon = import ../common-packages.nix;
 in
 {
-  home.packages = (createCommon pkgs) ++ (with pkgs; [ ]);
+  home.packages =
+    (createCommon pkgs)
+    ++ [
+    ];

 }
--- a/users/youwen/linux/packages/common-packages.nix
+++ b/users/youwen/linux/packages/common-packages.nix
@ -39,4 +39,6 @@ pkgs: with pkgs; [
  gcc

  hledger
+
+  zen-browser
 ]
--- a/users/youwen/linux/packages/x86_64/default.nix
+++ b/users/youwen/linux/packages/x86_64/default.nix
@ -10,18 +10,14 @@ in
 {
  home.packages =
    (createCommon pkgs)
-    ++ (
-      with pkgs;
-      [
+    ++ (with pkgs; [
      bitwarden-desktop
      modrinth-app
      lutris
      sbctl
      r2modman
      zoom-us
-      ]
-      ++ [ zen-browser ]
-    );
+    ]);

  home.sessionVariables = {
    DEFAULT_BROWSER = "${zen-browser}/bin/zen";
--- a/users/youwen/linux/theming/stylix.nix
+++ b/users/youwen/linux/theming/stylix.nix
@ -4,5 +4,7 @@
    kitty.variant256Colors = true;
    neovim.enable = false;
    kde.enable = true;
+    gnome.enable = true;
+    swaync.enable = false;
  };
 }
Author	SHA1	Message	Date
Youwen Wu	19bc2ec468	chore: unpin _7zz from master	2024-11-10 20:40:13 -08:00
Youwen Wu	467d826432	fix: disable stylix for swaync	2024-11-10 20:39:37 -08:00
Youwen Wu	58496981c5	flake.lock: Update Flake lock file updates: • Updated input 'bleedingpkgs': 'github:nixos/nixpkgs/aa689c679c90ea9a84c99cfb1ef5a7ab4ddbbf9b' (2024-11-05) → 'github:nixos/nixpkgs/e635cf8d9fb548dd4190988696621180a3114601' (2024-11-11) • Updated input 'home-manager': 'github:nix-community/home-manager/8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661' (2024-11-03) → 'github:nix-community/home-manager/60bb110917844d354f3c18e05450606a435d2d10' (2024-11-10) • Updated input 'homebrew-cask': 'github:homebrew/homebrew-cask/6f41db5aa7c094c2110636424a36479720a9bc8f' (2024-11-04) → 'github:homebrew/homebrew-cask/4d8bfd8aa018fce108a94edb6cfc6613e5496180' (2024-11-11) • Updated input 'homebrew-core': 'github:homebrew/homebrew-core/7c518d7624b76c30cf8d82e7f929bdb75ab09d23' (2024-11-04) → 'github:homebrew/homebrew-core/657ccb0474732c9fae87685393775f9bab87928c' (2024-11-11) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/189d2d422c773fa065cc9c72e6806f007ebb9be0' (2024-11-04) → 'github:LnL7/nix-darwin/5c74ab862c8070cbf6400128a1b56abb213656da' (2024-11-09) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/cc2ddbf2df8ef7cc933543b1b42b845ee4772318' (2024-11-03) → 'github:nix-community/nix-index-database/896019f04b22ce5db4c0ee4f89978694f44345c3' (2024-11-10) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d' (2024-11-02) → 'github:nixos/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09) • Updated input 'spicetify': 'github:Gerg-L/spicetify-nix/2d871e2a5fb8c9d8d04a3bdd8f206aec81df2d6d' (2024-11-04) → 'github:Gerg-L/spicetify-nix/c503d1e7521af93013b6253a5f4899ea62a3c5a3' (2024-11-11) • Updated input 'stylix': 'github:danth/stylix/04afcfc0684d9bbb24bb1dc77afda7c1843ec93b' (2024-10-26) → 'github:danth/stylix/6863412636c8f2cb3b7360f747fbd020fbfddf68' (2024-11-08) • Updated input 'stylix/tinted-foot': 'github:tinted-theming/tinted-foot/eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce' (2023-10-08) → 'github:tinted-theming/tinted-foot/fd1b924b6c45c3e4465e8a849e67ea82933fcbe4' (2024-09-21)	2024-11-10 20:37:19 -08:00
Youwen Wu	d16564903a	flake.lock: Update Flake lock file updates: • Updated input 'zen-browser': 'github:youwen5/zen-browser-flake/3a15e3f2c835f95ae211a8a973a1e30994880fcc' (2024-10-29) → 'github:youwen5/zen-browser-flake/29ef2755b4ba40f3c0c00cf89b7a8c9c62b977b2' (2024-11-06)	2024-11-10 20:36:47 -08:00
Youwen Wu	26d55fa278	refactor: add zen browser for aarch64-linux	2024-11-10 20:36:09 -08:00
Youwen Wu	54c6920e83	feat: add zen-browser source and cache	2024-11-10 20:29:37 -08:00