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 e1cbb8c..4027cc3 100644 Binary files a/etcnixos/secrets/wifi-passwords.nix and b/etcnixos/secrets/wifi-passwords.nix differ diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 17d79ff..ad70386 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -52,11 +52,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "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": { @@ -72,11 +72,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": { @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1730380035, - "narHash": "sha256-fyK2lLnsYJTBkPxhynNCmjxwbAItzRg6oLPF+NC2kgw=", + "lastModified": 1731167640, + "narHash": "sha256-LXFDNcnP6xRWQI9T/jqEDzDBPNZzjbf77ldQNFRhFO4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e2a1396edb2410a04eb2b02c93fb9203352a8a92", + "rev": "55c8ee7b7ab017319d7e7fe50ad0714808cf6c65", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1730263923, - "narHash": "sha256-HFOXeh+WNtAwuV/KNtOSKXGnOoy465a/dud2zvtsCt8=", + "lastModified": 1731164272, + "narHash": "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=", "owner": "YaLTeR", "repo": "niri", - "rev": "d3e72245b003cbeed0810bf00c4a445b7c8a652a", + "rev": "9d8f640503819ff1905c9040d3c7910a50400bbd", "type": "github" }, "original": { @@ -146,11 +146,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": { @@ -162,23 +162,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1730137625, - "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", + "lastModified": 1730963269, + "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", + "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1730341826, - "narHash": "sha256-RFaeY7EWzXOmAL2IQEACbnrEza3TgD5UQApHR4hGHhY=", + "lastModified": 1731119076, + "narHash": "sha256-2eVhmocCZHJlFAz6Mt3EwPdFFVAtGgIySJc1EHQVxcc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "815d1b3ee71716fc91a7bd149801e1f04d45fbc5", + "rev": "23c4b3ba5f806fcf25d5a3b6b54fa0d07854c032", "type": "github" }, "original": { @@ -253,11 +253,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1730258684, - "narHash": "sha256-E+69sdxUhPSNI8+JlTL6KKbNv5qVD3L1y8hdVO37A44=", + "lastModified": 1731123454, + "narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b0ee6db9fa9901c675b3c7e952c2a8ce987a0f58", + "rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab", "type": "github" }, "original": { @@ -268,11 +268,11 @@ }, "zen-browser": { "locked": { - "lastModified": 1730405295, - "narHash": "sha256-SBzYL8zvc3kLmYQW0bCUbx0/uDw5UeABnNXPiLTQ00o=", + "lastModified": 1730479554, + "narHash": "sha256-payM5crsPfFwxI4Hjd+veZcy07mxXc/Pysrpouset0Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7f331be6dee99c4eb430ebedc9cece413aec4aad", + "rev": "7bf429b9e546dde2e5451b40e685d4471ec71245", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index a26ef35..7e4750a 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -93,6 +93,7 @@ inputs.zen-browser.legacyPackages.${pkgs.system}.zen-browser # freecad-wayland + puddletag ]; # make chromium-based stuff use wayland diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 6f34521..4176895 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -162,6 +162,8 @@ # better way to view diffs delta.enable = true; + lfs.enable = true; + extraConfig = { init = { # master -> main