diff --git a/flake.lock b/flake.lock index 436200b..b8e62d9 100644 --- a/flake.lock +++ b/flake.lock @@ -571,6 +571,22 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -652,7 +668,8 @@ "nixpkgs-stable": "nixpkgs-stable_2", "nixvim": "nixvim", "sops-nix": "sops-nix", - "stylix": "stylix" + "stylix": "stylix", + "zen-browser": "zen-browser" } }, "rust-overlay": { @@ -862,6 +879,24 @@ "repo": "treefmt-nix", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1746763614, + "narHash": "sha256-tfBsztz6aUcfIFK8Sewn44mkMXZs8rRQfmHBjVhkUBM=", + "owner": "youwen5", + "repo": "zen-browser-flake", + "rev": "154aa27229783bca87c3ea3ac4ef32ab9b99cdb6", + "type": "github" + }, + "original": { + "owner": "youwen5", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ede8ff3..39ece29 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,9 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; + zen-browser = { + url = "github:youwen5/zen-browser-flake"; + }; }; outputs = {nixvim, ...} @ inputs: let diff --git a/home/programs/git.nix b/home/programs/git.nix index 1e9f122..ad9508c 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -17,6 +17,7 @@ sdiff = "diff --staged"; fpush = "push --force-with-lease"; t = "tag --annotate"; + recommit = ''commit -m "$(cat "$(git rev-parse --git-dir)/COMMIT_EDITMSG)")"''; bclone = "!sh ${pkgs.writeShellScriptBin "bare-clone" '' url=$1 basename=''${url##*/} diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index 54c2b04..642b6be 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{pkgs, inputs, ...}: { imports = [ ./mpv.nix ./vscode.nix @@ -59,4 +59,10 @@ enable = true; package = pkgs.brave; }; + + programs.firefox = { + enable = true; + package = inputs.zen-browser.packages.x86_64-linux.default; + }; + } diff --git a/lib/mkconf.nix b/lib/mkconf.nix index ebe62af..2640576 100644 --- a/lib/mkconf.nix +++ b/lib/mkconf.nix @@ -31,7 +31,7 @@ in useGlobalPkgs = true; useUserPackages = true; backupFileExtension = "bak"; - extraSpecialArgs = {inherit stable-pkgs;}; + extraSpecialArgs = {inherit stable-pkgs inputs;}; users.${user}.imports = home-modules ++ [