flake: add nixpkgs/master, zen-browser, flatseal

remove uwsm overlay, as it's now available in nixos-unstable Signed-off-by: John Titor <[email protected]>
JohnRTitor · Aug 30, 2024 · 7c8b864 · 7c8b864
1 parent 9a3c095
commit 7c8b864
Show file tree

Hide file tree

Showing 9 changed files with 245 additions and 196 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,8 +4,8 @@
   # Main sources and repositories
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable"; # Unstable NixOS system (default)
-    nixpkgs-edge.url = "nixpkgs/master"; # Only used for bleeding edge packages
-    uwsm-test-nixpkgs.url = "github:NixOS/nixpkgs/refs/pull/335625/merge";
+    nixpkgs-edge.url = "nixpkgs/nixos-unstable-small"; # For latest packages
+    nixpkgs-master.url = "nixpkgs/master"; # Testing branch of nixpkgs
 
     flake-parts = {
       url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management
@@ -33,10 +33,7 @@
       url = "github:Aylur/ags"; # Aylur GTK Shell, a widget manager/toolkit
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprland = {
-      url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; # Hyprland, a Wayland WM, use git submodules too
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; # Hyprland, a Wayland WM, use git submodules too
     xdph = {
       url = "github:hyprwm/xdg-desktop-portal-hyprland";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -46,7 +43,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprlock = {
-      url = "github:hyprwm/hyprlock/9cca0dbb45941e13322ff95796f486676f061c6e"; # Beautiful lockscreen for Hyprland
+      url = "github:hyprwm/hyprlock"; # Beautiful lockscreen for Hyprland
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hypridle = {

diff --git a/flake/hosts.nix b/flake/hosts.nix
@@ -3,7 +3,7 @@
   self,
   ...
 }: let
-  inherit (inputs) nixpkgs nixpkgs-edge;
+  inherit (inputs) nixpkgs nixpkgs-edge nixpkgs-master;
   inherit (nixpkgs) lib; # use lib from nixpkgs
 
   inherit (import ../preferences.nix) systemSettings userSettings;
@@ -18,7 +18,16 @@
     };
   };
 
-  specialArgs = {inherit self inputs pkgs-edge systemSettings userSettings;};
+  pkgs-master = import nixpkgs-master {
+    system = systemSettings.systemarch;
+    config = {
+      allowUnfree = true;
+      allowUnfreePredicate = _: true;
+      android_sdk.accept_license = true;
+    };
+  };
+
+  specialArgs = {inherit self inputs pkgs-edge pkgs-master systemSettings userSettings;};
 in {
   flake = {
     nixosConfigurations.${systemSettings.hostname} = lib.nixosSystem {

diff --git a/modules-overlays/default.nix b/modules-overlays/default.nix
@@ -7,7 +7,6 @@
 }: {
   imports = [
     #./amdgpu.nix # import modules here to test
-    "${inputs.uwsm-test-nixpkgs}/nixos/modules/programs/wayland/uwsm.nix"
   ];
 
   nixpkgs.overlays = [

diff --git a/pkgs/global-packages.nix b/pkgs/global-packages.nix
@@ -25,7 +25,7 @@
       curl
       wget
 
-      (callPackage ./gparted-wrapper.nix {})
+      #(callPackage ./gparted-wrapper.nix {})
     ])
     ++ (with pkgs-edge; [
       # list of latest packages from nixpkgs master
@@ -36,5 +36,6 @@
     ];
   services.flatpak.packages = [
     # Flatpak packages to be installed systemwide
+    "com.github.tchx84.Flatseal" # Customising permission of Flatpaks
   ];
 }
diff --git a/pkgs/user-packages.nix b/pkgs/user-packages.nix
@@ -96,7 +96,7 @@
       libreoffice-fresh
       deluge # Torrent client
       shotwell # GNOME image editor
-      gnome.gnome-logs # GNOME log viewer
+      gnome-logs # GNOME log viewer
       mission-center # Taskmanager clone
       warp # file transfer, also install android app
       clapper

diff --git a/system/browsers.nix b/system/browsers.nix
@@ -6,6 +6,7 @@
   ...
 }: {
   # Enable Firefox Wayland
+  /*
   programs.firefox = {
     enable = true;
     package = pkgs.firefox-wayland;
@@ -14,50 +15,59 @@
       HardwareAcceleration = true;
     };
   };
+  */
 
-  environment.systemPackages = with pkgs-edge; [
-    (google-chrome.override {
-      # enable video encoding and hardware acceleration, along with several
-      # suitable for my configuration
-      # change it if you have any issues
-      # note the spaces, they are required
-      # Vulkan is not stable, likely because of bad drivers
-      # Flags enabled by command line have no need to be enabled in chrome://flags
-      commandLineArgs =
-        ""
-        + " --enable-accelerated-video-decode"
-        + " --enable-accelerated-vpx-decode"
-        + " --enable-accelerated-mjpeg-decode"
-        + " --enable-gpu-compositing"
-        + " --enable-gpu-rasterization"
-        + " --enable-native-gpu-memory-buffers"
-        + " --enable-raw-draw"
-        + " --enable-zero-copy"
-        + " --ignore-gpu-blocklist"
-        # + " --use-vulkan"
-        + " --enable-features="
-        + "ParallelDownloading" # Faster downloads
-        + ",VaapiVideoEncoder" # Video encoding support
-        + ",CanvasOopRasterization"
-        + ",UseDMSAAForTiles"
-        + ",UseGpuSchedulerDfs"
-        + ",UIEnableSharedImageCacheForGpu" # Shared image cache
-        + ",UseClientGmbInterface" # new ClientGmb interface to create GpuMemoryBuffers
-        # + ",SkiaGraphite"
-        # + ",EnableDrDc"
-        # + ",Vulkan"
-        # + ",VulkanFromANGLE"
-        + ",PostQuantumKyber" # hybrid kyber for enhanced TLS security
-        + ",PulseaudioLoopbackForCast" # Audio support for casting and screen sharing
-        + ",PulseaudioLoopbackForScreenShare"
-        + ",ChromeWideEchoCancellation" # noise cancellation for WebRTC
-        + ",DesktopScreenshots"
-        + ",FluentOverlayScrollbar" # New scrollbar
-        + ",FluentScrollbar"
-        + ",EnableTabMuting" # Mute tabs from tab context
-        + ",GlobalMediaControlsUpdatedUI"
-        # New media controls, with PIP
-        ;
-    })
+  environment.systemPackages = with pkgs-edge;
+    [
+      (google-chrome.override {
+        # enable video encoding and hardware acceleration, along with several
+        # suitable for my configuration
+        # change it if you have any issues
+        # note the spaces, they are required
+        # Vulkan is not stable, likely because of bad drivers
+        # Flags enabled by command line have no need to be enabled in chrome://flags
+        commandLineArgs =
+          ""
+          + " --enable-accelerated-video-decode"
+          + " --enable-accelerated-vpx-decode"
+          + " --enable-accelerated-mjpeg-decode"
+          + " --enable-gpu-compositing"
+          + " --enable-gpu-rasterization"
+          + " --enable-native-gpu-memory-buffers"
+          + " --enable-raw-draw"
+          + " --enable-zero-copy"
+          + " --ignore-gpu-blocklist"
+          # + " --use-vulkan"
+          + " --enable-features="
+          + "ParallelDownloading" # Faster downloads
+          + ",VaapiVideoEncoder" # Video encoding support
+          + ",CanvasOopRasterization"
+          + ",UseDMSAAForTiles"
+          + ",UseGpuSchedulerDfs"
+          + ",UIEnableSharedImageCacheForGpu" # Shared image cache
+          + ",UseClientGmbInterface" # new ClientGmb interface to create GpuMemoryBuffers
+          # + ",SkiaGraphite"
+          # + ",EnableDrDc"
+          # + ",Vulkan"
+          # + ",VulkanFromANGLE"
+          + ",PostQuantumKyber" # hybrid kyber for enhanced TLS security
+          + ",PulseaudioLoopbackForCast" # Audio support for casting and screen sharing
+          + ",PulseaudioLoopbackForScreenShare"
+          + ",ChromeWideEchoCancellation" # noise cancellation for WebRTC
+          + ",DesktopScreenshots"
+          + ",FluentOverlayScrollbar" # New scrollbar
+          + ",FluentScrollbar"
+          + ",EnableTabMuting" # Mute tabs from tab context
+          + ",GlobalMediaControlsUpdatedUI"
+          # New media controls, with PIP
+          ;
+      })
+    ]
+    ++ [
+      #inputs.zen-browser.packages.${pkgs.system}.specific
+    ];
+
+  services.flatpak.packages = [
+    "io.github.zen_browser.zen"
   ];
 }
diff --git a/system/hyprland/session.nix b/system/hyprland/session.nix
@@ -1,5 +1,8 @@
-{pkgs, pkgs-edge, ...}:
 {
+  pkgs,
+  pkgs-edge,
+  ...
+}: {
   # Enable GDM with wayland
   services.xserver.displayManager.gdm = {
     enable = true;
@@ -25,4 +28,4 @@
 
   # Run XDG autostart, this is needed for a DE-less setup like Hyprland
   services.xserver.desktopManager.runXdgAutostartIfNone = true;
-}
+}
diff --git a/system/nix-settings.nix b/system/nix-settings.nix
@@ -26,7 +26,7 @@
     "nix-command"
     "flakes"
   ]; # enable nix command and flakes
-  
+
   nix.settings.auto-optimise-store = true; # enable space optimisation by hardlinking
 
   # Allow unfree packages