From 26e096f020284935018b648b83fb6adf251552c7 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Sun, 29 Sep 2024 23:39:04 -0400
Subject: [PATCH] config

---
 flake.lock    | 81 ++++++++++++++++++++++++++++++++++++++++++++++++---
 flake.nix     |  4 ++-
 home/home.nix | 37 +++++++++++++++++++----
 3 files changed, 111 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 398640b..2e23c8c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,44 @@
 {
   "nodes": {
+    "affinity-nix": {
+      "inputs": {
+        "elemental-wine-source": "elemental-wine-source",
+        "nixpkgs": "nixpkgs",
+        "winetricks-source": "winetricks-source"
+      },
+      "locked": {
+        "lastModified": 1727655411,
+        "narHash": "sha256-0JWYShfwtE9hfHOggfbovEVHQeh84xfDE2p0fLXGzl4=",
+        "owner": "mrshmllow",
+        "repo": "affinity-nix",
+        "rev": "d57cc00e0cc09d05652f93df5167d8d165eb7efa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mrshmllow",
+        "repo": "affinity-nix",
+        "type": "github"
+      }
+    },
+    "elemental-wine-source": {
+      "flake": false,
+      "locked": {
+        "host": "gitlab.winehq.org",
+        "lastModified": 1693121664,
+        "narHash": "sha256-eMN4SN8980yteYODN2DQIVNEJMsGQE8OIdPs/7DbvqQ=",
+        "owner": "ElementalWarrior",
+        "repo": "wine",
+        "rev": "c12ed1469948f764817fa17efd2299533cf3fe1c",
+        "type": "gitlab"
+      },
+      "original": {
+        "host": "gitlab.winehq.org",
+        "owner": "ElementalWarrior",
+        "ref": "c12ed1469948f764817fa17efd2299533cf3fe1c",
+        "repo": "wine",
+        "type": "gitlab"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -82,11 +121,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1727613673,
-        "narHash": "sha256-qqIffTQfxMYo3MKQ9BoY2s2mdKZNnUiksdnxv81js9U=",
+        "lastModified": 1727665282,
+        "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f5c239fa9acb27f0a5326ba2949c00fada89ca9f",
+        "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5",
         "type": "github"
       },
       "original": {
@@ -128,16 +167,50 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "affinity-nix": "affinity-nix",
         "home-manager": "home-manager",
         "kmonad": "kmonad",
         "musnix": "musnix",
         "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable"
       }
+    },
+    "winetricks-source": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1704453875,
+        "narHash": "sha256-YTEgb19aoM54KK8/IjrspoChzVnWAEItDlTxpfpS52w=",
+        "owner": "winetricks",
+        "repo": "winetricks",
+        "rev": "bc91718a5cad45e9f33de9b351a5960d5395bed5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "winetricks",
+        "ref": "20240105",
+        "repo": "winetricks",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 0922109..44886ab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,8 @@
 
     nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch. Use github:gmodena/nix-flatpak/?ref=<tag> to pin releases.
 
+    affinity-nix.url = "github:mrshmllow/affinity-nix";
+
     kmonad = {
       url = "git+https://github.com/kmonad/kmonad?submodules=1&dir=nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -24,7 +26,7 @@
     };
   };
 
-  outputs = {self, nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, kmonad, musnix, ... } @inputs: {
+  outputs = inputs @ {self, nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, kmonad, musnix, affinity-nix, ... }: {
     nixosConfigurations = {
       eddie = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
diff --git a/home/home.nix b/home/home.nix
index b1c490e..e49231b 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -1,7 +1,5 @@
-{ nix-flatpak, lib, pkgs, inputs, ... }:
+{ nix-flatpak, lib, pkgs, inputs, affinity-nix, ... }:
 {
-  nixpkgs.config.allowUnfree = true;
-
   home = {
     packages = with pkgs; [
       gnupg
@@ -29,17 +27,42 @@
       pass
       dconf
 
-      gnutils
+      gcc
+      gnutls
+      gettext
+      xorg.libX11
+      freetype.dev
       gnumake
+      flex
+      bison
+      mesa
+
+      sane-airscan
+      xsane
+      opencl-headers
+      opencl-clang
+      pcapc
+      pcsclite
+      dbus
+      xsane
+      libusb1
+      v4l-utils
+      libgphoto2
+      gphoto2
+      pulseaudio.dev
+      gst_all_1.gstreamer
+      alsa-oss
+      fontconfig
+      vulkan-headers
+      vulkan-utility-libraries
 
-      mesa      
       usbutils
       pciutils
       util-linux
       coreutils
       libgcc
       raylib
-      SDL2
+      SDL2.dev
       protonplus
 
       ruby
@@ -140,6 +163,8 @@
       guitarix
       FIL-plugins
       geonkick
+
+      inputs.affinity-nix.packages.x86_64-linux.designer
     ];
 
     username = "emenel";