From 28a211bda47c9ca96d27a4eaed9624d17f3d18ef Mon Sep 17 00:00:00 2001 From: 4DBug <4DBug@github.com> Date: Thu, 5 Feb 2026 10:33:26 -0600 Subject: [PATCH] push --- .stfolder/syncthing-folder-a0745f.txt | 2 +- .stignore | 2 - device.nix | 2 +- flake.lock | 205 +++++++++++++++++++++++++- flake.nix | 5 + modules/packages.nix | 10 +- 6 files changed, 211 insertions(+), 15 deletions(-) delete mode 100644 .stignore diff --git a/.stfolder/syncthing-folder-a0745f.txt b/.stfolder/syncthing-folder-a0745f.txt index b3ae570..2f6a7df 100644 --- a/.stfolder/syncthing-folder-a0745f.txt +++ b/.stfolder/syncthing-folder-a0745f.txt @@ -2,4 +2,4 @@ # Do not delete. folderID: nix -created: 2026-01-29T23:05:44-06:00 +created: 2026-01-29T23:06:32-06:00 diff --git a/.stignore b/.stignore deleted file mode 100644 index 27f2bde..0000000 --- a/.stignore +++ /dev/null @@ -1,2 +0,0 @@ -device.nix -hardware-configuration.nix \ No newline at end of file diff --git a/device.nix b/device.nix index 4a699cd..29cb6fb 100644 --- a/device.nix +++ b/device.nix @@ -1 +1 @@ -{ device = "desktop"; } \ No newline at end of file +{ device = "laptop"; } \ No newline at end of file diff --git a/flake.lock b/flake.lock index 650b62c..b368ef1 100644 --- a/flake.lock +++ b/flake.lock @@ -101,6 +101,45 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nix-citizen", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -123,7 +162,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -226,10 +265,75 @@ "type": "github" } }, + "nix-citizen": { + "inputs": { + "flake-parts": "flake-parts", + "nix-gaming": [ + "nix-gaming" + ], + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs_3", + "systems": "systems", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1769832985, + "narHash": "sha256-PKONM6JUGWviRsv3tZWj72HE0aeHKcHTrzTskj58MRM=", + "owner": "LovingMelody", + "repo": "nix-citizen", + "rev": "47823c1ea4c53153dabd43f08b26f3c67c557542", + "type": "github" + }, + "original": { + "owner": "LovingMelody", + "repo": "nix-citizen", + "type": "github" + } + }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1769914377, + "narHash": "sha256-8wH3ZYNs36V0A3f/ikraqdoVE++BfnXg9Ql8nAuUkHw=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "f7d17740ed90663b11ae907d33b3fed9fc9e15a9", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "nix-citizen", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737420293, + "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable", "rust-overlay": "rust-overlay" }, @@ -263,6 +367,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1751048012, @@ -296,6 +415,38 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1769740369, + "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1751011381, "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", @@ -311,7 +462,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1770181073, "narHash": "sha256-ksTL7P9QC1WfZasNlaAdLOzqD8x5EPyods69YBqxSfk=", @@ -327,7 +478,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -371,8 +522,10 @@ "flatpaks": "flatpaks", "home-manager": "home-manager", "hytale-launcher": "hytale-launcher", + "nix-citizen": "nix-citizen", + "nix-gaming": "nix-gaming", "nixos-cosmic": "nixos-cosmic", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "stylix": "stylix", "vscode-server": "vscode-server" } @@ -405,13 +558,13 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], "nur": "nur", - "systems": "systems", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -462,6 +615,21 @@ "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" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -543,10 +711,31 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nix-citizen", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769515380, + "narHash": "sha256-CWWK3PaQ7zhr+Jcf5zyaTR2cfRBXPo09H7+5nWApL8s=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "9911802c2822def2eec3d22e2cafd1619ede94a5", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "vscode-server": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1770124655, diff --git a/flake.nix b/flake.nix index 5f11b10..a7f4b03 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,11 @@ vscode-server.url = "github:nix-community/nixos-vscode-server"; home-manager.url = "github:nix-community/home-manager"; + + nix-citizen.url = "github:LovingMelody/nix-citizen"; + + nix-gaming.url = "github:fufexan/nix-gaming"; + nix-citizen.inputs.nix-gaming.follows = "nix-gaming"; }; outputs = inputs@{ self, nixpkgs, stylix, home-manager, flatpaks, hytale-launcher, vscode-server, ... }: diff --git a/modules/packages.nix b/modules/packages.nix index 90d807c..d9a0bfd 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -193,10 +193,12 @@ in baobab ] ++ (if (device == "desktop") then [ - (nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.star-citizen.override { - tricks = [ "arial" "vcrun2019" "win10" "sound=alsa" ]; - }) + #(nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.star-citizen.override { + # tricks = [ "arial" "vcrun2019" "win10" "sound=alsa" ]; + #}) + inputs.nix-citizen.packages.${system}.rsi-launcher + libxshmfence (appimage-run.override { @@ -204,6 +206,8 @@ in }) ] else [ bambu-studio + + inputs.nix-citizen.packages.${system}.rsi-launcher ]); services = {