From 9b34a0c3a203e448b21bcd6e6ce1660043264a3e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 9 Nov 2024 13:24:47 -0500 Subject: [PATCH] things --- etcnixos/common.nix | 1 + etcnixos/distrobox.nix | 8 ++++ etcnixos/flake.lock | 66 ++++++++++++++-------------- etcnixos/secrets/wifi-passwords.nix | Bin 339 -> 423 bytes home-manager/flake.lock | 62 +++++++++++++------------- home-manager/gui.nix | 1 + home-manager/no-gui.nix | 2 + 7 files changed, 76 insertions(+), 64 deletions(-) create mode 100644 etcnixos/distrobox.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 4dd0823..31ff7e0 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -11,6 +11,7 @@ { imports = [ ./declarative-nm.nix + ./distrobox.nix inputs.nixos-hardware.nixosModules.common-pc-ssd ]; diff --git a/etcnixos/distrobox.nix b/etcnixos/distrobox.nix new file mode 100644 index 0000000..f85b99e --- /dev/null +++ b/etcnixos/distrobox.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + virtualisation.podman = { + enable = true; + }; + + environment.systemPackages = [ pkgs.distrobox ]; +} diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 45f18ea..6acf904 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1730390431, - "narHash": "sha256-M+rMhDB69Y35IlhmAMN4ErDige+wKPwhb6HDqpF14Rw=", + "lastModified": 1731000594, + "narHash": "sha256-Fl0SrKBg1aH1d/z4hflP54Htdw8P8KHfgXzipUnAVhQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "40388a7427ee32af175c5169ae7587ffd2dec125", + "rev": "95b190eebfa073bc748bf52dc874f69a5d22b8ef", "type": "github" }, "original": { @@ -49,11 +49,11 @@ }, "crane": { "locked": { - "lastModified": 1730060262, - "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", + "lastModified": 1730652660, + "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", "owner": "ipetkov", "repo": "crane", - "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", + "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", "type": "github" }, "original": { @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1730016908, - "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "e83414058edd339148dc142a8437edb9450574c8", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1730248099, - "narHash": "sha256-Fl7BSdpLk0uTXF6ol/MR0q1EB4XQ8tn0ftig0pyYh5Y=", + "lastModified": 1730962714, + "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "c11bab124fc55a37cbd854ed28ea121ed609231f", + "rev": "93b525229c99fec0016db72a174f43b9d6237714", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730107060, - "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", + "lastModified": 1730739295, + "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", + "rev": "cef39a78679c266300874e7a7000b4da066228d4", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730368399, - "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1729996302, - "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", + "lastModified": 1730601085, + "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", + "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "wivrn": { "locked": { - "lastModified": 1729988849, - "narHash": "sha256-5t+ZPFtNPpcNi02JOKLtvT0wx2IcaTWatJlJCb+rf0o=", + "lastModified": 1730755482, + "narHash": "sha256-gqgtsxQY2+MqGf6KCr8AzZhrCQMPFEkmohiLhmUXTtQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "adeeaf07e2742999b826a3126edd6ef366766464", + "rev": "b8c29c40b67974daaf97e5f3a7bbe98b9f8b775e", "type": "github" }, "original": { diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index e1cbb8c990f55e1df3162b605be4531ba1c5ba10..4027cc30f16b386233d934dadf791e1da51bb80a 100644 GIT binary patch literal 423 zcmZQ@_Y83kiVO&0Sa<$`oBjT~>n(OEmG~}swk)^0u5PY(jhU9m9jBKPuO4|QGm8xrX52fslK0bRsmV(MGF#mi&OF1- zU%oc*m)p0}on__I%_CW+7pyZ`byWJD;pBxc9(|jmpOn8mKsMv-n^}67Z*CI{TII9( zM8Ul5!k6!SWeP7X=DWSZZ+}B-+UDnqE(_i7E>-v5x?O{s6%lcK;Iib>UhX3`brw?)oP%z2u#NOdcFcVEQw z8(})dDtAABn4Oq4rN!h>L*uv{y@@e|VV~}2DW&pxt#?{YPcTfg_*zx_Kr@r&%82%VUV8;@8j?O1UB z!p#Y@h0eyEI6CvCbi?Nx|NnDMDGPpD)%@$Bef!i3%{;4+7j9{r-=1Fjq-9|a=Z*_o z_5VxC-jCURSx!@<`+JC+#Uk}PA8zMOwT;@Poy|L|XsM%t>RyNSCzDsI9A{B(pL}Nf zryp9k?y)bEH*T-oZdm)>YVW3l8Z*-35@c1D{yyrP>?s(`>-OH|#I7Ko&C`yUPjGZw z?UBo1e!$}HKh*y~7hyw`c7AI9=sax7B=&8Hc;veyE main