nixos-pc: added unsloth-desktop

nero: added comfyui
flake: re-add affinity-nix with corrected pkgs
2026-11-06 01:11:14 -05:00 · 2026-11-05 23:51:48 -05:00 · 2026-11-05 11:59:52 -05:00 · 2026-11-05 09:11:21 -05:00 · 2026-11-05 09:02:48 -05:00 · 2026-11-04 10:05:30 -05:00
4 changed files with 114 additions and 189 deletions
@@ -4,31 +4,27 @@
      "inputs": {
        "corefonts": "corefonts",
        "crane": "crane",
-        "elemental-wine-source": "elemental-wine-source",
-        "fenix": "fenix",
        "flake-compat": "flake-compat",
        "flake-parts": "flake-parts",
        "git-hooks": "git-hooks",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-wine": "nixpkgs-wine",
+        "nixpkgs": "nixpkgs_2",
        "on-linux": "on-linux",
        "plugin-loader-src": "plugin-loader-src",
-        "plugin-loader-v030-src": "plugin-loader-v030-src",
-        "treefmt-nix": "treefmt-nix"
+        "treefmt-nix": "treefmt-nix",
+        "windows-rs": "windows-rs",
+        "wintypes_shim": "wintypes_shim"
      },
      "locked": {
-        "lastModified": 1791817262,
-        "narHash": "sha256-emQQYtsQu2xpHKwDnyCu3ZiNRhJeQ/QqHeFV5wAixlg=",
-        "owner": "Meo98",
-        "repo": "affinity-nix-fork",
-        "rev": "266d3ebf76da365f6431bddc493338d1978bb340",
+        "lastModified": 1792710311,
+        "narHash": "sha256-Uyd6UpHOZ6ly18cIlWz6HBIw5TfV4lCqVpcr01Lzer0=",
+        "owner": "mrshmllow",
+        "repo": "affinity-nix",
+        "rev": "69c5cb42a7dd596027183776d82bf206d732fc91",
        "type": "github"
      },
      "original": {
-        "owner": "Meo98",
-        "repo": "affinity-nix-fork",
+        "owner": "mrshmllow",
+        "repo": "affinity-nix",
        "type": "github"
      }
    },
@@ -55,11 +51,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1793658360,
-        "narHash": "sha256-l/WITj879zdsCKb9+SmaThMZI9QNaRne5axKNTZ3Xu0=",
+        "lastModified": 1793743605,
+        "narHash": "sha256-P0mEatSGxafaOJq0U2KCXHdLOEVceTx35nFxOp0bBEU=",
        "owner": "kem-a",
        "repo": "AppManager",
-        "rev": "b86f728d37a3859148a3c6941822d1c11483497d",
+        "rev": "c42aaeabbc52d24c6be52a38b30057e89507ca9d",
        "type": "github"
      },
      "original": {
@@ -106,11 +102,11 @@
    },
    "crane": {
      "locked": {
-        "lastModified": 1778106249,
-        "narHash": "sha256-cM/AuKy5tMhwOOQIbha8ZRRMHVfNf7cv2aljIw+qoCg=",
+        "lastModified": 1792350552,
+        "narHash": "sha256-292lvpvxTGKryKxh3/3tcIVi85CwYGdl4oOi113Sob8=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "6d015ea29630b7ad2402841386da2cb617a470a7",
+        "rev": "e675a36b7377bebe41d548388a2501cbb16d380d",
        "type": "github"
      },
      "original": {
@@ -119,47 +115,6 @@
        "type": "github"
      }
    },
