Zynh0722
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Zynh0722:7c2bf6601a66e9736a0e1513ce4bee58cd404688
Branches Tags
Zynh0722:main
Zynh0722:sh-initrd-on-root
Zynh0722:aarch64
Zynh0722:archive/x86
..
compare: Zynh0722:8ffa090603415473cf8eb5182d1624c768bf8947
Branches Tags
Zynh0722:main
Zynh0722:sh-initrd-on-root
Zynh0722:aarch64
Zynh0722:archive/x86

No commits in common. "7c2bf6601a66e9736a0e1513ce4bee58cd404688" and "8ffa090603415473cf8eb5182d1624c768bf8947" have entirely different histories.
7c2bf6601a ... 8ffa090603

5 changed files with 13 additions and 128 deletions
Show Stats Expand all files Collapse all files

24
flake.lock
View File

@ -140,11 +140,11 @@
]
},
"locked": {
"lastModified": 1724159077,
"narHash": "sha256-AddE0u6WbA5R7uxumw1Ka0oG5dv3cTtN0ppO/M/e0cg=",
"lastModified": 1723803910,
"narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "1064a45e81a4e19cda98741b71219d9f4f136900",
"rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba",
"type": "github"
},
"original": {
@ -229,11 +229,11 @@
]
},
"locked": {
"lastModified": 1724222022,
"narHash": "sha256-LdzDMzzHxN5yUrKC/23GMjUDSE6hJbfj9TkjBLCTO0Q=",
"lastModified": 1724141451,
"narHash": "sha256-SoPZKkqwrxHmCXt5qjK6yT4jfr1R6+J9ya5oV49AR4Q=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "79e53269ba372c144db84ca9e7868fa924534b98",
"rev": "e575f5de031b6e06b90f40f84ed53b614bef2c9b",
"type": "github"
},
"original": {
@ -245,11 +245,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1724196927,
"narHash": "sha256-iFaqK6SqzhHj/VeLvAIhjuAgM4Q6/wUadT3qDsLX/hM=",
"lastModified": 1724106236,
"narHash": "sha256-FGLERUg/GAG2npgkBJ0XcEoA9rWNyH+DYW3PZ3/tYsU=",
"owner": "neovim",
"repo": "neovim",
"rev": "6f7bb02e7f7b8ff8fe4d67a433cd3a2250df7a11",
"rev": "1d11808bfd2879bf278cd05a7095a6634fa5afec",
"type": "github"
},
"original": {
@ -260,11 +260,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"lastModified": 1723991338,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
"type": "github"
},
"original": {

2
hosts/snowhawk/home.nix
View File

@ -10,7 +10,7 @@ in
snowhawk.neovim = {
enable = true;
# package = neovim-package;
package = neovim-package;
};
snowhawk = {
direnv.enable = true;

1
pkgs/default.nix
View File

@ -8,5 +8,4 @@ in
wrapWine = callDefaultPackage ./wrapWine;
writeXrandrScriptBin = callDefaultPackage ./writeXrandrScriptBin;
borderlessBrowser = callDefaultPackage ./borderlessBrowser;
zenBrowser = callDefaultPackage ./zenBrowser;
}

89
pkgs/zenBrowser/default.nix
View File

@ -1,89 +0,0 @@
# Adapted from: https://github.com/MarceColl/zen-browser-flake
{ lib
, stdenv
, makeWrapper
, copyDesktopItems
, libGL
, fontconfig
, libxkbcommon
, zlib
, freetype
, gtk3
, libxml2
, dbus
, xcb-util-cursor
, alsa-lib
, pango
, atk
, cairo
, gdk-pixbuf
, glib
, xorg
}:
stdenv.mkDerivation rec {
name = "zenBrowser";
version = "1.0.0-a.27";
src = builtins.fetchTarball {
url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-specific.tar.bz2";
sha256 = "sha256:0vmn10qpr96b4i8j24sa6ipg3fcxiiigkjwclbr5fknkfj3r6ds7";
};
desktopSrc = ./.;
phases = [ "installPhase" "fixupPhase" ];
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
installPhase = ''
mkdir -p $out/bin && cp -r $src/* $out/bin
install -D $desktopSrc/zen.desktop $out/share/applications/dev.zen.Zen.desktop
install -D $src/browser/chrome/icons/default/default128.png $out/share/icons/hicolor/128x128/apps/zen.png
'';
fixupPhase =
let
runtimeLibs = [
libGL
stdenv.cc.cc
fontconfig
libxkbcommon
zlib
freetype
gtk3
libxml2
dbus
xcb-util-cursor
alsa-lib
pango
atk
cairo
gdk-pixbuf
glib
] ++ (with xorg; [
libxcb
libX11
libXcursor
libXrandr
libXi
libXext
libXcomposite
libXdamage
libXfixes
]);
in
''
chmod 755 $out/bin/*
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/zen
wrapProgram $out/bin/zen --set LD_LIBRARY_PATH "${lib.makeLibraryPath runtimeLibs}"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/zen-bin
wrapProgram $out/bin/zen-bin --set LD_LIBRARY_PATH "${lib.makeLibraryPath runtimeLibs}"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/glxtest
wrapProgram $out/bin/glxtest --set LD_LIBRARY_PATH "${lib.makeLibraryPath runtimeLibs}"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/updater
wrapProgram $out/bin/updater --set LD_LIBRARY_PATH "${lib.makeLibraryPath runtimeLibs}"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/vaapitest
wrapProgram $out/bin/vaapitest --set LD_LIBRARY_PATH "${lib.makeLibraryPath runtimeLibs}"
'';
}

25
pkgs/zenBrowser/zen.desktop
View File

@ -1,25 +0,0 @@
[Desktop Entry]
Name=Zen Browser
Exec=zen %u
Icon=zen
Type=Application
MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
StartupWMClass=zen-alpha
Categories=Network;WebBrowser;
StartupNotify=true
Terminal=false
X-MultipleArgs=false
Keywords=Internet;WWW;Browser;Web;Explorer;
Actions=new-window;new-private-window;profilemanager;
[Desktop Action new-window]
Name=Open a New Window
Exec=zen %u
[Desktop Action new-private-window]
Name=Open a New Private Window
Exec=zen --private-window %u
[Desktop Action profilemanager]
Name=Open the Profile Manager
Exec=zen --ProfileManager %u