Compare commits

..
16 Commits
Author SHA1 Message Date
floturcocantsee ba14e3700a nero: add lsfg-vk and lsfg-vk-ui 2026-09-04 21:03:42 -04:00
floturcocantsee b430847585 nero: add waywallen flatpak package 2026-09-04 20:55:12 -04:00
floturcocantsee 37b34d35b0 flake: update flake 2026-09-03 15:53:52 -04:00
floturcocantsee 7ea59d0a58 flake: re-add cachyos-kernel 2026-09-02 22:36:35 -04:00
floturcocantsee 5210ab1743 repo: add assets folder containing things like icons 2026-09-02 14:49:47 -04:00
floturcocantsee c725c6e6d6 aseprite: rebase to latest stable 2026-09-02 10:18:10 -04:00
floturcocantsee b75b7c33f1 flake: update flake 2026-09-02 08:42:51 -04:00
floturcocantsee b3603b8b00 flake: update flake and swap affinity-nix for custom fork 2026-09-01 11:09:38 -04:00
floturcocantsee 42fd5dde77 nero: change out xivlauncher for xivlauncher-rb 2026-08-31 21:02:05 -04:00
floturcocantsee 9832335f0e nero: remove wine 2026-08-30 14:55:18 -04:00
floturcocantsee f66312d479 nero: backport older linux-firmware to work around GCN video decode issues 2026-08-30 12:17:11 -04:00
floturcocantsee 2c36ec7c38 flake: update flake 2026-08-30 12:01:35 -04:00
floturcocantsee cfe3179de6 nero: replace moonshine with sunshine 2026-08-27 16:35:52 -04:00
floturcocantsee f39c337509 looking-glass-client: update to latest dev release 2026-08-27 11:48:11 -04:00
floturcocantsee 017782050c nixos-pc: add p7zip 2026-08-27 11:34:46 -04:00
floturcocantsee 9dbf7040ad various: remove pre-commit and use devenv for env instead. 2026-08-27 11:32:14 -04:00
14 changed files with 477 additions and 239 deletions
+11
View File
@@ -1 +1,12 @@
**/result **/result
# Devenv
.devenv*
devenv.local.nix
devenv.local.yaml
# direnv
.direnv
# pre-commit
.pre-commit-config.yaml
-28
View File
@@ -1,28 +0,0 @@
repos:
- repo: local
hooks:
- id: nix-flake-check
name: Nix flake check
entry: nix flake check
language: system
pass_filenames: false
always_run: true
- id: nixos-drybuild-pdw-frankiel
name: pdw-frankiel build check
entry: nix build .#nixosConfigurations.pdw-frankiel.config.system.build.toplevel
language: system
pass_filenames: false
always_run: true
- id: nixos-drybuild-nero
name: nero build check
entry: nix build .#nixosConfigurations.nero.config.system.build.toplevel
language: system
pass_filenames: false
always_run: true
- id: nixos-drybuild-vergil
name: vergil build check
entry: nix build .#nixosConfigurations.vergil.config.system.build.toplevel
language: system
pass_filenames: false
always_run: true
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 535 535" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g id="gradient-logo" transform="matrix(1.066667,0,0,1.066667,-166.915961,573.398766)">
<g id="g955" transform="matrix(0.090488,0,0,0.090488,142.32381,-419.8252)">
<g id="g869" transform="matrix(11.047619,0,0,11.047619,-1572.2888,9377.7107)">
<g id="g932" transform="matrix(0.5,-0.866025,0.866025,0.5,502.346329,-28.654615)">
<path id="path3336-6" d="M449.719,-420.513L571.916,-208.838L515.759,-208.311L483.135,-265.18L450.278,-208.615L422.376,-208.626L408.085,-233.316L454.896,-313.806L421.666,-371.632L449.719,-420.513Z"/>
</g>
<path id="path4260-0" d="M309.549,-710.388L431.746,-498.713L375.589,-498.186L342.965,-555.056L310.109,-498.49L282.206,-498.501L267.915,-523.191L314.726,-603.681L281.496,-661.507L309.549,-710.388Z"/>
<g id="use3439-6" transform="matrix(0.5,0.866025,-0.866025,0.5,-235.379922,-976.790736)">
<path d="M449.719,-420.513L571.916,-208.838L515.759,-208.311L483.135,-265.18L450.278,-208.615L422.376,-208.626L408.085,-233.316L454.896,-313.806L421.666,-371.632L449.719,-420.513Z"/>
</g>
<g id="use3449-5" transform="matrix(-1,-0,0,-1,955.0072,-1141.63796)">
<path d="M449.719,-420.513L571.916,-208.838L515.759,-208.311L483.135,-265.18L450.278,-208.615L422.376,-208.626L408.085,-233.316L454.896,-313.806L421.666,-371.632L449.719,-420.513Z"/>
</g>
<g id="use4354-5" transform="matrix(-0.5,0.866025,-0.866025,-0.5,-9.137814,-1426.891401)">
<path d="M309.549,-710.388L431.746,-498.713L375.589,-498.186L342.965,-555.056L310.109,-498.49L282.206,-498.501L267.915,-523.191L314.726,-603.681L281.496,-661.507L309.549,-710.388Z"/>
</g>
<g id="use4362-2" transform="matrix(-0.5,-0.866025,0.866025,-0.5,1230.893908,-721.082971)">
<path d="M309.549,-710.388L431.746,-498.713L375.589,-498.186L342.965,-555.056L310.109,-498.49L282.206,-498.501L267.915,-523.191L314.726,-603.681L281.496,-661.507L309.549,-710.388Z"/>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

