From 666dddad8fa6db61f209de2b60db23f8427736ff Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Thu, 6 Mar 2025 20:42:02 -0800
Subject: [PATCH] Testing
---
flake.lock | 109 +++++++++++---------------
nixos/hosts/framework16/default.nix | 9 ++-
nixos/hosts/nixos-desktop/default.nix | 16 +---
3 files changed, 52 insertions(+), 82 deletions(-)
diff --git a/flake.lock b/flake.lock
index b03e02a3..48199fcf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,11 +69,11 @@
},
"crane": {
"locked": {
- "lastModified": 1731098351,
- "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
+ "lastModified": 1741148495,
+ "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
+ "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53",
"type": "github"
},
"original": {
@@ -180,11 +180,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+ "lastModified": 1733328505,
+ "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
@@ -246,11 +246,11 @@
]
},
"locked": {
- "lastModified": 1730504689,
- "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+ "lastModified": 1740872218,
+ "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+ "rev": "3876f6b87db82f33775b1ef5ea343986105db764",
"type": "github"
},
"original": {
@@ -649,11 +649,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1740892961,
- "narHash": "sha256-RpuRrwn4Iu3ColOUfQJITSB3Pu8p979zELXv1zihWwU=",
+ "lastModified": 1741273541,
+ "narHash": "sha256-tsPWuE2A84Chs9gm6VYifFCe4zLC+A1xBCN2E64NoIA=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "483fc372ebcc522ef0226bf5a211942203edda90",
+ "rev": "571925b8525dec6eae78f658a5ec1bbcf9e1390e",
"type": "github"
},
"original": {
@@ -674,11 +674,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1740440383,
- "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=",
+ "lastModified": 1741259028,
+ "narHash": "sha256-QWgGXe9Ai8+hSwNEAqLjZoAvLwV3ywDzT+XBpfMOzuU=",
"owner": "nix-community",
"repo": "lanzaboote",
- "rev": "6321bc060d757c137c1fbae2057c7e941483878f",
+ "rev": "3a3ed972151121c8b159eb40e0be21146270e73b",
"type": "github"
},
"original": {
@@ -788,11 +788,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1740646007,
- "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
+ "lastModified": 1741319714,
+ "narHash": "sha256-FY76RS7AIVNNV0TNnd3QetkyCn7PjpP+n9YMKsTBEk4=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
+ "rev": "d23a3bc3c600a064c72c7fb02862edfab11a46cf",
"type": "github"
},
"original": {
@@ -833,29 +833,13 @@
"type": "github"
}
},
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1730741070,
- "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-24.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1740828860,
- "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
+ "lastModified": 1741173522,
+ "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
+ "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
"type": "github"
},
"original": {
@@ -871,11 +855,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1740968434,
- "narHash": "sha256-AR/t9pLoWO2sAxTnPUfnuGo42hGcRYtKXlmeCF7tKII=",
+ "lastModified": 1741313982,
+ "narHash": "sha256-ZvCjKWBAf26patAvzJgXLbyK3qf8S+bjzLstZoRzMws=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
- "rev": "6940671a2b39b0ad06489b15f6cec43bb23fccbb",
+ "rev": "2c1c881dc496216f0ecaeac8f67aa7864a79d620",
"type": "github"
},
"original": {
@@ -886,11 +870,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1740865531,
- "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=",
+ "lastModified": 1741196730,
+ "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5ef6c425980847c78a80d759abc476e941a9bf42",
+ "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3",
"type": "github"
},
"original": {
@@ -901,11 +885,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1740828860,
- "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
+ "lastModified": 1741173522,
+ "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
+ "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
"type": "github"
},
"original": {
@@ -933,11 +917,11 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1740828860,
- "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
+ "lastModified": 1741173522,
+ "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
+ "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
"type": "github"
},
"original": {
@@ -997,11 +981,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
- "lastModified": 1740984750,
- "narHash": "sha256-c37Lc3Q09INuC8akgK13g66q/sU0jDxJmLJRFQFDSTY=",
+ "lastModified": 1741319234,
+ "narHash": "sha256-aNCzbndKCEE+TbP4SF0LgXCq3wKBBOiUugBU1+CZJGg=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "fbaf37e080f2e35777126cce3c578375514bd38a",
+ "rev": "f8fcac6c1689989352e87d7feb4dc416a5783ce6",
"type": "github"
},
"original": {
@@ -1064,15 +1048,14 @@
"nixpkgs": [
"lanzaboote",
"nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
+ ]
},
"locked": {
- "lastModified": 1731363552,
- "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+ "lastModified": 1740915799,
+ "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+ "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732",
"type": "github"
},
"original": {
@@ -1109,11 +1092,11 @@
]
},
"locked": {
- "lastModified": 1731897198,
- "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
+ "lastModified": 1741228283,
+ "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
+ "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403",
"type": "github"
},
"original": {
@@ -1127,11 +1110,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1739262228,
- "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
+ "lastModified": 1741043164,
+ "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
+ "rev": "3f2412536eeece783f0d0ad3861417f347219f4d",
"type": "github"
},
"original": {
diff --git a/nixos/hosts/framework16/default.nix b/nixos/hosts/framework16/default.nix
index 5e2e82d2..5ac2875e 100644
--- a/nixos/hosts/framework16/default.nix
+++ b/nixos/hosts/framework16/default.nix
@@ -80,11 +80,12 @@
environment.systemPackages = with pkgs; [
inputs.deploy-rs.packages.${system}.deploy-rs
framework-tool
- # WINE
- wineWowPackages.stable
- winetricks
- wineWowPackages.waylandFull
nvtopPackages.amd
+ # WINE
+ # support 32-bit only
+ pkgs.wine
+ pkgs.winetricks
+
# RGB stuff
openrgb-with-all-plugins
rivalcfg
diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix
index 358281f5..59c76572 100644
--- a/nixos/hosts/nixos-desktop/default.nix
+++ b/nixos/hosts/nixos-desktop/default.nix
@@ -87,9 +87,7 @@
# support 32-bit only
pkgs.wine
# support 64-bit only
- (
- pkgs.wine.override { wineBuild = "wine64"; }
- )
+ ( pkgs.wine.override { wineBuild = "wine64"; } )
pkgs.wineWowPackages.staging
pkgs.winetricks
pkgs.wineWowPackages.waylandFull
@@ -100,16 +98,4 @@
# Other
pkgs.android-udev-rules
];
- nixpkgs.overlays = [
- (final: prev: {
- logseq = prev.logseq.overrideAttrs (oldAttrs: {
- postFixup = ''
- makeWrapper ${prev.electron_27}/bin/electron $out/bin/${oldAttrs.pname} \
- --add-flags $out/share/${oldAttrs.pname}/resources/app \
- --add-flags "--use-gl=desktop" \
- --prefix LD_LIBRARY_PATH : "${prev.lib.makeLibraryPath [ prev.stdenv.cc.cc.lib ]}"
- '';
- });
- })
- ];
}