From 35dc350142b635b0e343e826caa555c7f4bec88e Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Mon, 30 Dec 2024 22:12:16 +0100 Subject: [PATCH] Adding zen-browser --- flake.lock | 49 ++++++++++++++++++++++++++++++------ flake.nix | 1 + modules/desktop/packages.nix | 3 ++- modules/gaming/default.nix | 3 +++ 4 files changed, 48 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index ddcf501..4821cf4 100644 --- a/flake.lock +++ b/flake.lock @@ -55,11 +55,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735264675, - "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -85,13 +85,48 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-unstable": "nixpkgs-unstable", + "zen-browser": "zen-browser" + } + }, + "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1735092772, + "narHash": "sha256-u9uEmMRE3RR8hwZto4USSDvee7X2FEYeWcSSLf4Jjrs=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "cea051b6f908304f4af6484b14a532c729f0cc34", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 4a2350e..541f52a 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nix-flatpak.url = "github:gmodena/nix-flatpak/latest"; + zen-browser.url = "github:0xc000022070/zen-browser-flake"; }; outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, nix-flatpak, ... }@attrs: { diff --git a/modules/desktop/packages.nix b/modules/desktop/packages.nix index edbcee4..133b827 100644 --- a/modules/desktop/packages.nix +++ b/modules/desktop/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ pkgs, lib, config, zen-browser, ... }: let tex = (pkgs.texlive.combine { inherit (pkgs.texlive) @@ -22,6 +22,7 @@ in { # Packages environment.systemPackages = with pkgs; [ # Web + zen-browser.packages."${system}".default fragments dropbox varia diff --git a/modules/gaming/default.nix b/modules/gaming/default.nix index 6ea0574..5ff9aa0 100644 --- a/modules/gaming/default.nix +++ b/modules/gaming/default.nix @@ -16,6 +16,9 @@ # MANGOHUD_CONFIG = "fps,cpu_temp,gpu_temp,ram,vram"; # }; }; + package = pkgs.steam.override { + extraArgs = "-forcedesktopscaling 1.5"; + }; }; programs.gamemode.enable = true;