From b2dae7e1e5f756365d70fe554a4e5571b1ea83a4 Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 23 Jun 2025 12:13:35 +0200 Subject: [PATCH 1/4] feat(mottarone): new lappy top! --- systems/mottarone/hardware-configuration.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/systems/mottarone/hardware-configuration.nix b/systems/mottarone/hardware-configuration.nix index dce25e1..9755d92 100644 --- a/systems/mottarone/hardware-configuration.nix +++ b/systems/mottarone/hardware-configuration.nix @@ -8,6 +8,7 @@ modulesPath, ... }: + { imports = [ (modulesPath + "/installer/scan/not-detected.nix") @@ -26,12 +27,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/e36f709d-a4ea-4310-8c0d-8752afacba3c"; + device = "/dev/disk/by-uuid/4f093337-a8f0-4864-ab0e-e30d04155f75"; fsType = "ext4"; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/D4AA-EE25"; + device = "/dev/disk/by-uuid/141F-CADA"; fsType = "vfat"; options = [ "fmask=0022" @@ -40,7 +41,7 @@ }; swapDevices = [ - { device = "/dev/disk/by-uuid/316ddc44-0359-40ac-9dce-2d78817fbb29"; } + { device = "/dev/disk/by-uuid/3c654289-c5b8-4ddc-b081-5216223b885d"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -49,7 +50,6 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s13f0u1u4.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; From 78df9667e54bcad32412d4a7d8a0235adcbb5d06 Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 23 Jun 2025 12:15:19 +0200 Subject: [PATCH 2/4] fix(common): use new sbctl location sbctl/nixos changed the default location of the files, therefore requiring manual intervention https://github.com/nix-community/lanzaboote/issues/413#issuecomment-2618089667 --- configs/desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/desktop.nix b/configs/desktop.nix index 3ee37be..1ab7045 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -37,7 +37,7 @@ lanzaboote = { enable = true; - pkiBundle = "/etc/secureboot"; + pkiBundle = "/var/lib/sbctl"; }; }; From 1adc40331999c4500ab51366e7fd2e4453d36c5f Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 23 Jun 2025 12:27:09 +0200 Subject: [PATCH 3/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'camasca': 'https://git.uku3lig.net/api/v1/repos/uku/camasca/archive/e11596663ecc4cd67767d2dbb47c395465207600.tar.gz?narHash=sha256-Q0RIvbLVXwABQICy%2BGwloA6l%2BAShGBD3%2Bk0YZ2Gw3AI%3D' (2025-06-16) → 'https://git.uku3lig.net/api/v1/repos/uku/camasca/archive/5a666254fc02daf5279e2b6105f41a025bd74fa0.tar.gz?narHash=sha256-bebdWECX2lORaPvBFaKEWBJi9%2BXvdNT6GO5Fxl2oewA%3D' (2025-06-23) • Updated input 'mystia': 'github:soopyc/mystia/bf38c5b319cf42311c7f11ee31ac9526485c8d12?narHash=sha256-vB7G6anfMk60VXmcpQ7bDu5BYzsijk7gh4flG%2Bkf2RI%3D' (2025-06-21) → 'github:soopyc/mystia/a0b2af79b7754214c2e5869e6b22ad06a7e6ed13?narHash=sha256-p4HXOj0c6uLe04oNGtWPgEcpAkuxNnoNouT3dV5ulb8%3D' (2025-06-23) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/424a40050cdc5f494ec45e46462d288f08c64475?narHash=sha256-EWlr9MZDd%2BGoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg%3D' (2025-06-15) → 'github:nix-community/nix-index-database/78cd697acc2e492b4e92822a4913ffad279c20e6?narHash=sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM%3D' (2025-06-22) • Updated input 'nixpkgs': 'https://releases.nixos.org/nixos/unstable/nixos-25.11pre818804.08f22084e608/nixexprs.tar.xz?narHash=sha256-LPEVD7FWRX%2BGFVWxIxNFLIB7kqet4tsAnV4mCKTdxNo%3D' (2025-06-20) → 'https://releases.nixos.org/nixos/unstable/nixos-25.11pre819493.4206c4cb5675/nixexprs.tar.xz?narHash=sha256-w7N9SeSxFS0jvkbqyfc6FOGGyNiTQtv5jwbi1l/xpk8%3D' (2025-06-22) • Updated input 'ukubot-rs': 'github:uku3lig/ukubot-rs/32589e405c3370ead785ebc7c977ac67ab40c34e?narHash=sha256-/1TRBD7bTFpyewje9t3ZjeNWDcwOr/2plSpXwzBoBiA%3D' (2025-06-21) → 'github:uku3lig/ukubot-rs/8a7dbbe0e21f27378ed7cc57028b48ede4b106cf?narHash=sha256-5b66kCRNlVvidmJoRIXjzW6yuq8hq00ReXHwe6puSjc%3D' (2025-06-23) --- flake.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 6bfebfe..9d05926 100644 --- a/flake.lock +++ b/flake.lock @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1750032056, - "narHash": "sha256-Q0RIvbLVXwABQICy+GwloA6l+AShGBD3+k0YZ2Gw3AI=", - "rev": "e11596663ecc4cd67767d2dbb47c395465207600", + "lastModified": 1750636898, + "narHash": "sha256-bebdWECX2lORaPvBFaKEWBJi9+XvdNT6GO5Fxl2oewA=", + "rev": "5a666254fc02daf5279e2b6105f41a025bd74fa0", "type": "tarball", - "url": "https://git.uku3lig.net/api/v1/repos/uku/camasca/archive/e11596663ecc4cd67767d2dbb47c395465207600.tar.gz" + "url": "https://git.uku3lig.net/api/v1/repos/uku/camasca/archive/5a666254fc02daf5279e2b6105f41a025bd74fa0.tar.gz" }, "original": { "type": "tarball", @@ -201,11 +201,11 @@ "treefmt-nix": [] }, "locked": { - "lastModified": 1750482007, - "narHash": "sha256-vB7G6anfMk60VXmcpQ7bDu5BYzsijk7gh4flG+kf2RI=", + "lastModified": 1750665781, + "narHash": "sha256-p4HXOj0c6uLe04oNGtWPgEcpAkuxNnoNouT3dV5ulb8=", "owner": "soopyc", "repo": "mystia", - "rev": "bf38c5b319cf42311c7f11ee31ac9526485c8d12", + "rev": "a0b2af79b7754214c2e5869e6b22ad06a7e6ed13", "type": "github" }, "original": { @@ -221,11 +221,11 @@ ] }, "locked": { - "lastModified": 1749960154, - "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=", + "lastModified": 1750565152, + "narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "424a40050cdc5f494ec45e46462d288f08c64475", + "rev": "78cd697acc2e492b4e92822a4913ffad279c20e6", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750412855, - "narHash": "sha256-LPEVD7FWRX+GFVWxIxNFLIB7kqet4tsAnV4mCKTdxNo=", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "lastModified": 1750633290, + "narHash": "sha256-w7N9SeSxFS0jvkbqyfc6FOGGyNiTQtv5jwbi1l/xpk8=", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre818804.08f22084e608/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre819493.4206c4cb5675/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1750526883, - "narHash": "sha256-/1TRBD7bTFpyewje9t3ZjeNWDcwOr/2plSpXwzBoBiA=", + "lastModified": 1750658653, + "narHash": "sha256-5b66kCRNlVvidmJoRIXjzW6yuq8hq00ReXHwe6puSjc=", "owner": "uku3lig", "repo": "ukubot-rs", - "rev": "32589e405c3370ead785ebc7c977ac67ab40c34e", + "rev": "8a7dbbe0e21f27378ed7cc57028b48ede4b106cf", "type": "github" }, "original": { From 6bda555040c2187be2f6711fb0519a05be3c50f4 Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 23 Jun 2025 12:29:36 +0200 Subject: [PATCH 4/4] chore(exprs): remove pgadmin fix --- exprs/overlay.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/exprs/overlay.nix b/exprs/overlay.nix index 69e6eb1..bb5be7a 100644 --- a/exprs/overlay.nix +++ b/exprs/overlay.nix @@ -13,8 +13,6 @@ inputs: final: prev: { ]; }); - pgadmin4 = prev.pgadmin4.override { python3 = prev.python312; }; - vencord = prev.vencord.overrideAttrs (old: { version = "${old.version}+git.${inputs.vencord.shortRev}"; src = inputs.vencord;