From 2e3be3f00d81ad27c3ba20491a11b75bcfd425dc Mon Sep 17 00:00:00 2001
From: insert <insert@insertapp.net>
Date: Thu, 6 Feb 2025 17:52:37 -0500
Subject: [PATCH] sync

---
 configuration.nix        | 14 ++++++--------
 flake.nix                |  6 +++---
 home.nix                 |  2 +-
 special/insertpcname.nix | 11 +++++++++++
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 7829dfa..008a0b3 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -92,7 +92,7 @@
 
   # Enable sound with pipewire.
   #sound.enable = true;
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   #hardware.pulseaudio.support32Bit = true;
   #hardware.pulseaudio.extraConfig = "load-module module-combine-sink";
   security.rtkit.enable = true;
@@ -126,7 +126,7 @@
   users.users.insert = {
     isNormalUser = true;
     description = "insert";
-    extraGroups = [ "networkmanager" "wheel" "input" "docker" "audio" "libvirtd" ];
+    extraGroups = [ "networkmanager" "wheel" "input" "docker" "audio" "libvirtd" "adbusers"];
     shell = pkgs.zsh;
   };
 
@@ -190,6 +190,8 @@
   pkgs.wayland
   pkgs.docker-compose
   pkgs.networkmanagerapplet
+  pkgs.SDL2
+  pkgs.glfw
   #pkgs.sway
   inputs.agenix.packages."${pkgs.system}".default
   pkgs.vlc
@@ -218,6 +220,7 @@
   services.tailscale.enable = true;
   services.gvfs.enable = true;
   programs.steam.enable = true;
+  programs.adb.enable = true;
 
   programs.gnupg.agent = {
     enable = true;
@@ -240,8 +243,7 @@
       freeMemThreshold = 8;
       enableNotifications = true;
       extraArgs = [
-          "-g" "--avoid '^(X|hypr.*|kitty|wayland)$'"
-          "--prefer '^(electron|librewolf|firefox|java|minecraft.*)$'"
+          "-g"
       ];
   };
 
@@ -314,10 +316,6 @@
   #xdg.portal = { enable = true; extraPortals = [ inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland ]; };
   #xdg.portal = { enable = true; };
 
-  nix.settings = {
-    substituters = ["https://hyprland.cachix.org"];
-    trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
-  };
 
   services.nscd.config = ''
   server-user             nscd
diff --git a/flake.nix b/flake.nix
index 8ea0532..9495e63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
     nixosConfigurations.insertpclinux = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs; };
       modules = [
-        flatpaks.nixosModules.default
+        flatpaks.nixosModules.declarative-flatpak
         ./configuration.nix
         ./special/insertpclinux.nix
         agenix.nixosModules.default
@@ -32,7 +32,7 @@
     nixosConfigurations.insertpcname = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs; };
       modules = [
-        flatpaks.nixosModules.default
+        flatpaks.nixosModules.declarative-flatpak
         ./configuration.nix
         ./special/insertpcname.nix
         agenix.nixosModules.default
@@ -48,7 +48,7 @@
     nixosConfigurations.insertlaptop = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs; };
       modules = [
-        flatpaks.nixosModules.default
+        flatpaks.nixosModules.declarative-flatpak
         ./configuration.nix
         ./special/insertlaptop.nix
         agenix.nixosModules.default
diff --git a/home.nix b/home.nix
index b467119..066ff7c 100644
--- a/home.nix
+++ b/home.nix
@@ -230,7 +230,7 @@
   };
 
   services.cliphist = {
-    enable = false; #TODO: change once fixed
+    enable = true;
     allowImages = true;
   };
 
diff --git a/special/insertpcname.nix b/special/insertpcname.nix
index b6173b2..54511e7 100644
--- a/special/insertpcname.nix
+++ b/special/insertpcname.nix
@@ -118,6 +118,17 @@
   #  WLR_DRM_DEVICES = "/dev/dri/card1:/dev/dri/card2";
   #};
 
+  environment.systemPackages = [
+    pkgs.wivrn
+  ];
+
+  services.wivrn = {
+    enable = true;
+    autoStart = false;
+    defaultRuntime = true;
+    extraPackages = [pkgs.monado-vulkan-layers];
+  };
+
   home-manager.users.insert.home.file.".config/hypr/hyprland.conf" = {
   text = ''autogenerated = 0 # remove this line to remove the warning