framework: add zen-browser flake

also add git recommit alias
This commit is contained in:
tristan 2025-05-20 12:23:19 +01:00
parent cf2aaf7578
commit acf41f34a5
5 changed files with 48 additions and 3 deletions

37
flake.lock generated
View file

@ -571,6 +571,22 @@
"type": "github" "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": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
@ -652,7 +668,8 @@
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"nixvim": "nixvim", "nixvim": "nixvim",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix" "stylix": "stylix",
"zen-browser": "zen-browser"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -862,6 +879,24 @@
"repo": "treefmt-nix", "repo": "treefmt-nix",
"type": "github" "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", "root": "root",

View file

@ -20,6 +20,9 @@
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
zen-browser = {
url = "github:youwen5/zen-browser-flake";
};
}; };
outputs = {nixvim, ...} @ inputs: let outputs = {nixvim, ...} @ inputs: let

View file

@ -17,6 +17,7 @@
sdiff = "diff --staged"; sdiff = "diff --staged";
fpush = "push --force-with-lease"; fpush = "push --force-with-lease";
t = "tag --annotate"; t = "tag --annotate";
recommit = ''commit -m "$(cat "$(git rev-parse --git-dir)/COMMIT_EDITMSG)")"'';
bclone = "!sh ${pkgs.writeShellScriptBin "bare-clone" '' bclone = "!sh ${pkgs.writeShellScriptBin "bare-clone" ''
url=$1 url=$1
basename=''${url##*/} basename=''${url##*/}

View file

@ -1,4 +1,4 @@
{pkgs, ...}: { {pkgs, inputs, ...}: {
imports = [ imports = [
./mpv.nix ./mpv.nix
./vscode.nix ./vscode.nix
@ -59,4 +59,10 @@
enable = true; enable = true;
package = pkgs.brave; package = pkgs.brave;
}; };
programs.firefox = {
enable = true;
package = inputs.zen-browser.packages.x86_64-linux.default;
};
} }

View file

@ -31,7 +31,7 @@ in
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
backupFileExtension = "bak"; backupFileExtension = "bak";
extraSpecialArgs = {inherit stable-pkgs;}; extraSpecialArgs = {inherit stable-pkgs inputs;};
users.${user}.imports = users.${user}.imports =
home-modules home-modules
++ [ ++ [