diff --git a/flake.lock b/flake.lock index 584a3d7..b19b797 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,33 @@ { "nodes": { + "affinity-nix": { + "inputs": { + "corefonts": "corefonts", + "crane": "crane", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_2", + "on-linux": "on-linux", + "plugin-loader-src": "plugin-loader-src", + "treefmt-nix": "treefmt-nix", + "windows-rs": "windows-rs", + "wintypes_shim": "wintypes_shim" + }, + "locked": { + "lastModified": 1792710311, + "narHash": "sha256-Uyd6UpHOZ6ly18cIlWz6HBIw5TfV4lCqVpcr01Lzer0=", + "owner": "mrshmllow", + "repo": "affinity-nix", + "rev": "69c5cb42a7dd596027183776d82bf206d732fc91", + "type": "github" + }, + "original": { + "owner": "mrshmllow", + "repo": "affinity-nix", + "type": "github" + } + }, "affinity-thumbnailer-kde": { "inputs": { "nixpkgs": [ @@ -56,7 +84,67 @@ "type": "github" } }, + "corefonts": { + "flake": false, + "locked": { + "lastModified": 1431183738, + "narHash": "sha256-610Km9GCtYWxi2SH5jH/XYPXc5f58q5lB05/5XxO/qM=", + "owner": "pushcx", + "repo": "corefonts", + "rev": "8f8627b0004b5f1b952c09cf6390e4ae46475e59", + "type": "github" + }, + "original": { + "owner": "pushcx", + "repo": "corefonts", + "type": "github" + } + }, + "crane": { + "locked": { + "lastModified": 1792350552, + "narHash": "sha256-292lvpvxTGKryKxh3/3tcIVi85CwYGdl4oOi113Sob8=", + "owner": "ipetkov", + "repo": "crane", + "rev": "e675a36b7377bebe41d548388a2501cbb16d380d", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "flake-compat": { + "locked": { + "lastModified": 1751685974, + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -70,6 +158,24 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1790898470, + "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -127,6 +233,25 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1791909798, + "narHash": "sha256-VAhpCOmrun/KXimYfR8NM88bciKCui7CqHHhThSzgag=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "1ba1dbfe28738c9a71c266be6efa5b89e75491a9", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -207,16 +332,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1793726008, - "narHash": "sha256-jQp1wKvbwWdLBASTXkSi/VYmDJ5AbBi1WvcMt9HWJC8=", + "lastModified": 1787631388, + "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d060086d60cb76a40cf37109f979d88a5bd6396", + "rev": "ac6b2166e7a9375683b8e98f860f273222337b16", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -237,16 +362,31 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1790477367, + "narHash": "sha256-oujbxmVKDhci2E4EM3KyAbRUgp5/IsCoiA/LfEF7OOk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "f7cd230690d9fc982d06129f9189b101fddcfa3b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-xr": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], "nvfetcher": "nvfetcher", "systems": "systems_2", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1793768445, @@ -262,6 +402,54 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1791048980, + "narHash": "sha256-KgItSKML8Xvte0B7/uGnBDsYzSnnKHcOaiUbgWBXLXw=", + "owner": "nixos", + "repo": "nixpkgs", + "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": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1793726008, + "narHash": "sha256-jQp1wKvbwWdLBASTXkSi/VYmDJ5AbBi1WvcMt9HWJC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1d060086d60cb76a40cf37109f979d88a5bd6396", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nvfetcher": { "inputs": { "flake-compat": [ @@ -292,6 +480,22 @@ "type": "github" } }, + "on-linux": { + "flake": false, + "locked": { + "lastModified": 1787435510, + "narHash": "sha256-ENn1Xh+JR+6ITt3oe4DC0EiTT2b6PErPQTFPkYQRJBA=", + "owner": "seapear", + "repo": "AffinityOnLinux", + "rev": "4dd5635eab8502bd4653e2e478478af04ff84449", + "type": "github" + }, + "original": { + "owner": "seapear", + "repo": "AffinityOnLinux", + "type": "github" + } + }, "pi": { "inputs": { "nixpkgs": [ @@ -314,8 +518,26 @@ "type": "github" } }, + "plugin-loader-src": { + "flake": false, + "locked": { + "lastModified": 1776972538, + "narHash": "sha256-2EvrOYQCB2Z2YXhcPnjR67KoOCvwTVW3TfLcmU3//ak=", + "owner": "noahc3", + "repo": "AffinityPluginLoader", + "rev": "1d7956d5b791bd6a213e8b28c1e25e1f4bcc6166", + "type": "github" + }, + "original": { + "owner": "noahc3", + "repo": "AffinityPluginLoader", + "rev": "1d7956d5b791bd6a213e8b28c1e25e1f4bcc6166", + "type": "github" + } + }, "root": { "inputs": { + "affinity-nix": "affinity-nix", "affinity-thumbnailer-kde": "affinity-thumbnailer-kde", "appimage-manager": "appimage-manager", "cheatengine": "cheatengine", @@ -323,7 +545,7 @@ "lazyvim": "lazyvim", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_4", "nixpkgs-xr": "nixpkgs-xr", "pi": "pi", "scopebuddy": "scopebuddy", @@ -417,6 +639,24 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1791885023, + "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs-xr", @@ -437,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": { diff --git a/flake.nix b/flake.nix index 03a7f19..c1f3758 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; @@ -67,6 +68,7 @@ self, nixpkgs, nixpkgs-xr, + affinity-nix, nix-darwin, nix-flatpak, home-manager, diff --git a/hosts/shared/nixos-pc.nix b/hosts/shared/nixos-pc.nix index 3b60e90..67737cc 100644 --- a/hosts/shared/nixos-pc.nix +++ b/hosts/shared/nixos-pc.nix @@ -18,6 +18,8 @@ ./nix-package-manager.nix ]; + nixpkgs.overlays = [ inputs.affinity-nix.overlays.default ]; + boot = { consoleLogLevel = 3; @@ -176,6 +178,7 @@ distrobox rtk inkscape + affinity-v3 inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default inputs.pi.packages.${pkgs.stdenv.hostPlatform.system}.default