+117
View File
@@ -0,0 +1,117 @@
{
"nodes": {
"devenv": {
"locked": {
"dir": "src/modules",
"lastModified": 1787836922,
"narHash": "sha256-SeAM6TKoXxFLwHWgkaTIZi5L5doM6mMUT3WxshF+9Eg=",
"owner": "cachix",
"repo": "devenv",
"rev": "6cdf7c1e5845b4455d0c0e1461b4c4be4f43bd7d",
"type": "github"
},
"original": {
"dir": "src/modules",
"owner": "cachix",
"repo": "devenv",
"type": "github"
}
},
"flake-compat": {
"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"
}
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1787424939,
"narHash": "sha256-O2tBn84NNuHrnqNVxx/XqsXwfYvS1YwBh+7CBnbCYsk=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "809414f0cdadf82cf11b06c2b29ba9b3168b3297",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1782918843,
"narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e8273b29fe1390ec8d4603f2477357555291432e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-src": {
"flake": false,
"locked": {
"lastModified": 1787394516,
"narHash": "sha256-pRGOQSClnXNI2iLUG6DYpsGvYcuw0drOutVZFTJNw90=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c8f90650c15282fa8656a041bfbbd2403997a9a7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"inputs": {
"nixpkgs-src": "nixpkgs-src"
},
"locked": {
"lastModified": 1787753358,
"narHash": "sha256-Tl77VbWyAKrOfRNQhL6JbQtb/MLzbYa/1RG1gWWfICk=",
"owner": "cachix",
"repo": "devenv-nixpkgs",
"rev": "256551e45f6303e142ab4a98be1bf243feb77dc0",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "rolling",
"repo": "devenv-nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"devenv": "devenv",
"git-hooks": "git-hooks",
"nixpkgs": "nixpkgs_2"
}
}
},
"root": "root",
"version": 7
}
+57
View File
@@ -0,0 +1,57 @@
{
pkgs,
...
}:
{
languages = {
nix = {
enable = true;
lsp.package = pkgs.nil;
};
};
packages = with pkgs; [
nixfmt
];
git-hooks.hooks = {
nixfmt.enable = true;
nix-flake-check = {
enable = true;
name = "Nix Flake Check";
entry = "nix flake check";
language = "system";
pass_filenames = false;
always_run = true;
};
build-pdw-frankiel = {
enable = true;
name = "Build pdw-frankiel";
entry = "nix build .#nixosConfigurations.pdw-frankiel.config.system.build.toplevel";
language = "system";
pass_filenames = false;
always_run = true;
};
build-nero = {
enable = true;
name = "Build nero";
entry = "nix build .#nixosConfigurations.nero.config.system.build.toplevel";
language = "system";
pass_filenames = false;
always_run = true;
};
build-vergil = {
enable = true;
name = "Build vergil";
entry = "nix build .#nixosConfigurations.vergil.config.system.build.toplevel";
language = "system";
pass_filenames = false;
always_run = true;
};
};
}
+7
View File
@@ -0,0 +1,7 @@
# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
inputs:
nixpkgs:
url: github:cachix/devenv-nixpkgs/rolling
git-hooks:
url: github:cachix/git-hooks.nix
Generated
+188 -157
View File
@@ -4,7 +4,6 @@
"inputs": { "inputs": {
"corefonts": "corefonts", "corefonts": "corefonts",
"crane": "crane", "crane": "crane",
"fenix": "fenix",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
@@ -15,17 +14,17 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1786323743, "lastModified": 1788352532,
"narHash": "sha256-bPT6UmXMc33Rd4rU9O8eMHhLbsJuU6ZxC2V7VDlmfms=", "narHash": "sha256-A6mynfhs6RP0EkrS/8Ol35BROvj3Yjm/D9Ldr6B0jdU=",
"owner": "mrshmllow", "ref": "refs/heads/main",
"repo": "affinity-nix", "rev": "a384a464ec89cf4108ec705b7fb639da6fc21861",
"rev": "a67e334856b7bf0ab9b5b4f38dffd436c0b8a2e5", "revCount": 3,
"type": "github" "type": "git",
"url": "https://gitea.daguerro.net/floturcocantsee/affinity-nix"
}, },
"original": { "original": {
"owner": "mrshmllow", "type": "git",
"repo": "affinity-nix", "url": "https://gitea.daguerro.net/floturcocantsee/affinity-nix"
"type": "github"
} }
}, },
"affinity-thumbnailer-kde": { "affinity-thumbnailer-kde": {
@@ -49,11 +48,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1787510272, "lastModified": 1788378282,
"narHash": "sha256-RFJEjFd3m+RaXtAj2wnyNnclnlu32k2JZXMDwPfhQFM=", "narHash": "sha256-8kp7fVQaP1isK7cn5pjjoQyhXo06CNGBWfcncFpsB8c=",
"owner": "kem-a", "owner": "kem-a",
"repo": "AppManager", "repo": "AppManager",
"rev": "e966157fe404da7b7f899ba9ac802f4cb0b9fdb0", "rev": "3a02f8081c168237b6c9903d5df69a6766d9c06c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -67,11 +66,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1787555323, "lastModified": 1788182178,
"narHash": "sha256-8SY0Bs/Z4IXrLXyhguQ2ate7tB/x2Ud5lb2vvjaVDFQ=", "narHash": "sha256-wska1lRRu6KQLdhNs9k46n4wELsV/JCITfhGMxeDMks=",
"owner": "Hy4ri", "owner": "Hy4ri",
"repo": "cheatengine-flake", "repo": "cheatengine-flake",
"rev": "5a87d43ae808a42be8e8c9ba9db996bdd2bd4712", "rev": "0d99b7f1503fca1b16ecd584f33725f3ff05e8b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -98,11 +97,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1785782307, "lastModified": 1787326676,
"narHash": "sha256-MPaRdVkf6zZP5fCPxYCi8Dr4pZzgmXzg8T9nVEbp3Mw=", "narHash": "sha256-lWhBbBvC05/xwivKBBiM2YNizpmgqCgyOIzomvRuwxs=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "2c71e194474d13de031d729b729c968ddbe3507f", "rev": "692f7e9ef2ece8125b466f66f2af532b3edaed0d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -111,28 +110,6 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"affinity-nix",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1785919363,
"narHash": "sha256-4FDhl7ybhL5qhJw1X2IviFJ2MERnzV7X1HlJhFeSBXU=",
"owner": "nix-community",
"repo": "fenix",
"rev": "d17fa5c004217ac6e51da9a8c2d2b79b0ed37109",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1751685974, "lastModified": 1751685974,
@@ -231,11 +208,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1787559586, "lastModified": 1788306937,
"narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", "narHash": "sha256-lbrI1UYVpFgKSsyrU9oeF7FHfnu8nLD9ja0ou9f2rxk=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", "rev": "f16b25b8c3d2809b87925d0b76652d7821a75c68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -249,11 +226,11 @@
"nixpkgs-lib": "nixpkgs-lib_3" "nixpkgs-lib": "nixpkgs-lib_3"
}, },
"locked": { "locked": {
"lastModified": 1785627969, "lastModified": 1787559586,
"narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -301,17 +278,35 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1784288435, "lastModified": 1787138109,
"narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", "narHash": "sha256-O2tBn84NNuHrnqNVxx/XqsXwfYvS1YwBh+7CBnbCYsk=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", "rev": "928612b364dc241a05bf6567ad44d499efb6b9aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -393,11 +388,11 @@
}, },
"locked": { "locked": {
"dir": "packages/nix", "dir": "packages/nix",
"lastModified": 1787086436, "lastModified": 1788314497,
"narHash": "sha256-3Iphls5e/3XyoMh3TZJo0XknxNT1idLVabIqgRKUudY=", "narHash": "sha256-NiFndFWVN/sOMLUN1iEFEmqMpdcC0hnyPQSEs9eMGdo=",
"owner": "SteamClientHomebrew", "owner": "SteamClientHomebrew",
"repo": "Millennium", "repo": "Millennium",
"rev": "cecdc9532b76d16b7b63ddc206f5a8eb8c1afcaf", "rev": "a3d675611b68c5658a0b5ffd25b9f1b57c6d32ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -424,36 +419,18 @@
"type": "github" "type": "github"
} }
}, },
"moonshine": {
"inputs": {
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1787695495,
"narHash": "sha256-5oV7Oz+93bJqBbCdfHHuZWS50G65RGUXXdhlZPPl4x0=",
"owner": "hgaiser",
"repo": "moonshine",
"rev": "e8042341328adb81f2562f0b7f00bb6bc7122bd6",
"type": "github"
},
"original": {
"owner": "hgaiser",
"repo": "moonshine",
"type": "github"
}
},
"nix-cachyos-kernel": { "nix-cachyos-kernel": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1787680916, "lastModified": 1788379544,
"narHash": "sha256-0rP6wb7taotfTZ+ipmhg/Pj1L83Dq4CQPVgFofiPTKM=", "narHash": "sha256-EMfRomvn1lAErvY/Q3bQL+PwEi+5hbBwI0ZI5SRC/WM=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "28b6c686c97a44fd2021e999cb9e1752a344bd06", "rev": "d1c3cadc796061778cf7f62bdbfaf68cf3c3c654",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -504,14 +481,14 @@
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"git-hooks": "git-hooks_2", "git-hooks": "git-hooks_2",
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1787661543, "lastModified": 1788236945,
"narHash": "sha256-tdu60SfCThANXlH8PlrjM800UIgteKFFgvNGf0Zcz5Q=", "narHash": "sha256-MmEtOeX/RQlnan/jIgjFhm1j7KUKv8p5o7zRsXEEq3g=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "09ffbde748a0559a458c6fab3152e2b886dda5d8", "rev": "f4434220501c23e7154bca5262e5b2fd7efa4490",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -536,6 +513,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-firmware": {
"locked": {
"lastModified": 1782201461,
"narHash": "sha256-41VI8i5RESlcU7+LdPQ9ibz+4HQWixlE6wat2IYPrE0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "220e781eee89fa86f26d05c40a57eea1c691adec",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "220e781eee89fa86f26d05c40a57eea1c691adec",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1785031560, "lastModified": 1785031560,
@@ -553,11 +546,11 @@
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1785031560, "lastModified": 1788057806,
"narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -583,11 +576,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1787360063, "lastModified": 1788316716,
"narHash": "sha256-dt4WdcvsA8/RCe+VZZwqU0X+XMM3wBbGCWA0/sFWzGo=", "narHash": "sha256-bc7rSpXIdn9QWGNqfWcPZWOhEVF8NoeAZkWq0XWnf/k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c423e03bbafcff28bfadc6781a4a8257f205cb5", "rev": "3ed67ec0a4d3c7ab4ae1f04f8ee8df07bfa506a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -617,17 +610,17 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_12", "nixpkgs": "nixpkgs_11",
"nvfetcher": "nvfetcher", "nvfetcher": "nvfetcher",
"systems": "systems_2", "systems": "systems_2",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1787706980, "lastModified": 1788405061,
"narHash": "sha256-P5OhTuSgtii+T73x1pwiL8vp6poZw3PgVh661nYf2r0=", "narHash": "sha256-nRUNp66tgCNM54nNG99ryxyMasWybGZa0m6IpnJbOLA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-xr", "repo": "nixpkgs-xr",
"rev": "149d4a4672b9daf861b780c2fc2030d05b4078a2", "rev": "508c3e188e9a4d471d5f9d8468444efa3fd5b8b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -638,27 +631,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1787209939, "lastModified": 1788297115,
"narHash": "sha256-WvvHR4kSQLAbtouMC/ruZ5UpLwlUcY3K4FAllMN+yGk=", "narHash": "sha256-Z+vUNbfd2FIKkWOTkcT7RYlh3oFCnig/d2eXD1SWf2E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb", "rev": "a3116115851d68b8952a2a4221cc25a84e56b532",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1787204541,
"narHash": "sha256-OURZPknrTjQrlNyxPdqzyqmU/81Wes1CUP/Ft1Rv/YI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5880666fd9eb563038431edb35c2d0aa595884e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -668,13 +645,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_12": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1787498568, "lastModified": 1788179007,
"narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_12": {
"locked": {
"lastModified": 1788316716,
"narHash": "sha256-bc7rSpXIdn9QWGNqfWcPZWOhEVF8NoeAZkWq0XWnf/k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3ed67ec0a4d3c7ab4ae1f04f8ee8df07bfa506a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -686,27 +679,27 @@
}, },
"nixpkgs_13": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1787498568, "lastModified": 1780365719,
"narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1786106723, "lastModified": 1787135253,
"narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=", "narHash": "sha256-RD2kNWCG+Bjo6h+JVjWVNntZs2GtRoeY2xHjts/FNkA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238", "rev": "ffb3c9b700e759be2ef13237c9d8f953b32a1e46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -750,11 +743,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1787360063, "lastModified": 1788039129,
"narHash": "sha256-dt4WdcvsA8/RCe+VZZwqU0X+XMM3wBbGCWA0/sFWzGo=", "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c423e03bbafcff28bfadc6781a4a8257f205cb5", "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -798,32 +791,32 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1784497964, "lastModified": 1788329703,
"narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", "narHash": "sha256-fHvRW4JUchuw6QNzQ50BfzeYe0TnjKml1V8PVRjntSI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", "rev": "090e478bd64824e2122328df47a7efb74fdaf0c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1787673450, "lastModified": 1787964612,
"narHash": "sha256-VpX10752K0aIHRedU/tYY3jWr1+4rAx0JU4Hr+b8QQM=", "narHash": "sha256-0N9nghg3nwzX6b6qc77EzjR9cu/Z+UR66FlfsCqiURs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "103cb3a0b62b1d0a4560d265cdfbc0af064f6767", "rev": "e8be7818e19ada32105a8af937a6a473b38167ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable-small", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -861,11 +854,11 @@
"on-linux": { "on-linux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1785546009, "lastModified": 1787365621,
"narHash": "sha256-G1l+Byd3a0DMtwm84D2bXIKigMugYteh4ke+Mt1UZd8=", "narHash": "sha256-aRS0sZ6p7YJagjFaZFrS1zuvN3PVKNBJOze1Ek/bOi8=",
"owner": "seapear", "owner": "seapear",
"repo": "AffinityOnLinux", "repo": "AffinityOnLinux",
"rev": "916140f3677bf06f3552949e69f926ee0e50606c", "rev": "0fe210754999a2ace3039c11fbbd11b45b5ee399",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -900,37 +893,21 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"lazyvim": "lazyvim", "lazyvim": "lazyvim",
"millennium": "millennium", "millennium": "millennium",
"moonshine": "moonshine",
"nix-cachyos-kernel": "nix-cachyos-kernel", "nix-cachyos-kernel": "nix-cachyos-kernel",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_10",
"nixpkgs-firmware": "nixpkgs-firmware",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-xr": "nixpkgs-xr", "nixpkgs-xr": "nixpkgs-xr",
"scopebuddy": "scopebuddy" "scopebuddy": "scopebuddy",
} "xivlauncher-rb": "xivlauncher-rb"
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1785889825,
"narHash": "sha256-U98Y5RADVCkMCbrKCFXppe6MSAi0tUTLxi3cB/SMcZI=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "6817dd3094203c8bc4911f5799baf897623003de",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
} }
}, },
"scopebuddy": { "scopebuddy": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_13" "nixpkgs": "nixpkgs_12"
}, },
"locked": { "locked": {
"lastModified": 1787088847, "lastModified": 1787088847,
@@ -976,16 +953,31 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1785360170, "lastModified": 1786901030,
"narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1014,6 +1006,45 @@
"repo": "treefmt-nix", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
},
"xivlauncher-core-src": {
"flake": false,
"locked": {
"lastModified": 1787708281,
"narHash": "sha256-gKBcZh3Kt3nhENQNCg1dIBFxb18rvtEubrYTngdEjuA=",
"ref": "refs/tags/rb-v1.4.0.10",
"rev": "d0b5c53342cd876fdc6d242b68eaa570344feb69",
"revCount": 696,
"submodules": true,
"type": "git",
"url": "https://github.com/rankynbass/XIVLauncher.Core.git"
},
"original": {
"ref": "refs/tags/rb-v1.4.0.7",
"submodules": true,
"type": "git",
"url": "https://github.com/rankynbass/XIVLauncher.Core.git"
}
},
"xivlauncher-rb": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_13",
"xivlauncher-core-src": "xivlauncher-core-src"
},
"locked": {
"lastModified": 1787738399,
"narHash": "sha256-g6gjV/bPVBjUWhoV0N6gHsIpr/Uljgk0C5BDfoEplTI=",
"owner": "dawei-nh",
"repo": "xivlauncher-rb-nix",
"rev": "9d11571102093b342903d66b6e7ad5bb37fa8b68",
"type": "github"
},
"original": {
"owner": "dawei-nh",
"repo": "xivlauncher-rb-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
+28 -4
View File
@@ -2,6 +2,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-firmware.url = "github:NixOS/nixpkgs?rev=220e781eee89fa86f26d05c40a57eea1c691adec";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-26.05"; url = "github:nix-community/home-manager/release-26.05";
@@ -18,14 +19,15 @@
lazyvim.url = "github:pfassina/lazyvim-nix/v16.0.0"; lazyvim.url = "github:pfassina/lazyvim-nix/v16.0.0";
affinity-nix.url = "github:mrshmllow/affinity-nix"; #affinity-nix.url = "github:mrshmllow/affinity-nix";
affinity-nix.url = "git+https://gitea.daguerro.net/floturcocantsee/affinity-nix";
affinity-thumbnailer-kde = { affinity-thumbnailer-kde = {
url = "path:./packages/affinity-thumbnailer-kde"; url = "path:./packages/affinity-thumbnailer-kde";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
moonshine.url = "github:hgaiser/moonshine"; xivlauncher-rb.url = "github:dawei-nh/xivlauncher-rb-nix";
cheatengine.url = "github:Hy4ri/cheatengine-flake"; cheatengine.url = "github:Hy4ri/cheatengine-flake";
millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix";
scopebuddy.url = "github:HikariKnight/ScopeBuddy"; scopebuddy.url = "github:HikariKnight/ScopeBuddy";
@@ -40,6 +42,7 @@
self, self,
nixpkgs, nixpkgs,
nixpkgs-xr, nixpkgs-xr,
nixpkgs-firmware,
home-manager, home-manager,
nix-darwin, nix-darwin,
nix-flatpak, nix-flatpak,
@@ -48,7 +51,7 @@
millennium, millennium,
nix-cachyos-kernel, nix-cachyos-kernel,
cheatengine, cheatengine,
moonshine, xivlauncher-rb,
... ...
}: }:
let let
@@ -60,6 +63,9 @@
users.frank = ./home/frank.nix; users.frank = ./home/frank.nix;
}; };
}; };
nixos-system = "x86_64-linux";
nixos-pkgs = nixpkgs.legacyPackages.${nixos-system};
in in
{ {
nixosConfigurations = { nixosConfigurations = {
@@ -72,11 +78,24 @@
nixpkgs-xr.nixosModules.nixpkgs-xr nixpkgs-xr.nixosModules.nixpkgs-xr
nix-flatpak.nixosModules.nix-flatpak nix-flatpak.nixosModules.nix-flatpak
moonshine.nixosModules.default
affinity-thumbnailer-kde.nixosModules.default affinity-thumbnailer-kde.nixosModules.default
./hosts/nero/hardware.nix ./hosts/nero/hardware.nix
./hosts/nero/configuration.nix ./hosts/nero/configuration.nix
{
nixpkgs.overlays = [
(final: prev: {
linux-firmware =
nixpkgs-firmware.legacyPackages.${nixos-pkgs.stdenv.hostPlatform.system}.linux-firmware;
})
];
}
{
nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ];
nix.settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ];
}
]; ];
}; };
@@ -104,6 +123,11 @@
./hosts/pdw-frankiel/hardware.nix ./hosts/pdw-frankiel/hardware.nix
./hosts/pdw-frankiel/configuration.nix ./hosts/pdw-frankiel/configuration.nix
{
nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ];
nix.settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ];
}
]; ];
}; };
}; };
+16 -26
View File
@@ -27,6 +27,7 @@ in
kernelParams = [ kernelParams = [
"vfio-pci.ids=10de:2782,10de:22bc" "vfio-pci.ids=10de:2782,10de:22bc"
"video=DP=-3:1024x768@85" "video=DP=-3:1024x768@85"
"amdgpu.dcfeaturemask=2"
]; ];
}; };
@@ -35,6 +36,10 @@ in
services = { services = {
flatpak = { flatpak = {
packages = [ packages = [
{
appId = "org.waywallen.waywallen";
origin = "flathub";
}
{ {
appId = "com.discordapp.Discord"; appId = "com.discordapp.Discord";
origin = "flathub"; origin = "flathub";
@@ -76,32 +81,15 @@ in
autoStart = true; autoStart = true;
}; };
moonshine = { sunshine = {
enable = true; enable = true;
user = "frank"; autoStart = true;
uid = 1000; capSysAdmin = true;
openFirewall = true; openFirewall = true;
settings = { settings = {
application = [ encoder = "vulkan";
{ output_name = 3;
title = "Steam";
command = [
"/run/current-system/sw/bin/steam"
"steam://open/bigpicture"
];
}
];
application_scanner = [
{
type = "steam";
library = "$HOME/.local/share/Steam";
command = [
"/run/current-system/sw/bin/steam"
"-bigpicture"
"steam://rungameid/{game_id}"
];
}
];
}; };
}; };
}; };
@@ -154,12 +142,14 @@ in
gamescope gamescope
gamescope-wsi gamescope-wsi
cheatengine cheatengine
qbittorrent lsfg-vk
lsfg-vk-ui
unstable.qbittorrent
inputs.scopebuddy.packages.${pkgs.stdenv.hostPlatform.system}.default inputs.scopebuddy.packages.${pkgs.stdenv.hostPlatform.system}.default
inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.wine-cachyos inputs.xivlauncher-rb.packages.${pkgs.stdenv.hostPlatform.system}.default
(callPackage ../../packages/xivlauncher/package.nix { })
(callPackage ../../packages/aseprite/package.nix { }) (callPackage ../../packages/aseprite/package.nix { })
(callPackage ../../packages/aseprite-thumbnailer-kde/package.nix { inherit unstable; }) (callPackage ../../packages/aseprite-thumbnailer-kde/package.nix { inherit unstable; })
(callPackage ../../packages/undertale-mod-tool/package.nix { }) (callPackage ../../packages/undertale-mod-tool/package.nix { })
-1
View File
@@ -71,7 +71,6 @@
btop btop
nerd-fonts.hack nerd-fonts.hack
jump jump
pre-commit
]; ];
}; };
+4 -2
View File
@@ -23,7 +23,8 @@ in
# Disabled temporarily due to HDMI bugs. # Disabled temporarily due to HDMI bugs.
#kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-bore-lto-x86_64-v3; #kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-bore-lto-x86_64-v3;
kernelPackages = pkgs.linuxPackages_7_1; kernelPackages =
inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-bore-lto-x86_64-v3;
extraModulePackages = [ config.boot.kernelPackages.kvmfr ]; extraModulePackages = [ config.boot.kernelPackages.kvmfr ];
@@ -313,6 +314,7 @@ in
"input" "input"
"video" "video"
"docker" "docker"
"uinput"
]; ];
}; };
@@ -353,6 +355,7 @@ in
dnsmasq dnsmasq
guestfs-tools guestfs-tools
unrar unrar
p7zip
btrfs-assistant btrfs-assistant
nil nil
bash-language-server bash-language-server
@@ -367,7 +370,6 @@ in
openjdk17 openjdk17
openjdk25 openjdk25
tmux tmux
pre-commit
unstable.fastfetch unstable.fastfetch
-1
View File
@@ -186,7 +186,6 @@ in
openjdk17 openjdk17
openjdk25 openjdk25
tmux tmux
pre-commit
unstable.fastfetch unstable.fastfetch
+21 -18
View File
@@ -32,30 +32,29 @@
zlib, zlib,
}: }:
let
asepriteStrings = fetchFromGitHub {
owner = "aseprite";
repo = "strings";
rev = "417074f649f359f98511fc87a707c276d87f5739";
hash = "sha256-5bB7yK4eJHhkUwGYtIFYdFXpRrBt69VBbTh7EmPFI08=";
};
in
clangStdenv.mkDerivation (finalAttrs: { clangStdenv.mkDerivation (finalAttrs: {
pname = "aseprite"; pname = "aseprite";
version = "44cd42d29dbc047ec9d341f05c0a8ff584ede151"; version = "1.3.18.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aseprite"; owner = "aseprite";
repo = "aseprite"; repo = "aseprite";
rev = "${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-swXk8wwFgao2rpF4ntCjOMnV+yk0gi+wbWoWl/wv7e8=";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-pMjBFJ1nhSNLITDS4oliD2DPMey6JBWplIqdcOtZfqM=";
}; };
# Translation files are copied without overwriting existing ones to preserve the asepriteStrings = fetchFromGitHub {
# potentially more up-to-date English file from the main source. owner = "aseprite";
repo = "strings";
rev = "b43be33343efa40c1c4bda00f985b8cd83bddf2a";
hash = "sha256-JxNEtWnP3RtntXM3CmJLXyByW6dri98COp2O0A6ZwBA=";
};
# Translation files are copied without overwriting existing ones to preserve
# the potentially more up-to-date English file from the main source.
postUnpack = '' postUnpack = ''
cp --no-clobber ${asepriteStrings}/* "$sourceRoot/data/strings" cp --no-clobber ${finalAttrs.asepriteStrings}/* "$sourceRoot/data/strings"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@@ -105,8 +104,12 @@ clangStdenv.mkDerivation (finalAttrs: {
substituteInPlace src/ver/CMakeLists.txt \ substituteInPlace src/ver/CMakeLists.txt \
--replace-fail '"1.x-dev"' '"${finalAttrs.version}"' --replace-fail '"1.x-dev"' '"${finalAttrs.version}"'
# Fix build on Darwin with `-Werror=format-security`. # fmt 12.2 no longer exposes fmt::format through fmt/core.h.
# (NSLog requires a string-literal format). substituteInPlace src/app/i18n/strings.h \
--replace-fail '"fmt/core.h"' '"fmt/format.h"'
# Fix build on Darwin with `-Werror=format-security`
# (NSLog requires a string-literal format)
substituteInPlace laf/os/osx/logger.mm \ substituteInPlace laf/os/osx/logger.mm \
--replace-fail 'NSLog([NSString stringWithUTF8String:error]);' 'NSLog(@"%@", [NSString stringWithUTF8String:error]);' --replace-fail 'NSLog([NSString stringWithUTF8String:error]);' 'NSLog(@"%@", [NSString stringWithUTF8String:error]);'
''; '';
@@ -176,11 +179,12 @@ clangStdenv.mkDerivation (finalAttrs: {
rmdir "$out/bin" 2>/dev/null || true rmdir "$out/bin" 2>/dev/null || true
''; '';
passthru.updateScript = ./update.sh;
meta = { meta = {
homepage = "https://www.aseprite.org/"; homepage = "https://www.aseprite.org/";
description = "Animated sprite editor & pixel art tool"; description = "Animated sprite editor & pixel art tool";
license = lib.licenses.unfree; license = lib.licenses.unfree;
longDescription = '' longDescription = ''
Aseprite is a program to create animated sprites. Its main features are: Aseprite is a program to create animated sprites. Its main features are:
- Sprites are composed by layers & frames (as separated concepts). - Sprites are composed by layers & frames (as separated concepts).
@@ -194,7 +198,6 @@ clangStdenv.mkDerivation (finalAttrs: {
- Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc.
- Onion skinning. - Onion skinning.
''; '';
maintainers = [ lib.maintainers.iamanaws ]; maintainers = [ lib.maintainers.iamanaws ];
platforms = lib.platforms.linux ++ lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
mainProgram = "aseprite"; mainProgram = "aseprite";
+2 -2
View File
@@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
version = "B7-782-7b059ad6"; version = "B7-782-7b059ad6";
src = fetchurl { src = fetchurl {
url = "https://looking-glass.io/artifact/B7-782-7b059ad6/source"; url = "https://looking-glass.io/artifact/bleeding/source";
sha256 = "sha256-Lwx1+ReGHZm4zrQyuJ7hd7Ih3XpxyrVQ295itOGl2WM="; sha256 = "sha256-/WCWJk1f0BSiMl76btROG1LSrKwGoxK1MowEdLvZ+As=";
name = "looking-glass-bleeding.tar.gz"; name = "looking-glass-bleeding.tar.gz";
}; };