From 17b183ee8e51453fa198fbbf07a2b4a5329681d9 Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 23 Sep 2024 19:22:17 -0400 Subject: [PATCH] small updates --- flake.lock | 74 ++++++------- homes/x86_64-linux/zoey@earth/default.nix | 3 +- modules/home/apps/term/foot/default.nix | 3 + modules/home/wms/hyprland/default.nix | 6 +- modules/home/wms/sway/default.nix | 5 +- modules/nixos/hardware/audio/default.nix | 7 +- modules/nixos/protocols/wayland/default.nix | 2 +- modules/nixos/services/dlna/default.nix | 4 +- modules/nixos/sites/jellyfin/default.nix | 1 - packages/zen-browser/default.nix | 112 ++++++++++++++------ packages/zen-browser/scripts/patch.sh | 81 -------------- packages/zen-browser/zen.desktop | 25 +++++ systems/x86_64-linux/earth/default.nix | 1 + 13 files changed, 161 insertions(+), 163 deletions(-) delete mode 100644 packages/zen-browser/scripts/patch.sh create mode 100644 packages/zen-browser/zen.desktop diff --git a/flake.lock b/flake.lock index 81c3c89..3c63283 100644 --- a/flake.lock +++ b/flake.lock @@ -708,11 +708,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1726995313, - "narHash": "sha256-HTbsXJDFugdQ794d1Bnh8eRSY7AlunIxd7jFW9kkKNM=", + "lastModified": 1727116306, + "narHash": "sha256-qzGnf7RGKXFU/n+onZx3iE6h2l6w5pRAnqPR+2nW/yk=", "ref": "refs/heads/main", - "rev": "e5ff19ac0f2c8d53a0c847d06a17676e636d6447", - "revCount": 5247, + "rev": "2121ff7746cd2e44d1e1edd57f6681998ca8f8e3", + "revCount": 5252, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -965,11 +965,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1726965320, - "narHash": "sha256-N1ZPfRm+9CW6MNWjbghvmbfEAclLHABzSnRXh7z3WAQ=", + "lastModified": 1727073507, + "narHash": "sha256-WtRxgqmIT6srZzSJZ0B/Z/Lig1U+s6+AaGR6wtqWJa0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "e37970c7801fe598290167855d77f3780d821010", + "rev": "3e954442e1ab9a1d14a006d4a1d58720c3c8c45e", "type": "github" }, "original": { @@ -981,11 +981,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1726956168, - "narHash": "sha256-unElU0uavf4fTNtKOp0N1iIwOexg1PksKue3OeIv7TU=", + "lastModified": 1727027883, + "narHash": "sha256-v8K9dNHR+xm12Jd675HlQKIVLpPz1x1leg327VciuNo=", "owner": "neovim", "repo": "neovim", - "rev": "e697c1b43dfbeab132fee4149157f7abd08c51a0", + "rev": "e83ce331da9165ad611b31aef9965fa74abaea14", "type": "github" }, "original": { @@ -1039,11 +1039,11 @@ }, "nixlib": { "locked": { - "lastModified": 1726362065, - "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=", + "lastModified": 1726966855, + "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555", + "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", "type": "github" }, "original": { @@ -1060,11 +1060,11 @@ ] }, "locked": { - "lastModified": 1726817511, - "narHash": "sha256-r3R7zZzGklN0udSO/JhWbU/xyq6i1aXKKwfs33LUVls=", + "lastModified": 1727053438, + "narHash": "sha256-t/+z1Tf7hSaStU1pBYkY7i0/GkG+YIPSmfeRrK8eYUw=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "bfa25c9065f4cb5d884a0ad70f6e82f55ae90448", + "rev": "e8c1cd886cc17e31e424f915efd32e84d8af0ce9", "type": "github" }, "original": { @@ -1156,11 +1156,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1727008402, - "narHash": "sha256-vvdMGNwaSQDjctSeRwzyW5aEYsfmZC15+cCqBAbHn9Q=", + "lastModified": 1727127028, + "narHash": "sha256-hs7sutM2xdq+DhW7xICNSbmF7ZlIgZLeJ2nlJC/tQVc=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "a1318d7743b0cc32406082bfaba6ba1c9d47a8fe", + "rev": "ddf94f1857eabb72773d268272312a3c217fe2c5", "type": "github" }, "original": { @@ -1299,11 +1299,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1726838390, - "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", + "lastModified": 1726969270, + "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", + "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075", "type": "github" }, "original": { @@ -1331,11 +1331,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -1424,11 +1424,11 @@ "systems": "systems_12" }, "locked": { - "lastModified": 1727041249, - "narHash": "sha256-+he3m/JaYglSFXii9o89ScW0+0/cNUtkONvJtS6Sa/8=", + "lastModified": 1727130059, + "narHash": "sha256-a4AoZpdXQhqLCsnCOmnwmUNiFnI0dYoqtV3IYvVWS7U=", "owner": "raphamorim", "repo": "rio", - "rev": "b8d3d03311f43938e881ea19d3be00b31ba02059", + "rev": "45153aa1807ced6edbc6bbd55cf5f65223805de9", "type": "github" }, "original": { @@ -1555,11 +1555,11 @@ ] }, "locked": { - "lastModified": 1726978682, - "narHash": "sha256-YfTyq1sW7r1k0lCdhXDQbBskMwSKehlNMq8AgyFDkTo=", + "lastModified": 1727065001, + "narHash": "sha256-YG76K8qSYZ2el9HMGght15Bvo1xaxPYKTK9TWdJrWn0=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b12df94e5574eaf9945bdb1238aa99a47b0ae5dc", + "rev": "27aefaa7fc56ea40202ad172b6e2f77f7377b2e7", "type": "github" }, "original": { @@ -1809,11 +1809,11 @@ ] }, "locked": { - "lastModified": 1726759867, - "narHash": "sha256-zmHHyEUqbCK93NP/LULHpqIZVQ1PYkz0ae2VSJhpKwA=", + "lastModified": 1727106303, + "narHash": "sha256-/PFnrEyYoEWtrIFLNzqG4L6SC9dX7svwJf7j+bhk/rM=", "owner": "Alexays", "repo": "Waybar", - "rev": "21af48fdc95b21ad067e627abb96655757c48b36", + "rev": "07f75e303c4d6de8198e30239a808bfbc0d80ea5", "type": "github" }, "original": { @@ -1847,11 +1847,11 @@ ] }, "locked": { - "lastModified": 1726933538, - "narHash": "sha256-xTqnMoJsEojuvqJLuM+U7EZ7q71efaj3pbvjutq4TXc=", + "lastModified": 1727109343, + "narHash": "sha256-1PFckA8Im7wMSl26okwOKqBZeCFLD3LvZZFaxswDhbY=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4880c50146d0c2a3152d2b02f79253810c330c11", + "rev": "4adb6c4c41ee5014bfe608123bfeddb26e5f5cea", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index ca8357e..8ef5ebc 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -5,7 +5,7 @@ lib, ... }: { - wms.hyprland.enable = true; + wms.sway.enable = true; apps = { web.librewolf.enable = true; @@ -39,6 +39,7 @@ services.lock.enable = true; services.music.enable = true; services.pm-bridge.enable = true; + services.udiskie.enable = true; xdg.enable = true; diff --git a/modules/home/apps/term/foot/default.nix b/modules/home/apps/term/foot/default.nix index 0f45f95..be05d62 100644 --- a/modules/home/apps/term/foot/default.nix +++ b/modules/home/apps/term/foot/default.nix @@ -16,6 +16,9 @@ in { programs.foot = { enable = true; settings = { + main = { + font = "Iosevka:weight=bold:size=20"; + }; colors = { alpha = "0.9"; }; diff --git a/modules/home/wms/hyprland/default.nix b/modules/home/wms/hyprland/default.nix index bb2f586..4bd8409 100644 --- a/modules/home/wms/hyprland/default.nix +++ b/modules/home/wms/hyprland/default.nix @@ -62,9 +62,9 @@ in { exec-once = [ "pw-loopback -C \"alsa_input.pci-0000_0d_00.4.analog-stereo\" -P \"Scarlett Solo (3rd Gen.) Headphones / Line 1-2\"" "sway-audio-idle-inhibit" - "zen" - "telegram" - "thunderbird" + "zen-browser" + "sleep 6;telegram-desktop" + "sleep 6;thunderbird" "vesktop" "spotify" "slack" diff --git a/modules/home/wms/sway/default.nix b/modules/home/wms/sway/default.nix index 89199c5..08fe187 100644 --- a/modules/home/wms/sway/default.nix +++ b/modules/home/wms/sway/default.nix @@ -23,11 +23,12 @@ in { wayland.windowManager.sway = { enable = true; xwayland = true; + package = inputs.nixpkgs-wayland.packages.${pkgs.system}.sway-unwrapped; extraOptions = ["--unsupported-gpu"]; config = { - terminal = "kitty"; - startup = [{command = "firefox";}]; + terminal = "foot"; + startup = [{command = "zen";} {command = "vesktop";} {command = "slack";} {command = "telegram-desktop";} {command = "thunderbird";}]; menu = "killall anyrun || anyrun"; diff --git a/modules/nixos/hardware/audio/default.nix b/modules/nixos/hardware/audio/default.nix index b4861bb..1d090b5 100644 --- a/modules/nixos/hardware/audio/default.nix +++ b/modules/nixos/hardware/audio/default.nix @@ -26,11 +26,8 @@ in { extraConfig.pipewire.adjust-sample-rate = { "context.properties" = { - "default.clock.rate" = 48000; - "default.allowed-rates" = [48000]; - "default.clock.quantum" = 32; - "default.clock.min-quantum" = 32; - "default.clock.max-quantum" = 32; + "default.clock.rate" = 96000; + "default.allowed-rates" = [96000]; }; }; diff --git a/modules/nixos/protocols/wayland/default.nix b/modules/nixos/protocols/wayland/default.nix index 0fcfdcc..d5340a6 100644 --- a/modules/nixos/protocols/wayland/default.nix +++ b/modules/nixos/protocols/wayland/default.nix @@ -24,7 +24,7 @@ in { enable = true; settings = rec { initial_session = { - command = "Hyprland"; + command = "sway --unsupported-gpu"; user = "zoey"; }; default_session = initial_session; diff --git a/modules/nixos/services/dlna/default.nix b/modules/nixos/services/dlna/default.nix index bb71ac5..1d6d49f 100644 --- a/modules/nixos/services/dlna/default.nix +++ b/modules/nixos/services/dlna/default.nix @@ -18,8 +18,8 @@ in { openFirewall = true; settings = { notify_interval = 60; - friendly_name = "ZACKPC"; - media_dir = ["A,/home/zack/Music"]; + friendly_name = "workstation"; + media_dir = ["A,/home/zoey/Music"]; inotify = "yes"; }; }; diff --git a/modules/nixos/sites/jellyfin/default.nix b/modules/nixos/sites/jellyfin/default.nix index 3c3db9f..45035a5 100644 --- a/modules/nixos/sites/jellyfin/default.nix +++ b/modules/nixos/sites/jellyfin/default.nix @@ -15,7 +15,6 @@ in { config = mkIf cfg.enable { services.jellyfin = { enable = true; - dataDir = "/mnt/lul"; openFirewall = true; }; }; diff --git a/packages/zen-browser/default.nix b/packages/zen-browser/default.nix index 4fa8a10..a9f7361 100644 --- a/packages/zen-browser/default.nix +++ b/packages/zen-browser/default.nix @@ -3,41 +3,93 @@ lib, }: let pname = "zen-browser"; - version = "1.0.1-a.2"; + version = "1.0.1-a.4"; - src = pkgs.fetchurl { - url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen-specific.AppImage"; - sha256 = "sha256-Pc65S2WjI/CdKIunmMTKYzqGFfm3D9PHsiOEqfQ7r8A="; - }; - - appimageContents = pkgs.appimageTools.extractType2 { - inherit pname version src; - }; + runtimeLibs = with pkgs; + [ + libGL + libGLU + libevent + libffi + libjpeg + libpng + libstartup_notification + libvpx + libwebp + stdenv.cc.cc + fontconfig + libxkbcommon + zlib + freetype + gtk3 + libxml2 + dbus + xcb-util-cursor + alsa-lib + libpulseaudio + pango + atk + cairo + gdk-pixbuf + glib + udev + libva + mesa + libnotify + cups + pciutils + ffmpeg + libglvnd + pipewire + ] + ++ (with pkgs.xorg; [ + libxcb + libX11 + libXcursor + libXrandr + libXi + libXext + libXcomposite + libXdamage + libXfixes + libXScrnSaver + ]); in - pkgs.appimageTools.wrapType2 rec { - inherit pname version src; + pkgs.stdenv.mkDerivation { + inherit version pname; - extraInstallCommands = '' - mkdir -p $out/share/applications $out/share/pixmaps - cp ${appimageContents}/zen.desktop $out/share/applications/ - cp ${appimageContents}/zen.png $out/share/pixmaps/ + src = builtins.fetchTarball { + url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-specific.tar.bz2"; + sha256 = "sha256:0jjfr1201gfw0cy8q1jbr504994z33sbw8ip86c6xbww8qm60bqh"; + }; - for n in {16,32,48,64,128}; do - size=$n"x"$n - mkdir -p $out/share/icons/hicolor/$size/apps - file="default"$n".png" - cp ${appimageContents}/browser/chrome/icons/default/$file $out/share/icons/hicolor/$size/apps/zen.png - done + desktopSrc = ./.; - substituteInPlace $out/share/applications/zen.desktop \ - --replace-fail "Exec=zen %u" "Exec=$out/bin/${pname} %u" + phases = ["installPhase" "fixupPhase"]; + + nativeBuildInputs = [pkgs.makeWrapper pkgs.copyDesktopItems pkgs.wrapGAppsHook]; + + installPhase = '' + mkdir -p $out/bin && cp -r $src/* $out/bin + install -D $desktopSrc/zen.desktop $out/share/applications/zen.desktop + install -D $src/browser/chrome/icons/default/default128.png $out/share/icons/hicolor/128x128/apps/zen.png ''; - meta = with pkgs.lib; { - description = "Zen Browser - Experience tranquillity while browsing the web without people tracking you."; - homepage = "https://github.com/zen-browser/desktop"; - license = licenses.mpl20; - maintainers = with maintainers; [zvictor]; - platforms = platforms.linux; - }; + fixupPhase = '' + 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 "${pkgs.lib.makeLibraryPath runtimeLibs}" \ + --set MOZ_LEGACY_PROFILES 1 --set MOZ_ALLOW_DOWNGRADE 1 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/zen-bin + wrapProgram $out/bin/zen-bin --set LD_LIBRARY_PATH "${pkgs.lib.makeLibraryPath runtimeLibs}" \ + --set MOZ_LEGACY_PROFILES 1 --set MOZ_ALLOW_DOWNGRADE 1 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/glxtest + wrapProgram $out/bin/glxtest --set LD_LIBRARY_PATH "${pkgs.lib.makeLibraryPath runtimeLibs}" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/updater + wrapProgram $out/bin/updater --set LD_LIBRARY_PATH "${pkgs.lib.makeLibraryPath runtimeLibs}" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/vaapitest + wrapProgram $out/bin/vaapitest --set LD_LIBRARY_PATH "${pkgs.lib.makeLibraryPath runtimeLibs}" + ''; + + meta.mainProgram = "zen"; } diff --git a/packages/zen-browser/scripts/patch.sh b/packages/zen-browser/scripts/patch.sh deleted file mode 100644 index cac255d..0000000 --- a/packages/zen-browser/scripts/patch.sh +++ /dev/null @@ -1,81 +0,0 @@ -ENGINE_DIR=$(pwd)/engine -SRC_DIR=$(pwd)/src - -# Create a directory if it doesn't exist -mkdirp() { - mkdir -p "$1" -} - -# Append to a file -append_to_file_sync() { - local file="$1" - local text="$2" - echo -e "$text" >>"$file" -} - -# Copy or symlink files -copy_manual() { - local name="$1" - local src_path="$SRC_DIR/$name" - local dest_path="$ENGINE_DIR/$name" - - echo "Processing file: $name" - - # Ensure the parent directory exists - mkdirp "$(dirname "$dest_path")" - - # Remove existing non-symlink file - if [ -e "$dest_path" ] && [ ! -L "$dest_path" ]; then - echo "Removing existing file at $dest_path" - rm -f "$dest_path" - fi - - if [ "$(uname)" = "Darwin" ] || [ "$(uname)" = "Linux" ]; then - # Create symlink - echo "Creating symlink: $src_path -> $dest_path" - ln -s "$src_path" "$dest_path" - else - # On Windows or other platforms without symlink permissions - echo "Copying file: $src_path -> $dest_path" - cp "$src_path" "$dest_path" - fi - - # Add to .gitignore if not already present - if ! grep -q "$name" "$ENGINE_DIR/.gitignore"; then - echo "Adding $name to .gitignore" - append_to_file_sync "$ENGINE_DIR/.gitignore" "\n$name" - fi -} - -# Apply folder patches -apply_folder_patches() { - # Get all files from the source directory, excluding .patch files and node_modules - local all_files=($(find "$SRC_DIR" -type f ! -name "*.patch" ! -path "*/node_modules/*")) - - for file in "${all_files[@]}"; do - relative_path="${file#$SRC_DIR/}" - copy_manual "$relative_path" - done -} - -# Apply internal patches -apply_internal_patches() { - for patch in $(find $PATCHES_DIR -type f -name "*.patch"); do - echo "Applying internal patch: $patch" - git apply --directory "$ENGINE_DIR" "$patch" - done -} - -# Apply git patches -apply_git_patches() { - for patch in $(find $SRC_DIR -type f -name "*.patch"); do - echo "Applying git patch: $patch $ENGINE_DIR" - echo "git apply --directory "$ENGINE_DIR" "$patch"" - git apply --verbose "$patch" - done -} - -cd engine || exit -apply_git_patches -cd .. || exit -apply_folder_patches diff --git a/packages/zen-browser/zen.desktop b/packages/zen-browser/zen.desktop new file mode 100644 index 0000000..df5b81a --- /dev/null +++ b/packages/zen-browser/zen.desktop @@ -0,0 +1,25 @@ +[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 diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix index f911c8f..e109178 100644 --- a/systems/x86_64-linux/earth/default.nix +++ b/systems/x86_64-linux/earth/default.nix @@ -41,6 +41,7 @@ services.vpn.enable = true; services.xserver.enable = true; services.vpn.mullvad = true; + services.udisks2.enable = true; services.transmission = { enable = true; package = pkgs.transmission_4;