From 039cab92def62a693cfe243de061eec6f4dc268a Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 21 Sep 2023 08:51:07 +0100
Subject: [PATCH] Move allowUnfree to allowUnfreePredicate

Add ferdium and window rule

Move waybar overlay into hyprland expression
---
 flake.nix                     | 15 ++-------------
 home/hyprland/config.nix      |  1 +
 home/hyprland/default.nix     |  2 ++
 hosts/Ronin/configuration.nix |  4 +++-
 hosts/Ronin/home.nix          |  7 +------
 system/hyprland.nix           |  7 +++++++
 system/steam.nix              |  4 +++-
 7 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/flake.nix b/flake.nix
index b06e1c89..803c8f98 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,17 +93,6 @@
         , homeModules ? default.homeModules, stateVersion ? default.stateVersion
         }:
         let
-          pkgs = import nixpkgs {
-            inherit system;
-            config.allowUnfree = true;
-            overlays = [
-              (final: prev: {
-                waybar = prev.waybar.overrideAttrs (oldAttrs: {
-                  mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
-                });
-              })
-            ];
-          };
           specialArgs = {
             inherit hostName user group;
             inherit (inputs) hyprland;
@@ -112,7 +101,7 @@
             inherit wallpapers catppuccin-themes;
             inherit (inputs) doom-emacs gitui;
           };
-          commonModule = {
+          commonModule = { pkgs, ... }: {
             nix = {
               settings = {
                 experimental-features = [ "nix-command" "flakes" ];
@@ -203,7 +192,7 @@
             };
           };
         in nixpkgs.lib.nixosSystem {
-          inherit pkgs specialArgs;
+          inherit system specialArgs;
           modules = [
             ./hosts/${hostName}/configuration.nix
             ./hosts/${hostName}/hardware-configuration.nix
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index a9c8eacc..6921c4ad 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -183,6 +183,7 @@
   windowrule = workspace 6,(Signal)
   windowrule = workspace 6,(fractal)
   windowrule = workspace 6,(discord)
+  windowrule = workspace 6,(Ferdium)
 
   # 7: [v]ideo
   bind = SUPER, V, moveworkspacetomonitor, 7 current
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 0ffa4291..b7ee4c85 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -13,8 +13,10 @@
     libsForQt5.polkit-kde-agent
     mc
     signal-desktop
+    ferdium
     libreoffice
     zotero
+    minesweep-rs
   ];
   programs = {
     firefox.package = pkgs.firefox-wayland;
diff --git a/hosts/Ronin/configuration.nix b/hosts/Ronin/configuration.nix
index 335e8773..4d3c0ec5 100644
--- a/hosts/Ronin/configuration.nix
+++ b/hosts/Ronin/configuration.nix
@@ -1,7 +1,7 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{ ... }: {
+{ lib, ... }: {
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -18,6 +18,8 @@
   environment.etc."ppp/options".text = ''
     ipcp-accept-remote
   '';
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [ "nomachine-client" ];
   services.syncthing.settings.folders = {
     "Archive".enable = false;
     "Books".enable = false;
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index cf172a54..8166da47 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -1,12 +1,7 @@
 { config, pkgs, lib, user, ... }:
 
 {
-  home.packages = with pkgs; [
-    openfortivpn
-    nomachine-client
-    teams-for-linux
-    zoom-us
-  ];
+  home.packages = with pkgs; [ openfortivpn nomachine-client teams-for-linux ];
   programs = {
     git.userEmail = "evie.litherland-smith@ukaea.uk";
     ssh.matchBlocks = {
diff --git a/system/hyprland.nix b/system/hyprland.nix
index 9b8f6011..d082bdb0 100644
--- a/system/hyprland.nix
+++ b/system/hyprland.nix
@@ -1,5 +1,12 @@
 { pkgs, user ? "xenia", hyprland, ... }: {
   imports = [ ./desktop.nix hyprland.nixosModules.default ];
+  nixpkgs.overlays = [
+    (final: prev: {
+      waybar = prev.waybar.overrideAttrs (oldAttrs: {
+        mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+      });
+    })
+  ];
   environment.systemPackages = with pkgs; [
     libsForQt5.polkit-kde-agent
     xdg-utils
diff --git a/system/steam.nix b/system/steam.nix
index 548fe1b2..a4109dc4 100644
--- a/system/steam.nix
+++ b/system/steam.nix
@@ -1,6 +1,8 @@
-{ ... }:
+{ lib, ... }:
 
 {
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [ "steam" "steam-original" "steam-run" ];
   hardware = {
     opengl.driSupport32Bit = true;
     steam-hardware.enable = true;