-    "elemental-wine-source": {
-      "flake": false,
-      "locked": {
-        "host": "gitlab.winehq.org",
-        "lastModified": 1722747031,
-        "narHash": "sha256-XVhz9p2kgFBoJ376vg8OaFXxcMEjAe9AK1hk0I1rb1Q=",
-        "owner": "ElementalWarrior",
-        "repo": "wine",
-        "rev": "a7c9b19e1a26cf49c63a7c19189a3e2bbe2c6ac2",
-        "type": "gitlab"
-      },
-      "original": {
-        "host": "gitlab.winehq.org",
-        "owner": "ElementalWarrior",
-        "ref": "affinity-photo3-wine9.13-part3",
-        "repo": "wine",
-        "type": "gitlab"
-      }
-    },
-    "fenix": {
-      "inputs": {
-        "nixpkgs": [
-          "affinity-nix",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1777969788,
-        "narHash": "sha256-8sr3w0KyQ0K7TEd8pYwYrxiDk0GZ4A7iIcl1lsxlzVM=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "3abc2d5559f4dc30c710ab152abcb4cb60b561ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
    "flake-compat": {
      "locked": {
        "lastModified": 1751685974,
@@ -208,11 +163,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1777988971,
-        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
+        "lastModified": 1790898470,
+        "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
+        "rev": "024633cd702b10285db5cb19b40ad48d2399ba60",
        "type": "github"
      },
      "original": {
@@ -281,15 +236,14 @@
    "git-hooks": {
      "inputs": {
        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1776796298,
-        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
+        "lastModified": 1791909798,
+        "narHash": "sha256-VAhpCOmrun/KXimYfR8NM88bciKCui7CqHHhThSzgag=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
+        "rev": "1ba1dbfe28738c9a71c266be6efa5b89e75491a9",
        "type": "github"
      },
      "original": {
@@ -298,28 +252,6 @@
        "type": "github"
      }
    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "affinity-nix",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -327,11 +259,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1793193205,
-        "narHash": "sha256-X6xa6sGA7RnJQuZGbFMC+K+KToWAlBDCCjJXfTwEPsw=",
+        "lastModified": 1793757180,
+        "narHash": "sha256-gyV7AtCwLnOImcrfSETP4J3Ie96bz19DY47B7m7Y3HM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "095fef2f265c3c0da4fe315efba8f8a04495ab34",
+        "rev": "b787c48e2ec57a9d098f5c2721882a3bc1e16f97",
        "type": "github"
      },
      "original": {
@@ -400,11 +332,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1770073757,
-        "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=",
+        "lastModified": 1787631388,
+        "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "47472570b1e607482890801aeaf29bfb749884f6",
+        "rev": "ac6b2166e7a9375683b8e98f860f273222337b16",
        "type": "github"
      },
      "original": {
@@ -432,11 +364,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1777168982,
-        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
+        "lastModified": 1790477367,
+        "narHash": "sha256-oujbxmVKDhci2E4EM3KyAbRUgp5/IsCoiA/LfEF7OOk=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
+        "rev": "f7cd230690d9fc982d06129f9189b101fddcfa3b",
        "type": "github"
      },
      "original": {
@@ -445,22 +377,6 @@
        "type": "github"
      }
    },
-    "nixpkgs-wine": {
-      "locked": {
-        "lastModified": 1735834308,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
-        "type": "github"
-      }
-    },
    "nixpkgs-xr": {
      "inputs": {
        "flake-compat": "flake-compat_3",
@@ -473,11 +389,11 @@
        "treefmt-nix": "treefmt-nix_2"
      },
      "locked": {
-        "lastModified": 1793683985,
-        "narHash": "sha256-95RFPSonEkUxxtbTdbNKIM9vCX0FfUywzJ0CyBpzEbw=",
+        "lastModified": 1793768445,
+        "narHash": "sha256-jMMSzsfPFmsX4d6YEDZqHF2BpJmuSMiMaeyqhHA6vZ8=",
        "owner": "nix-community",
        "repo": "nixpkgs-xr",
-        "rev": "21d553046b5e8fb217f0df1b12bf0fbe902cbb1c",
+        "rev": "5243cdffccd2b40b76e5116ad498bbbcb629a84f",
        "type": "github"
      },
      "original": {
@@ -488,11 +404,27 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1770107345,
-        "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=",
+        "lastModified": 1791048980,
+        "narHash": "sha256-KgItSKML8Xvte0B7/uGnBDsYzSnnKHcOaiUbgWBXLXw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4",
+        "rev": "a7868a727837f3c09cee2ce0ca671c76b1589fed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1790149054,
+        "narHash": "sha256-FfjXg6mAzKQBCY+7V9keGWOXG4DV2Eym/qA987lFl8A=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "8825bebf6324e0579d012936eff73379af284b6d",
        "type": "github"
      },
      "original": {
@@ -502,13 +434,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1793540411,
-        "narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=",
+        "lastModified": 1793726008,
+        "narHash": "sha256-jQp1wKvbwWdLBASTXkSi/VYmDJ5AbBi1WvcMt9HWJC8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f",
+        "rev": "1d060086d60cb76a40cf37109f979d88a5bd6396",
        "type": "github"
      },
      "original": {
@@ -551,11 +483,11 @@
    "on-linux": {
      "flake": false,
      "locked": {
-        "lastModified": 1772699425,
-        "narHash": "sha256-xhqkN2I5r+Ty2k8HEsLg5e8Eaazb0Qyioqjs87BQOnY=",
+        "lastModified": 1787435510,
+        "narHash": "sha256-ENn1Xh+JR+6ITt3oe4DC0EiTT2b6PErPQTFPkYQRJBA=",
        "owner": "seapear",
        "repo": "AffinityOnLinux",
-        "rev": "a0c4421946709c24c3f371fcbf15a45b814f188c",
+        "rev": "4dd5635eab8502bd4653e2e478478af04ff84449",
        "type": "github"
      },
      "original": {
@@ -603,23 +535,6 @@
        "type": "github"
      }
    },
-    "plugin-loader-v030-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1775508798,
-        "narHash": "sha256-cD2G3M83wCEXVMMl9YoHMLxPIvbXeESgQTkXiM+lzns=",
-        "owner": "noahc3",
-        "repo": "AffinityPluginLoader",
-        "rev": "bd93bbf9f84735d8ba6538596620bbe8d8b90efd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "noahc3",
-        "ref": "v0.3.0",
-        "repo": "AffinityPluginLoader",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "affinity-nix": "affinity-nix",
@@ -630,7 +545,7 @@
        "lazyvim": "lazyvim",
        "nix-darwin": "nix-darwin",
        "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
        "nixpkgs-xr": "nixpkgs-xr",
        "pi": "pi",
        "scopebuddy": "scopebuddy",
@@ -638,23 +553,6 @@
        "xivlauncher-rb": "xivlauncher-rb"
      }
    },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1777924689,
-        "narHash": "sha256-9Z0puLyCSYvtYhP1IZMxC05DSgwA+5rE99jsv1KErc4=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "91c7c2c4ca6a0520cfbf97e369e4fb7bf0b63b7a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
    "scopebuddy": {
      "inputs": {
        "nixpkgs": [
@@ -742,14 +640,14 @@
    },
    "treefmt-nix": {
      "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1775636079,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "lastModified": 1791885023,
+        "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c",
        "type": "github"
      },
      "original": {
@@ -779,6 +677,39 @@
        "type": "github"
      }
    },
+    "windows-rs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1771531570,
+        "narHash": "sha256-UmhpbCd3+0We7JiXFXgcS8jWMnZI2NRqPOs+UOsjrUc=",
+        "owner": "microsoft",
+        "repo": "windows-rs",
+        "rev": "628f84c51645217c7a06a20774ea1275dc7270ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "microsoft",
+        "repo": "windows-rs",
+        "rev": "628f84c51645217c7a06a20774ea1275dc7270ca",
+        "type": "github"
+      }
+    },
+    "wintypes_shim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1750396180,
+        "narHash": "sha256-E3go8SmUkAWrxQnr852WQB0huzdkO7CWiuB8Q2QyMZ4=",
+        "owner": "ElementalWarrior",
+        "repo": "wine-wintypes.dll-for-affinity",
+        "rev": "f8a2d42ba3abc5dcdc584daa6728a2fa019be72e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ElementalWarrior",
+        "repo": "wine-wintypes.dll-for-affinity",
+        "type": "github"
+      }
+    },
    "xivlauncher-core-src": {
      "flake": false,
      "locked": {
@@ -1,6 +1,7 @@
 {
  inputs = {
    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    affinity-nix.url = "github:mrshmllow/affinity-nix";

    sops-nix = {
      url = "github:Mic92/sops-nix";
@@ -32,11 +33,6 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    affinity-nix = {
-      url = "github:Meo98/affinity-nix-fork";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
    nix-flatpak = {
      url = "github:gmodena/nix-flatpak/?ref=latest";
    };
@@ -72,10 +68,10 @@
      self,
      nixpkgs,
      nixpkgs-xr,
+      affinity-nix,
      nix-darwin,
      nix-flatpak,
      home-manager,
-      affinity-nix,
      sops-nix,
      affinity-thumbnailer-kde,
      cheatengine,
@@ -25,6 +25,10 @@

    flatpak = {
      packages = [
+        {
+          appId = "org.comfy.ComfyDesktop";
+          origin = "flatpark";
+        }
        {
          appId = "com.discordapp.Discord";
          origin = "flathub";
@@ -1,6 +1,5 @@
 {
  pkgs,
-  lib,
  inputs,
  ...
 }:
@@ -19,6 +18,8 @@
    ./nix-package-manager.nix
  ];

+  nixpkgs.overlays = [ inputs.affinity-nix.overlays.default ];
+
  boot = {
    consoleLogLevel = 3;

@@ -49,6 +50,10 @@
  services = {
    flatpak = {
      packages = [
+        {
+          appId = "com.blackmagic.Resolve";
+          origin = "flatpark";
+        }
        {
          appId = "io.github.HakanSeven12.OpenCadStudio";
          origin = "flatpark";
@@ -155,19 +160,6 @@
    };
  };

-  nixpkgs = {
-    # Fix msitools compiling and failing it's test-suite.
-    overlays = [
-      (final: prev: {
-        msitools = prev.msitools.overrideAttrs (old: {
-          doCheck = false;
-        });
-      })
-
-      inputs.affinity-nix.overlays.default
-    ];
-  };
-
  environment = {
    systemPackages =
      import ../../features/common-pkgs.nix { inherit pkgs; }
@@ -179,13 +171,15 @@
        hunspell
        hunspellDicts.en_US
        hyphenDicts.en_US
-        affinity-v3
        libreoffice-qt
        qimgv
        mpv
        vorta
        distrobox
        rtk
+        inkscape
+        affinity-v3
+        unsloth-desktop

        inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default
        inputs.pi.packages.${pkgs.stdenv.hostPlatform.system}.default
Author	SHA1	Message	Date
floturcocantsee	0f0e173f30	nixos-pc: added unsloth-desktop ci / check-flake (push) Successful in 1m43s Details	2026-11-06 01:11:14 -05:00
floturcocantsee	b90d81888d	nero: added comfyui ci / check-flake (push) Successful in 1m42s Details	2026-11-05 23:51:48 -05:00
floturcocantsee	dac1d8710a	flake: re-add affinity-nix with corrected pkgs ci / check-flake (push) Successful in 1m40s Details	2026-11-05 11:59:52 -05:00
floturcocantsee	5eaf0cdcea	flake: remove affinity-nix from flake ci / check-flake (push) Successful in 1m40s Details	2026-11-05 09:11:21 -05:00
floturcocantsee	ee15e492b2	nixos-pc: added davinci resolve flatpak ci / check-flake (push) Successful in 1m41s Details	2026-11-05 09:02:48 -05:00
floturcocantsee	423dc200cd	nixos-pc: added inkscape package ci / check-flake (push) Successful in 1m41s Details	2026-11-04 10:05:30 -05:00
floturcocantsee	e0cabce1ec	flake: update flake	2026-11-04 10:05:06 -05:00