diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index c18bd3e..3391bf8 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -30,14 +30,15 @@ "jovian": "jovian", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-small": "nixpkgs-small" }, "locked": { - "lastModified": 1734087975, - "narHash": "sha256-dQYXdA5zGKZ1G5HfPj9Gjf0JRGwXexl/dC9oZW5xOec=", + "lastModified": 1734987419, + "narHash": "sha256-2K4V615Y29QhMUShX9k52l7gXF2erkq9yH9qGRZGKQ0=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1174e016e517f60a8cfe00f0a5785e4c8bd17b53", + "rev": "d61084b851dbf3072f8b40c3870b0f7938ca3f22", "type": "github" }, "original": { @@ -49,11 +50,11 @@ }, "crane": { "locked": { - "lastModified": 1730652660, - "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -186,11 +187,11 @@ ] }, "locked": { - "lastModified": 1733873195, - "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -208,11 +209,11 @@ ] }, "locked": { - "lastModified": 1733859890, - "narHash": "sha256-HnA6z2l2W38TJBarvWCcxjTjcpz7JrDj2u2umjYFcEo=", + "lastModified": 1734725857, + "narHash": "sha256-bivlV9l/UjMtTfz/CZaoNJ5RfH2Lre4P9Ds64conoUQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "77ffd839fd9d60d139dc4a2ad6b6d526f4ad5a17", + "rev": "dbae2fd6adaf34c947d310bec08deac7c4ed265b", "type": "github" }, "original": { @@ -233,11 +234,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731941836, - "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=", + "lastModified": 1734994463, + "narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879", + "rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67", "type": "github" }, "original": { @@ -271,11 +272,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733861262, - "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", + "lastModified": 1734954597, + "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", + "rev": "def1d472c832d77885f174089b0d34854b007198", "type": "github" }, "original": { @@ -287,11 +288,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -301,13 +302,29 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-small": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1734838250, + "narHash": "sha256-Xi8ST/QiyuYXc3ujnMYOBuRUaMh6p16XWH6BKARa7xQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "da8a31d09dd004be34b5c54eda83f9a27b357726", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -331,11 +348,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -361,11 +378,11 @@ ] }, "locked": { - "lastModified": 1730601085, - "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index 0d5264c..88a9fc3 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 280eccf..1d27cad 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1735053786, + "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1734121763, - "narHash": "sha256-/g/L6UbunXn/63nHgaRGsw7o1u5rWE5ebKnhw61ckEo=", + "lastModified": 1734988923, + "narHash": "sha256-DmCefR+2CwM0tdtJtpg1114kAwskNhyYyN8xoe/f9sI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a41efc858ffab207bc11e2677ea7eca8b9cd804d", + "rev": "3d268c743b568febe83dc49e926f21b41b6d72d2", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1733942398, - "narHash": "sha256-/77/rEaihWmhCFBXQQ5cMSzH/pQXJ9cGydUOH/qAk9Q=", + "lastModified": 1734977336, + "narHash": "sha256-5klPkbBmEisNWWwnI4QYSum1syG5RyqBqEKNkHBA1ns=", "owner": "YaLTeR", "repo": "niri", - "rev": "82e30246c1c86b6d20861ede98c8fac4df141aff", + "rev": "955039b5ea07c3fb2ff3278c0543004d86b7dcc7", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -143,16 +143,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1734017764, - "narHash": "sha256-msOfmyJSjAHgIygI/JD0Ae3JsDv4rT54Nlfr5t6MQMQ=", + "lastModified": 1734875076, + "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e9404f308e0f0a0d8cdd7c358f74e34802494b", + "rev": "1807c2b91223227ad5599d7067a61665c52d1295", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1734057252, - "narHash": "sha256-fpSFuiW+O2L0ru2GrXBS0wcAYV9+yDE0Gf800UsWutY=", + "lastModified": 1735007320, + "narHash": "sha256-NdhUgB9BkLGW9I+Q1GyUUCc3CbDgsg7HLWjG7WZBR5Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1f56a5c88e4dcaa0ab1ba04c4bc5a977cff840b2", + "rev": "fb5fdba697ee9a2391ca9ceea3b853b4e3ce37a5", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1734112800, - "narHash": "sha256-9qSb6AJpmzV3oYRfsyEt0e9eju6UeXDSD1poeSwadKo=", + "lastModified": 1734745564, + "narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "c45c2ed990912c26e6aed0f47bfddb03993d7999", + "rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1734038753, - "narHash": "sha256-v2NetNrFvObcTx5Gw0MV9leJQr0KfCLtbpC4gZaq+Tc=", + "lastModified": 1735042792, + "narHash": "sha256-L2kY/1dSrqFd+slZkp3M5jXEpwb+/6Vl3dCX/G3tf0s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b2a4aeaad1cdb4a0d8901313d6388a8b4bf2c59d", + "rev": "21695ffb62a6b535b074753841eb2263b392ba80", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 4a6f7c4..0808bfd 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -30,7 +30,6 @@ url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - }; outputs = diff --git a/home-manager/gui.nix b/home-manager/gui.nix index a0c4d4f..7f042c1 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -89,7 +89,7 @@ # music lyric fetcher lrcget - inputs.zen-browser.packages."${system}".specific + inputs.zen-browser.packages."${system}" # freecad-wayland puddletag @@ -99,6 +99,8 @@ mcaselector wireshark + + darktable ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 390afa2..d633f9e 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -108,6 +108,8 @@ python-lsp-ruff # ruff integration mypy # type checking + + pyserial ] ))