floturcocantsee/frank-nix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of gitea.daguerro.net:floturcocantsee/frank-nix

Browse Source
This commit is contained in:
floturcocantsee
2026-08-20 21:26:37 -04:00
parent 368001c8f4 8d985a50ee
commit 878a4978ce
4 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+55 -55
View File
@@ -49,11 +49,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1785310673, "lastModified": 1786993082,
"narHash": "sha256-RuYhBi/5S5SQafE373Udv8BKh0LLMwlNqTzobODABAc=", "narHash": "sha256-kq2AjbxxsJCZtrLzYEGGFbDuIvcTB4YEMgA0X6vYl/8=",
"owner": "kem-a", "owner": "kem-a",
"repo": "AppManager", "repo": "AppManager",
"rev": "8c3f44dcfcd1b070f344054faed8cbc23de19b4e", "rev": "2a60714a600cfbf0cfc9f625f883ec16e7ef6ae9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -67,11 +67,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1786348288, "lastModified": 1786970826,
"narHash": "sha256-TwlCuqV0lDVDnFs8LcN86ouGHEFGkhai8uhICe8ZCOI=", "narHash": "sha256-R+MSfbVkntcKpDjZlrHnd66Hpu1WOdmBmBSLfUmuL1w=",
"owner": "Hy4ri", "owner": "Hy4ri",
"repo": "cheatengine-flake", "repo": "cheatengine-flake",
"rev": "524f5e558657a863cfe5dff96d03ff2f31f2de06", "rev": "39ffb1d7cebb6f94e93e30cf2fcbec8389ce5d50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -352,11 +352,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1785119570, "lastModified": 1787146702,
"narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=", "narHash": "sha256-YbRcLdU/yK4gWsQg7V8WTKZHfXL33g8+wSFUX3wyevs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d", "rev": "173b7e8d40fdc8c296a9c99854314f17a3a1704c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -393,11 +393,11 @@
}, },
"locked": { "locked": {
"dir": "packages/nix", "dir": "packages/nix",
"lastModified": 1786390927, "lastModified": 1787086436,
"narHash": "sha256-rG9VwNR5bZIOzjYRjuY0SRqfx37spn0QQywPgITszQY=", "narHash": "sha256-3Iphls5e/3XyoMh3TZJo0XknxNT1idLVabIqgRKUudY=",
"owner": "SteamClientHomebrew", "owner": "SteamClientHomebrew",
"repo": "Millennium", "repo": "Millennium",
"rev": "816514f939ce8696ae8262b4e0c2123f593db08c", "rev": "cecdc9532b76d16b7b63ddc206f5a8eb8c1afcaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -410,17 +410,17 @@
"millennium-src": { "millennium-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1783268941, "lastModified": 1787082953,
"narHash": "sha256-MJLJ0I48HXgfOpISTAbDMYMUdWj9A6M+jGQz4uAvwyw=", "narHash": "sha256-zgr4cdJfye4qunpD3ClNnZ9D1WPGQAXV0CnYwEbB52s=",
"owner": "SteamClientHomebrew", "owner": "SteamClientHomebrew",
"repo": "Millennium", "repo": "Millennium",
"rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48", "rev": "513b02e809b0eb120ecf0ae12e548798dd756323",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "SteamClientHomebrew", "owner": "SteamClientHomebrew",
"repo": "Millennium", "repo": "Millennium",
"rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48", "rev": "513b02e809b0eb120ecf0ae12e548798dd756323",
"type": "github" "type": "github"
} }
}, },
@@ -429,11 +429,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1786093376, "lastModified": 1787088788,
"narHash": "sha256-z13NzEbjCzPzfBpuU5HUKbz/MgosB0arQ9L6eqz5Gis=", "narHash": "sha256-cd7IHexHOqcgS/X1362FPQ7F1GmtncXKvCOhx1xCc5w=",
"owner": "hgaiser", "owner": "hgaiser",
"repo": "moonshine", "repo": "moonshine",
"rev": "91602b5bcfed0a5189d97ed3e8ca6bf6bcae0ca0", "rev": "c2da458ac8de7776086d8814bbeb1a525319b368",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -449,11 +449,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1786559454, "lastModified": 1787075944,
"narHash": "sha256-G6tXhePQUPnsEKraOuAoT/tsaAV3Ip0fbMyss9q13TY=", "narHash": "sha256-E5rJi/5sc6R/qGq8fgcDIQddp5qLhTiKEZl4QH3NghQ=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "ec4895e556bd30af5b2a79ad7ec9b37367c81ebd", "rev": "2e3d6f313f83b7eacd94467c0f693c87774872a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -507,11 +507,11 @@
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1786587825, "lastModified": 1786844088,
"narHash": "sha256-K1Cg3W1DdqGT7D0B1wdMYvfqyYSwPXegHjASpX4E2kE=", "narHash": "sha256-gVwzq9tiX4oa6jwwoKsBJlKb2kPndVdMrYEvTpfi7DY=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "cf32a4bb7307fb5cff11e42726418c1fd93d5b53", "rev": "23ff06d540f4df5e315d9a45b2388b6581d1c0a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -583,11 +583,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1786599213, "lastModified": 1787070829,
"narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", "narHash": "sha256-vXNVDVtvfiQuXthP0NHPFdNvvMTkGpx0UP8oddIWbNk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", "rev": "0ae2bc1419c3f345984c2629e72e7a631820fa4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -623,11 +623,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1786499562, "lastModified": 1787102017,
"narHash": "sha256-ajJ604KGWVhv251kUTHUMXlPqOtUq/QuCJYQRmXaTOA=", "narHash": "sha256-x27UbCAW0tb6vR7et8MeXJqSmXy6FXWD7P/9swY6bbI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-xr", "repo": "nixpkgs-xr",
"rev": "64054765ef14329bfcbee601d74b6519136ef17d", "rev": "c2209ed6f2335a9779d72ae1c5b42bba32f99964",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -638,11 +638,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1785975029, "lastModified": 1786593342,
"narHash": "sha256-X44cn5rzytELc3NNoQsh0aLkjWA/QzPfc6HPQmsG3sU=", "narHash": "sha256-smTKQXMLLStzc8zJevMCckbk3My7SvbbLmPYZUJJKW4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "70ce234312134a463ba7728e94da2486a1d237ac", "rev": "6b5e5b7a6631f065bf6908986990b37d845f847f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -654,11 +654,11 @@
}, },
"nixpkgs_11": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1786535285, "lastModified": 1787101114,
"narHash": "sha256-rG5HKMAgAhMgydvKGtco6rqTxRq4EDZQCx9USLvVqYw=", "narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f78f44a87948854445dae0b6bf82b2e87e4efb5", "rev": "b18a4b905f8d028dc4476412e6d6891728695379",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -670,11 +670,11 @@
}, },
"nixpkgs_12": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1786384358, "lastModified": 1787001381,
"narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=", "narHash": "sha256-Ue1Yo8gfHdD4TMtNewhA4tkSYeFqXThju0nCyJc3ALo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a", "rev": "ec2d622de0773551768cf98f3fc50cbcc003b9c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -686,11 +686,11 @@
}, },
"nixpkgs_13": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1786599213, "lastModified": 1787070829,
"narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", "narHash": "sha256-vXNVDVtvfiQuXthP0NHPFdNvvMTkGpx0UP8oddIWbNk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", "rev": "0ae2bc1419c3f345984c2629e72e7a631820fa4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -750,11 +750,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1786106723, "lastModified": 1786862985,
"narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=", "narHash": "sha256-FBJRXmbGXiSUDvYEbfLYRkckayyZ6SK1UEqhCrIZ2Cs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238", "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -814,11 +814,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1786548149, "lastModified": 1787056454,
"narHash": "sha256-pBv1JbhCqqMcF5ciyLi8D9nzVyw4Gv2sk/tcGF4mBHA=", "narHash": "sha256-mwSuxTG/BIwFJUHBwhS8ENlq2LJodCPXyk+AG4Dv6yk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5df1f9ae934fe1bffbd3867a1ae2870ab22302ed", "rev": "ced43465ad23b2fdea055be721e79895cbf96c28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -933,11 +933,11 @@
"nixpkgs": "nixpkgs_13" "nixpkgs": "nixpkgs_13"
}, },
"locked": { "locked": {
"lastModified": 1785787215, "lastModified": 1787088847,
"narHash": "sha256-Z4KE6Qs5dcNdoEra1sx69I8EsxztAeVNGgO0ltYz7r0=", "narHash": "sha256-dimDUlRtDXZDCUUOjW2KX+1XiWjOiMUIudh6VClZlZ0=",
"owner": "HikariKnight", "owner": "HikariKnight",
"repo": "ScopeBuddy", "repo": "ScopeBuddy",
"rev": "8c517a4c1b2fb9ed3fe43a95e1c5630cdecc4678", "rev": "0269fd2b3b5f0b2af191d52d1b8e4a8088a49fdc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1002,11 +1002,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1785945821, "lastModified": 1786901030,
"narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=", "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0", "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
"type": "github" "type": "github"
}, },
"original": { "original": {
hosts/nero/configuration.nix
+1
View File
@@ -137,6 +137,7 @@ in
gamescope gamescope
gamescope-wsi gamescope-wsi
cheatengine cheatengine
qbittorrent
inputs.scopebuddy.packages.${pkgs.stdenv.hostPlatform.system}.default inputs.scopebuddy.packages.${pkgs.stdenv.hostPlatform.system}.default
hosts/shared/nixos-pc.nix
+4 -2
View File
@@ -346,7 +346,7 @@ in
unstable.winetricks unstable.winetricks
unstable.fastfetch unstable.fastfetch
inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.wine-tkg inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.wine-cachyos
inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default
(python3.withPackages ( (python3.withPackages (
@@ -394,7 +394,9 @@ in
DOTNET_ROOT = "${pkgs.dotnet-sdk}/share/dotnet"; DOTNET_ROOT = "${pkgs.dotnet-sdk}/share/dotnet";
DOTNET_CLI_HOME = "$XDG_DATA_HOME/dotnet"; DOTNET_CLI_HOME = "$XDG_DATA_HOME/dotnet";
GTK2_RC_FILES = "$XDG_CONFIG_HOME/gtk-2.0/gtkrc"; GTK2_RC_FILES = "$XDG_CONFIG_HOME/gtk-2.0/gtkrc";
WINE_BIN = "${inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.wine-tkg}/bin/.wine"; WINE_BIN = "${
inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.wine-cachyos
}/bin/.wine";
WINEPREFIX = "$XDG_DATA_HOME/wine"; WINEPREFIX = "$XDG_DATA_HOME/wine";
}; };
}; };
packages/looking-glass-client/package.nix
+6 -4
View File
@@ -13,6 +13,7 @@
expat, expat,
libGL, libGL,
nanosvg, nanosvg,
fuse3,
libx11, libx11,
libxkbcommon, libxkbcommon,
@@ -43,16 +44,16 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "looking-glass-client"; pname = "looking-glass-client";
version = "B7-676-34835dd1"; version = "B7-782-7b059ad6";
src = fetchurl { src = fetchurl {
url = "https://looking-glass.io/artifact/B7-676-34835dd1/source"; url = "https://looking-glass.io/artifact/B7-782-7b059ad6/source";
sha256 = "sha256-0Y7SgRkfqfrUnjvDgCs+hB526ftE6z85qEtZ15zuzEs="; sha256 = "sha256-Lwx1+ReGHZm4zrQyuJ7hd7Ih3XpxyrVQ295itOGl2WM=";
name = "looking-glass-bleeding.tar.gz"; name = "looking-glass-bleeding.tar.gz";
}; };
patches = [ patches = [
./patches/nanosvg-unvendor.diff #./patches/nanosvg-unvendor.diff
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
nanosvg nanosvg
libunwind libunwind
elfutils elfutils
fuse3
] ]
++ lib.optionals xorgSupport [ ++ lib.optionals xorgSupport [
libxkbcommon libxkbcommon