From e3e3bd162531ec261b8dd2f9859e017cabbea2df Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 2 Dec 2024 11:37:24 +1000 Subject: [PATCH 01/23] feature(nixos): upgrade to 24.11 Progresses #3 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 1614b3d..cfd2d23 100644 --- a/flake.lock +++ b/flake.lock @@ -5590,16 +5590,16 @@ }, "nixpkgs_37": { "locked": { - "lastModified": 1730327045, - "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080166c15633801df010977d9d7474b4a6c549d7", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 0112c53..342bfb7 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ daedalus.url = github:input-output-hk/daedalus/?ref=6.0.0; iohkNix.url = github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd; nix.url = github:NixOS/nix/?ref=2.24.6; - nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.05; + nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.11; nixpkgsUnstable.url = github:NixOS/nixpkgs; ragenix = { url = github:yaxitech/ragenix; -- 2.44.1 From 9608af2cd51c60d82559b5be4bdbf564308441c1 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 2 Dec 2024 11:49:13 +1000 Subject: [PATCH 02/23] chore(nixos): remove deprecated sound option Progresses #3 --- hosts/sanganto/default.nix | 2 -- hosts/sercanto/default.nix | 2 -- modules/roles/desktop/default.nix | 1 - profiles/desktop_common.nix | 1 - profiles/pipewire.nix | 1 - profiles/xmonad.nix | 7 ------- 6 files changed, 14 deletions(-) diff --git a/hosts/sanganto/default.nix b/hosts/sanganto/default.nix index 91fe061..de88864 100644 --- a/hosts/sanganto/default.nix +++ b/hosts/sanganto/default.nix @@ -94,8 +94,6 @@ }; }; - # Enable sound. - sound.enable = true; hardware = { bluetooth = { enable = true; diff --git a/hosts/sercanto/default.nix b/hosts/sercanto/default.nix index 588c470..7024716 100644 --- a/hosts/sercanto/default.nix +++ b/hosts/sercanto/default.nix @@ -91,8 +91,6 @@ }; }; - # Enable sound. - sound.enable = true; hardware = { bluetooth = { enable = true; diff --git a/modules/roles/desktop/default.nix b/modules/roles/desktop/default.nix index 9067565..a8e4b33 100644 --- a/modules/roles/desktop/default.nix +++ b/modules/roles/desktop/default.nix @@ -75,7 +75,6 @@ in { ]; udisks2.enable = true; # Enable udisks2 }; - sound.enable = true; # Enable sound. security.rtkit.enable = true; # realtime scheduling for sound # Configure common hardware settings diff --git a/profiles/desktop_common.nix b/profiles/desktop_common.nix index 42799e7..5500cc6 100644 --- a/profiles/desktop_common.nix +++ b/profiles/desktop_common.nix @@ -86,7 +86,6 @@ }; }; - sound.enable = true; # Enable sound. security.rtkit.enable = true; # realtime scheduling for sound # Configure common hardware settings diff --git a/profiles/pipewire.nix b/profiles/pipewire.nix index ed16113..29f4aa7 100644 --- a/profiles/pipewire.nix +++ b/profiles/pipewire.nix @@ -27,5 +27,4 @@ }; hardware.pulseaudio.enable = false; - sound.enable = true; # Enable sound. } diff --git a/profiles/xmonad.nix b/profiles/xmonad.nix index bb1a449..6e73a5d 100644 --- a/profiles/xmonad.nix +++ b/profiles/xmonad.nix @@ -49,13 +49,6 @@ }; }; - sound = { - mediaKeys = { - enable = true; - volumeStep = "5%"; - }; - }; - # Install any additional fonts that I require to be used with xmonad fonts.packages = with pkgs; [ open-sans # Used in in my polybar configuration -- 2.44.1 From 58055e4b38f867ad0e1f4cebd3e47caf0d7939c7 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 2 Dec 2024 16:05:20 +1000 Subject: [PATCH 03/23] chore(nix): slack package renamed Progresses #3 --- profiles/desktopFiona.nix | 2 +- profiles/iog.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/desktopFiona.nix b/profiles/desktopFiona.nix index 01605b4..7999d8c 100644 --- a/profiles/desktopFiona.nix +++ b/profiles/desktopFiona.nix @@ -6,7 +6,7 @@ }: { # Fiona's Desktop Packages environment.systemPackages = with pkgs; [ - slack-dark # Slack desktop client + slack # Slack desktop client zoom-us # zoom.us video conferencing application ]; } diff --git a/profiles/iog.nix b/profiles/iog.nix index dc066f3..a786672 100644 --- a/profiles/iog.nix +++ b/profiles/iog.nix @@ -48,7 +48,7 @@ in { magic-wormhole # Securely transfer data between computers s3fs # Mount an S3 bucket as filesystem through FUSE shellcheck # Shell script analysis tool - slack-dark # Slack desktop client + slack # Slack desktop client xxd # make a hexdump or do the reverse ]; variables = { -- 2.44.1 From 9f71fb255823c1305662188240aa4766500e1ef0 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 2 Dec 2024 17:34:44 +1000 Subject: [PATCH 04/23] chore(nixos): remove conflicting power configs Progresses #3 --- hosts/sercanto/default.nix | 1 - modules/profiles/cosmicDesktop/default.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/hosts/sercanto/default.nix b/hosts/sercanto/default.nix index 7024716..449a99e 100644 --- a/hosts/sercanto/default.nix +++ b/hosts/sercanto/default.nix @@ -17,7 +17,6 @@ ../../profiles/nixpkgs-dev.nix # Nix pkgs dev tools ../../profiles/openssh.nix # Enable and configure openssh ../../profiles/pipewire.nix # Enable and pipewire audio system - ../../profiles/powerManagement.nix # Power management for laptops ../../profiles/xmonad.nix # Xmonad desktop environment ../../profiles/yubikey.nix # Yubikey tooling ../../profiles/users-ops.nix # MIO Ops users diff --git a/modules/profiles/cosmicDesktop/default.nix b/modules/profiles/cosmicDesktop/default.nix index bffbd9b..ece5a9d 100644 --- a/modules/profiles/cosmicDesktop/default.nix +++ b/modules/profiles/cosmicDesktop/default.nix @@ -25,7 +25,6 @@ in { services = { desktopManager.cosmic.enable = true; displayManager.cosmic-greeter.enable = true; - power-profiles-daemon.enable = true; }; }; } -- 2.44.1 From 131062f6d72bd630255734883b25317633fb09fc Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 2 Dec 2024 17:44:25 +1000 Subject: [PATCH 05/23] chore(gnome): update deprecated gnome-tweaks path Preogresses #3 --- modules/roles/desktop/default.nix | 2 +- profiles/desktop_common.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/roles/desktop/default.nix b/modules/roles/desktop/default.nix index a8e4b33..d49744c 100644 --- a/modules/roles/desktop/default.nix +++ b/modules/roles/desktop/default.nix @@ -23,7 +23,7 @@ in { element-desktop # A feature-rich client for Matrix.org evince # document viewer firefox # A web browser built from Firefox source tree - gnome.gnome-tweaks # A tool to customize advanced GNOME 3 options + gnome-tweaks # A tool to customize advanced GNOME 3 options krita # A free and open source painting application libreoffice-fresh # Comprehensive, professional-quality productivity suite librewolf # Firefox fork, focused on privacy, security and freedom diff --git a/profiles/desktop_common.nix b/profiles/desktop_common.nix index 5500cc6..697cfff 100644 --- a/profiles/desktop_common.nix +++ b/profiles/desktop_common.nix @@ -22,7 +22,7 @@ chromium element-desktop # A feature-rich client for Matrix.org librewolf # Firefox fork, focused on privacy, security and freedom - gnome.gnome-tweaks # A tool to customize advanced GNOME 3 options + gnome-tweaks # A tool to customize advanced GNOME 3 options krita # A free and open source painting application libreoffice-fresh mplayer # A movie player that supports many video formats -- 2.44.1 From 51195b235b5ae6150184ebfe707adb137fafaf9a Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 4 Dec 2024 09:45:24 +1000 Subject: [PATCH 06/23] =?UTF-8?q?trajto(nixpkgsUnstable):=20frapi=C4=9Dis?= =?UTF-8?q?=20al=20la=20kapo=20de=20master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Progresses #3 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cfd2d23..d069af2 100644 --- a/flake.lock +++ b/flake.lock @@ -5125,11 +5125,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1730620998, - "narHash": "sha256-Psu99MaSjHs0YtVGVGiCNGrP5uXY5gmM3NV3gWYx+aY=", + "lastModified": 1733268980, + "narHash": "sha256-SEMgwpx5bbT8SW5iN64sxoL1kmezV/M7mcUL5PH6gdY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0d0a083585193d7a5c0bb0a7172b3f7a975beb6", + "rev": "a2283c7a2e280fbaae9f9fec8cfa0e6259e0e056", "type": "github" }, "original": { -- 2.44.1 From 79ddd841aeb912c6da8b52df8a574c64ffa3cfe5 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 4 Dec 2024 10:13:46 +1000 Subject: [PATCH 07/23] =?UTF-8?q?trajto(cosmicDesktop):=20frapi=C4=9Dis=20?= =?UTF-8?q?al=20la=20kapo=20de=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Progresses #3 --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index d069af2..3cb66c9 100644 --- a/flake.lock +++ b/flake.lock @@ -907,11 +907,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730597759, - "narHash": "sha256-DStWygV/fV3aU8VWN4wIG4Mjpq7s540gUD4A103u+Zo=", + "lastModified": 1733265593, + "narHash": "sha256-sMd0QBqmH68O2N7DAfz7WtCTPzgY2MWjAIw18dUgNcg=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "db3975340480a6c2532398991f3a47f74df17eed", + "rev": "e1b76524988d600dcf415ec5355a727ca2c5debe", "type": "github" }, "original": { @@ -5013,16 +5013,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1730327045, - "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080166c15633801df010977d9d7474b4a6c549d7", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -6109,11 +6109,11 @@ ] }, "locked": { - "lastModified": 1730514457, - "narHash": "sha256-cjFX208s9pyaOfMvF9xI6WyafyXINqdhMF7b1bMQpLI=", + "lastModified": 1732933841, + "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1ff38ca26eb31858e4dfe7fe738b6b3ce5d74922", + "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", "type": "github" }, "original": { -- 2.44.1 From 4819a098ae2800a71b3d7239589978c07305afab Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 4 Dec 2024 10:23:17 +1000 Subject: [PATCH 08/23] =?UTF-8?q?trajto(daedalus):=20frapi=C4=9Dis=20al=20?= =?UTF-8?q?la=20v6.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Progresses #3 --- flake.lock | 488 +++++------------------------------------------------ flake.nix | 2 +- 2 files changed, 41 insertions(+), 449 deletions(-) diff --git a/flake.lock b/flake.lock index 3cb66c9..8042356 100644 --- a/flake.lock +++ b/flake.lock @@ -244,21 +244,6 @@ "type": "github" } }, - "blank_7": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, "cabal-32": { "flake": false, "locked": { @@ -697,6 +682,23 @@ "type": "github" } }, + "cardano-node-override": { + "flake": false, + "locked": { + "lastModified": 1725255033, + "narHash": "sha256-VIwEjpaGk09+dAcKELjLSR2OP3qBCWTGHpd0SBjgbVc=", + "owner": "IntersectMBO", + "repo": "cardano-node", + "rev": "efd560070aaf042d1eb4680ae37fc607c7742319", + "type": "github" + }, + "original": { + "owner": "IntersectMBO", + "ref": "9.1.1", + "repo": "cardano-node", + "type": "github" + } + }, "cardano-node-snapshot": { "inputs": { "customConfig": "customConfig_4", @@ -731,11 +733,11 @@ "cardano-playground": { "flake": false, "locked": { - "lastModified": 1723217743, - "narHash": "sha256-Jt2onBMJI4O53EEi6QoyXdivOlEoPmZ/KSgfBLHgN6M=", + "lastModified": 1721869644, + "narHash": "sha256-2qPZuuXtNi7kRPCFHv1Zvno/FIH0dOyg3Zqeywt77WQ=", "owner": "input-output-hk", "repo": "cardano-playground", - "rev": "afd96579a3fda70ddbf414b0d5c5a40193750175", + "rev": "c3042e1669ad9e5af43622972913614d6b934488", "type": "github" }, "original": { @@ -1018,6 +1020,7 @@ }, "daedalus": { "inputs": { + "cardano-node-override": "cardano-node-override", "cardano-playground": "cardano-playground", "cardano-shell": "cardano-shell_7", "cardano-wallet-unpatched": "cardano-wallet-unpatched", @@ -1027,16 +1030,16 @@ "tullia": "tullia_7" }, "locked": { - "lastModified": 1723205985, - "narHash": "sha256-z4Pj91APyMPKnuHWfmXDnxioKSieQlGnqaKnXl36jAw=", + "lastModified": 1727770993, + "narHash": "sha256-Wa6Vpc6dTVOWKy2oSf2GmDDJjAkeDhL7AZW2eYoISHI=", "owner": "input-output-hk", "repo": "daedalus", - "rev": "72e26ae0ee1e600972e28704db50554115f38f4f", + "rev": "ca5b0036009f4976679ecff68b479596b2b097a9", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "6.0.0", + "ref": "6.0.2", "repo": "daedalus", "type": "github" } @@ -1256,35 +1259,6 @@ "type": "github" } }, - "devshell_7": { - "inputs": { - "flake-utils": [ - "daedalus", - "tullia", - "std", - "flake-utils" - ], - "nixpkgs": [ - "daedalus", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", - "owner": "numtide", - "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dmerge": { "inputs": { "nixlib": [ @@ -1477,35 +1451,6 @@ "type": "github" } }, - "dmerge_7": { - "inputs": { - "nixlib": [ - "daedalus", - "tullia", - "std", - "nixpkgs" - ], - "yants": [ - "daedalus", - "tullia", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1659548052, - "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", - "owner": "divnix", - "repo": "data-merge", - "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, "em": { "flake": false, "locked": { @@ -1635,22 +1580,6 @@ } }, "flake-compat_15": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_16": { "flake": false, "locked": { "lastModified": 1696426674, @@ -2061,51 +1990,6 @@ } }, "flake-utils_24": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_25": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_26": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_27": { "inputs": { "systems": "systems_2" }, @@ -2475,25 +2359,6 @@ "type": "github" } }, - "gomod2nix_7": { - "inputs": { - "nixpkgs": "nixpkgs_31", - "utils": "utils_12" - }, - "locked": { - "lastModified": 1655245309, - "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "hackage": { "flake": false, "locked": { @@ -3244,7 +3109,7 @@ }, "iohkNix_6": { "inputs": { - "nixpkgs": "nixpkgs_35" + "nixpkgs": "nixpkgs_31" }, "locked": { "lastModified": 1629993366, @@ -3392,22 +3257,6 @@ "type": "github" } }, - "mdbook-kroki-preprocessor_3": { - "flake": false, - "locked": { - "lastModified": 1661755005, - "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=", - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f", - "type": "github" - }, - "original": { - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "type": "github" - } - }, "membench": { "inputs": { "cardano-mainnet-mirror": "cardano-mainnet-mirror_3", @@ -3662,30 +3511,6 @@ "type": "github" } }, - "n2c_7": { - "inputs": { - "flake-utils": "flake-utils_26", - "nixpkgs": [ - "daedalus", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1665039323, - "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -3960,41 +3785,6 @@ "type": "github" } }, - "nix-nomad_7": { - "inputs": { - "flake-compat": "flake-compat_15", - "flake-utils": [ - "daedalus", - "tullia", - "nix2container", - "flake-utils" - ], - "gomod2nix": "gomod2nix_7", - "nixpkgs": [ - "daedalus", - "tullia", - "nixpkgs" - ], - "nixpkgs-lib": [ - "daedalus", - "tullia", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658277770, - "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", - "owner": "tristanpemble", - "repo": "nix-nomad", - "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", - "type": "github" - }, - "original": { - "owner": "tristanpemble", - "repo": "nix-nomad", - "type": "github" - } - }, "nix-tools": { "flake": false, "locked": { @@ -4176,25 +3966,6 @@ "type": "github" } }, - "nix2container_8": { - "inputs": { - "flake-utils": "flake-utils_24", - "nixpkgs": "nixpkgs_32" - }, - "locked": { - "lastModified": 1658567952, - "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, "nixTools": { "flake": false, "locked": { @@ -4255,11 +4026,11 @@ }, "nix_4": { "inputs": { - "flake-compat": "flake-compat_16", + "flake-compat": "flake-compat_15", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_36", + "nixpkgs": "nixpkgs_32", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression_4" }, @@ -4515,41 +4286,6 @@ "type": "github" } }, - "nixago_7": { - "inputs": { - "flake-utils": [ - "daedalus", - "tullia", - "std", - "flake-utils" - ], - "nixago-exts": [ - "daedalus", - "tullia", - "std", - "blank" - ], - "nixpkgs": [ - "daedalus", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1661824785, - "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", - "owner": "nix-community", - "repo": "nixago", - "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1642336556, @@ -5481,11 +5217,11 @@ }, "nixpkgs_30": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1672844754, + "narHash": "sha256-o26WabuHABQsaHxxmIrR3AQRqDFUEdLckLXkVCpIjSU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "e9ade2c8240e00a4784fac282a502efff2786bdc", "type": "github" }, "original": { @@ -5496,69 +5232,6 @@ } }, "nixpkgs_31": { - "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_32": { - "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_33": { - "locked": { - "lastModified": 1653920503, - "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_34": { - "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_35": { "locked": { "lastModified": 1691003216, "narHash": "sha256-Qq/MPkhS12Bl0X060pPvX3v9ac3f2rRQfHjjozPh/Qs=", @@ -5572,7 +5245,7 @@ "type": "indirect" } }, - "nixpkgs_36": { + "nixpkgs_32": { "locked": { "lastModified": 1723688146, "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", @@ -5588,7 +5261,7 @@ "type": "github" } }, - "nixpkgs_37": { + "nixpkgs_33": { "locked": { "lastModified": 1732981179, "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", @@ -6067,7 +5740,7 @@ "inputs": { "agenix": "agenix", "crane": "crane", - "flake-utils": "flake-utils_27", + "flake-utils": "flake-utils_24", "nixpkgs": [ "nixpkgs" ], @@ -6095,10 +5768,10 @@ "daedalus": "daedalus", "iohkNix": "iohkNix_6", "nix": "nix_4", - "nixpkgs": "nixpkgs_37", + "nixpkgs": "nixpkgs_33", "nixpkgsUnstable": "nixpkgsUnstable", "ragenix": "ragenix", - "utils": "utils_13" + "utils": "utils_12" } }, "rust-overlay": { @@ -6537,44 +6210,6 @@ "type": "github" } }, - "std_7": { - "inputs": { - "blank": "blank_7", - "devshell": "devshell_7", - "dmerge": "dmerge_7", - "flake-utils": "flake-utils_25", - "makes": [ - "daedalus", - "tullia", - "std", - "blank" - ], - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_3", - "microvm": [ - "daedalus", - "tullia", - "std", - "blank" - ], - "n2c": "n2c_7", - "nixago": "nixago_7", - "nixpkgs": "nixpkgs_34", - "yants": "yants_7" - }, - "locked": { - "lastModified": 1665513321, - "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", - "owner": "divnix", - "repo": "std", - "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -6767,18 +6402,13 @@ } }, "tullia_7": { - "inputs": { - "nix-nomad": "nix-nomad_7", - "nix2container": "nix2container_8", - "nixpkgs": "nixpkgs_33", - "std": "std_7" - }, + "flake": false, "locked": { - "lastModified": 1668711738, - "narHash": "sha256-CBjky16o9pqsGE1bWu6nRlRajgSXMEk+yaFQLibqXcE=", + "lastModified": 1677666696, + "narHash": "sha256-Oga/fHNJba7dM6HSz83RNv/UrUeGs1WRHUHbI8dCUqc=", "owner": "input-output-hk", "repo": "tullia", - "rev": "ead1f515c251f0e060060ef0e2356a51d3dfe4b0", + "rev": "708d1ec45b17923d2452ba8f28795228ba8aafd5", "type": "github" }, "original": { @@ -6833,21 +6463,6 @@ } }, "utils_12": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_13": { "inputs": { "systems": "systems_3" }, @@ -7131,29 +6746,6 @@ "repo": "yants", "type": "github" } - }, - "yants_7": { - "inputs": { - "nixpkgs": [ - "daedalus", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660507851, - "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", - "owner": "divnix", - "repo": "yants", - "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 342bfb7..5012102 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ url = github:lilyinstarlight/nixos-cosmic; inputs.nixpkgs.follows = "nixpkgsUnstable"; }; - daedalus.url = github:input-output-hk/daedalus/?ref=6.0.0; + daedalus.url = github:input-output-hk/daedalus/?ref=6.0.2; iohkNix.url = github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd; nix.url = github:NixOS/nix/?ref=2.24.6; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.11; -- 2.44.1 From b2ea00d0e036bbf6bcb4730cad5b77e95a742658 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 4 Dec 2024 10:25:52 +1000 Subject: [PATCH 09/23] =?UTF-8?q?trajto(iohkNix):=20frapi=C4=9Dis=20al=20l?= =?UTF-8?q?a=20kapo=20master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Progresses #3 --- flake.lock | 77 ++++++++++++++++++++++++++++++++++++++++++++++-------- flake.nix | 2 +- 2 files changed, 67 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 8042356..34fae5d 100644 --- a/flake.lock +++ b/flake.lock @@ -244,6 +244,23 @@ "type": "github" } }, + "blst": { + "flake": false, + "locked": { + "lastModified": 1691598027, + "narHash": "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA=", + "owner": "supranational", + "repo": "blst", + "rev": "3dd0f804b1819e5d03fb22ca2e6fac105932043a", + "type": "github" + }, + "original": { + "owner": "supranational", + "ref": "v0.3.11", + "repo": "blst", + "type": "github" + } + }, "cabal-32": { "flake": false, "locked": { @@ -3109,19 +3126,21 @@ }, "iohkNix_6": { "inputs": { - "nixpkgs": "nixpkgs_31" + "blst": "blst", + "nixpkgs": "nixpkgs_31", + "secp256k1": "secp256k1", + "sodium": "sodium" }, "locked": { - "lastModified": 1629993366, - "narHash": "sha256-FNjrODWYQcZ6VRZzdmUUE3Jh3IZZ4zOwsNbPznX27G4=", + "lastModified": 1732287300, + "narHash": "sha256-lURsE6HdJX0alscWhbzCWyLRK8GpAgKuXeIgX31Kfqg=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "df1da282f996ec46b33379407df99613a1fbafdd", + "rev": "262cb2aec2ddd914124bab90b06fe24a1a74d02c", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "df1da282f996ec46b33379407df99613a1fbafdd", "repo": "iohk-nix", "type": "github" } @@ -5233,16 +5252,18 @@ }, "nixpkgs_31": { "locked": { - "lastModified": 1691003216, - "narHash": "sha256-Qq/MPkhS12Bl0X060pPvX3v9ac3f2rRQfHjjozPh/Qs=", - "owner": "NixOS", + "lastModified": 1684171562, + "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "4a56ce9727a0c5478a836a0d8a8f641c5b9a3d5f", + "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_32": { @@ -5820,6 +5841,40 @@ "type": "github" } }, + "secp256k1": { + "flake": false, + "locked": { + "lastModified": 1683999695, + "narHash": "sha256-9nJJVENMXjXEJZzw8DHzin1DkFkF8h9m/c6PuM7Uk4s=", + "owner": "bitcoin-core", + "repo": "secp256k1", + "rev": "acf5c55ae6a94e5ca847e07def40427547876101", + "type": "github" + }, + "original": { + "owner": "bitcoin-core", + "ref": "v0.3.2", + "repo": "secp256k1", + "type": "github" + } + }, + "sodium": { + "flake": false, + "locked": { + "lastModified": 1675156279, + "narHash": "sha256-0uRcN5gvMwO7MCXVYnoqG/OmeBFi8qRVnDWJLnBb9+Y=", + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + } + }, "stable": { "locked": { "lastModified": 1669735802, diff --git a/flake.nix b/flake.nix index 5012102..9865fe9 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ inputs.nixpkgs.follows = "nixpkgsUnstable"; }; daedalus.url = github:input-output-hk/daedalus/?ref=6.0.2; - iohkNix.url = github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd; + iohkNix.url = github:input-output-hk/iohk-nix/; nix.url = github:NixOS/nix/?ref=2.24.6; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.11; nixpkgsUnstable.url = github:NixOS/nixpkgs; -- 2.44.1 From 9f48a441c365f09685232ca0a4371165796e595f Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 4 Dec 2024 10:30:54 +1000 Subject: [PATCH 10/23] =?UTF-8?q?trajto(ragenix):=20frapi=C4=9Dis=20al=20l?= =?UTF-8?q?a=20kapo=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Progresses #3 --- flake.lock | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 34fae5d..872f263 100644 --- a/flake.lock +++ b/flake.lock @@ -141,11 +141,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -940,18 +940,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "ragenix", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1708794349, - "narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=", + "lastModified": 1725409566, + "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", "owner": "ipetkov", "repo": "crane", - "rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa", + "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", "type": "github" }, "original": { @@ -2011,11 +2005,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -5768,11 +5762,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1718869541, - "narHash": "sha256-smhpGh1x/8mNl+sFL8SbeWnx0bK4HWjmdRA3mIwGjPU=", + "lastModified": 1726755133, + "narHash": "sha256-03XIEjHeZEjHXctsXYUB+ZLQmM0WuhR6qWQjwekFk/M=", "owner": "yaxitech", "repo": "ragenix", - "rev": "8a254bbaa93fbd38e16f70fa81af6782794e046e", + "rev": "687ee92114bce9c4724376cf6b21235abe880bfa", "type": "github" }, "original": { @@ -5818,21 +5812,17 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": [ - "ragenix", - "flake-utils" - ], "nixpkgs": [ "ragenix", "nixpkgs" ] }, "locked": { - "lastModified": 1708740535, - "narHash": "sha256-NCTw235XwSDbeTAtAwg/hOeNOgwYhVq7JjDdbkOgBeA=", + "lastModified": 1725675754, + "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9b24383d77f598716fa0cbb8b48c97249f5ee1af", + "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54", "type": "github" }, "original": { -- 2.44.1 From c604b7f1ef73393aaabcde73c8a83e5c49992d4c Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 4 Dec 2024 10:36:34 +1000 Subject: [PATCH 11/23] =?UTF-8?q?trajto(nix):=20frapi=C4=9Dis=20al=20la=20?= =?UTF-8?q?v2.25.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Progresses #3 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 872f263..6147b59 100644 --- a/flake.lock +++ b/flake.lock @@ -4048,16 +4048,16 @@ "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { - "lastModified": 1725964975, - "narHash": "sha256-kgq3B+olx62bzGD5C6ighdAoDweLq+AebxVHcDnKH4w=", + "lastModified": 1732881227, + "narHash": "sha256-T+wFMm3cj8pGJSwXmPuxG5pz+1gRDJoToF9OBxtzocA=", "owner": "NixOS", "repo": "nix", - "rev": "eb11c1499876cd4c9c188cbda5b1003b36ce2e59", + "rev": "218cd6c16c0981cc32a45e3a15be1d3c1a68eb85", "type": "github" }, "original": { "owner": "NixOS", - "ref": "2.24.6", + "ref": "2.25.3", "repo": "nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 9865fe9..5e6a0ac 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ }; daedalus.url = github:input-output-hk/daedalus/?ref=6.0.2; iohkNix.url = github:input-output-hk/iohk-nix/; - nix.url = github:NixOS/nix/?ref=2.24.6; + nix.url = github:NixOS/nix/?ref=2.25.3; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.11; nixpkgsUnstable.url = github:NixOS/nixpkgs; ragenix = { -- 2.44.1 From ccc8fd0d9950bf656d5d73aa1dd6e6e03cb38edd Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 4 Dec 2024 10:43:52 +1000 Subject: [PATCH 12/23] =?UTF-8?q?trajto(uitls):=20frapi=C4=9Dis=20al=20la?= =?UTF-8?q?=20kapo=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Progresses #3 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6147b59..a77fbd8 100644 --- a/flake.lock +++ b/flake.lock @@ -6512,11 +6512,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { -- 2.44.1 From 9d74b29b52f982cfcd83da4b6e931070f50c8b06 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 4 Dec 2024 11:02:47 +1000 Subject: [PATCH 13/23] tasko(powerManagement): forigi cpu-freq MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ŝajnas konflikti kun io kontraŭflue. Progresses #3 --- profiles/powerManagement.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/profiles/powerManagement.nix b/profiles/powerManagement.nix index 2b70da7..c1d4b93 100644 --- a/profiles/powerManagement.nix +++ b/profiles/powerManagement.nix @@ -23,19 +23,6 @@ ''; }; thermald.enable = true; - auto-cpufreq = { - enable = true; - settings = { - battery = { - governor = "powersave"; - turbo = "never"; - }; - charger = { - governor = "performance"; - turbo = "auto"; - }; - }; - }; upower = { enable = true; # Enable application power managemetn support percentageCritical = 15; -- 2.44.1 From 7b0aa84ae3c74db0c83b0cad12d2e1f65ea812a3 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 4 Dec 2024 15:16:37 +1000 Subject: [PATCH 14/23] tasko(raspberryPi): forigi malrekomenditan agordon Progresses #3 --- hardware/raspberry_pi_4_model_B.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hardware/raspberry_pi_4_model_B.nix b/hardware/raspberry_pi_4_model_B.nix index 4abc0d5..4e5a4c3 100644 --- a/hardware/raspberry_pi_4_model_B.nix +++ b/hardware/raspberry_pi_4_model_B.nix @@ -23,10 +23,6 @@ grub = { enable = false; # NixOS wants to enable GRUB by default. }; - raspberryPi = { - enable = true; - version = 4; - }; }; tmpOnTmpfs = true; }; -- 2.44.1 From d0b86858e9bb16ba469e64df88895b32b081428c Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 4 Dec 2024 15:30:47 +1000 Subject: [PATCH 15/23] tasko(hardware): forigi malrekomenditan opengl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Anstataŭigita per "graphics". Progresses #3 --- hardware/lenovo_x201.nix | 2 +- hardware/lenovo_yoga7i.nix | 2 +- hosts/sanganto/default.nix | 8 -------- hosts/sercanto/default.nix | 8 -------- modules/roles/desktop/default.nix | 2 +- profiles/desktop_common.nix | 2 +- 6 files changed, 4 insertions(+), 20 deletions(-) diff --git a/hardware/lenovo_x201.nix b/hardware/lenovo_x201.nix index 47dbb30..1aa22c4 100644 --- a/hardware/lenovo_x201.nix +++ b/hardware/lenovo_x201.nix @@ -19,7 +19,7 @@ swapDevices = [{device = "/dev/disk/by-label/swap";}]; - hardware.opengl.extraPackages = with pkgs; [vaapiIntel]; + hardware.graphics.extraPackages = with pkgs; [vaapiIntel]; nix.settings.max-jobs = lib.mkDefault 4; services.thinkfan = { diff --git a/hardware/lenovo_yoga7i.nix b/hardware/lenovo_yoga7i.nix index 391b83a..1c81960 100644 --- a/hardware/lenovo_yoga7i.nix +++ b/hardware/lenovo_yoga7i.nix @@ -38,6 +38,6 @@ {device = "/dev/disk/by-label/swap";} ]; - hardware.opengl.extraPackages = with pkgs; [vaapiIntel]; + hardware.graphics.extraPackages = with pkgs; [vaapiIntel]; nix.settings.max-jobs = lib.mkDefault 4; } diff --git a/hosts/sanganto/default.nix b/hosts/sanganto/default.nix index de88864..4687360 100644 --- a/hosts/sanganto/default.nix +++ b/hosts/sanganto/default.nix @@ -94,14 +94,6 @@ }; }; - hardware = { - bluetooth = { - enable = true; - settings = {Policy = {AutoEnable = "true";};}; - }; - opengl.enable = true; - }; - # The below pair are set to overcome flakey connections / busy servers that # fail to respond to ssh keep alive requests, sometimes triggering: # client_loop: send disconnect: Broken pipe diff --git a/hosts/sercanto/default.nix b/hosts/sercanto/default.nix index 449a99e..f88f082 100644 --- a/hosts/sercanto/default.nix +++ b/hosts/sercanto/default.nix @@ -90,14 +90,6 @@ }; }; - hardware = { - bluetooth = { - enable = true; - settings = {Policy = {AutoEnable = "true";};}; - }; - opengl.enable = true; - }; - # The below pair are set to overcome flakey connections / busy servers that # fail to respond to ssh keep alive requests, sometimes triggering: # client_loop: send disconnect: Broken pipe diff --git a/modules/roles/desktop/default.nix b/modules/roles/desktop/default.nix index d49744c..817f992 100644 --- a/modules/roles/desktop/default.nix +++ b/modules/roles/desktop/default.nix @@ -92,7 +92,7 @@ in { Policy = {AutoEnable = "true";}; }; }; - opengl.enable = true; + graphics.enable = true; }; # Configure libreWolf and Chromium diff --git a/profiles/desktop_common.nix b/profiles/desktop_common.nix index 697cfff..93f91be 100644 --- a/profiles/desktop_common.nix +++ b/profiles/desktop_common.nix @@ -103,7 +103,7 @@ Policy = {AutoEnable = "true";}; }; }; - opengl.enable = true; + graphics.enable = true; }; # Configure libreWolf and Chromium -- 2.44.1 From 110275078be11c40e86657c9c6aa6bb7ce6df599 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 5 Dec 2024 22:34:22 +1000 Subject: [PATCH 16/23] tasko(raspberryPi4): updated tmp.useTmpfs de malrekomendita tmpOnTmpfs Progresses #3 --- hardware/raspberry_pi_4_model_B.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/raspberry_pi_4_model_B.nix b/hardware/raspberry_pi_4_model_B.nix index 4e5a4c3..f71af4f 100644 --- a/hardware/raspberry_pi_4_model_B.nix +++ b/hardware/raspberry_pi_4_model_B.nix @@ -24,7 +24,7 @@ enable = false; # NixOS wants to enable GRUB by default. }; }; - tmpOnTmpfs = true; + tmp.useTmpfs = true; }; # File systems configuration for using the installer's partition layout -- 2.44.1 From 6e8b349f30c424bf20441aae4d616ed0b0851946 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 5 Dec 2024 22:39:40 +1000 Subject: [PATCH 17/23] =?UTF-8?q?trajto(nextcloud):=20=C4=9Disdatigi=20al?= =?UTF-8?q?=20v30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Progresses #3 --- profiles/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/nextcloud.nix b/profiles/nextcloud.nix index 44b68c4..ecc045c 100644 --- a/profiles/nextcloud.nix +++ b/profiles/nextcloud.nix @@ -39,7 +39,7 @@ enable = true; # Run regular auto update of all apps installed startAt = "01:00:00"; # When to run the update }; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; extraApps = with config.services.nextcloud.package.packages.apps; { inherit calendar contacts deck gpoddersync notes tasks twofactor_webauthn; }; -- 2.44.1 From 59f467b8dba375962f94ef5adecaa7f798bca23e Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 5 Dec 2024 22:51:56 +1000 Subject: [PATCH 18/23] tasko(nixpkgs-dev): origita malkonservita pako nix-universal-prefetch Progresses #3 --- profiles/nixpkgs-dev.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/profiles/nixpkgs-dev.nix b/profiles/nixpkgs-dev.nix index 07b80f2..50301ef 100644 --- a/profiles/nixpkgs-dev.nix +++ b/profiles/nixpkgs-dev.nix @@ -20,7 +20,6 @@ nix-prefetch-git # Prefetch sources from git nixpkgs-review # Review pull-requests on https://github.com/NixOS/nixpkgs nix-top # Tracks what nix is building - nix-universal-prefetch # Uses nixpkgs fetchers to figure out hashes nodePackages.node2nix # Generate Nix expressions to build NPM packages nox # Tools to make Nix nicer sqlite # To query the nixpkgs sqlite database -- 2.44.1 From 128e51d16fdb7f3271985477a3edc04ae59a495d Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 5 Dec 2024 22:55:20 +1000 Subject: [PATCH 19/23] tasko(raspberryPi3): forigi malrekomenditan agordon Progresses #3 --- hardware/raspberry_pi_3_model_B.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hardware/raspberry_pi_3_model_B.nix b/hardware/raspberry_pi_3_model_B.nix index 938b1af..e1f059f 100644 --- a/hardware/raspberry_pi_3_model_B.nix +++ b/hardware/raspberry_pi_3_model_B.nix @@ -28,16 +28,6 @@ grub = { enable = false; # NixOS wants to enable GRUB by default. }; - raspberryPi = { - enable = false; - version = 3; - firmwareConfig = '' - arm_64bit=1 # Force kernel loading system to assume a 64-bit kernel - display_auto_detect=1 # Enable auto detection of screen resolution - gpu_mem=128 - hdmi_force_hotplug=1 # Enable headless booting - ''; - }; }; }; -- 2.44.1 From da2d4d2831d5392c6140c6b90cac27c367352ffa Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 5 Dec 2024 23:18:48 +1000 Subject: [PATCH 20/23] tasko(cosmicDesktop): forigi cosmic-tweaks Progresses #3 --- modules/profiles/cosmicDesktop/default.nix | 1 - modules/roles/desktop/default.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/profiles/cosmicDesktop/default.nix b/modules/profiles/cosmicDesktop/default.nix index ece5a9d..2a575eb 100644 --- a/modules/profiles/cosmicDesktop/default.nix +++ b/modules/profiles/cosmicDesktop/default.nix @@ -20,7 +20,6 @@ in { trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; }; environment.systemPackages = with pkgs; [ - cosmic-tweaks ]; services = { desktopManager.cosmic.enable = true; diff --git a/modules/roles/desktop/default.nix b/modules/roles/desktop/default.nix index 817f992..e15e1f2 100644 --- a/modules/roles/desktop/default.nix +++ b/modules/roles/desktop/default.nix @@ -19,7 +19,6 @@ in { environment.systemPackages = with pkgs; [ brave # Privacy-oriented browser chromium - cosmic-tweaks element-desktop # A feature-rich client for Matrix.org evince # document viewer firefox # A web browser built from Firefox source tree -- 2.44.1 From 7b2327968133d7acf451352ce8c888ca8f2d0387 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sun, 8 Dec 2024 21:21:21 +1000 Subject: [PATCH 21/23] =?UTF-8?q?trajto(cosmicDesktop):=20frapi=C4=9Dis=20?= =?UTF-8?q?al=20la=20alpha.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Progresses #3 --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a77fbd8..b9d648c 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1733265593, - "narHash": "sha256-sMd0QBqmH68O2N7DAfz7WtCTPzgY2MWjAIw18dUgNcg=", + "lastModified": 1733621779, + "narHash": "sha256-oeBPiHmg8T/Qsf4qMkUqOrn6/xkJwREGo1jA+4xDssk=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "e1b76524988d600dcf415ec5355a727ca2c5debe", + "rev": "b9ec66ed4e1430061ca044e938bb10f3ab629ba3", "type": "github" }, "original": { @@ -4762,11 +4762,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { @@ -5797,11 +5797,11 @@ ] }, "locked": { - "lastModified": 1732933841, - "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", + "lastModified": 1733538766, + "narHash": "sha256-FEDfBpM82XGdHDbLDJC4lV+QXSVN1rERt1MqtBGJZds=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", + "rev": "66526479b295ad238843a8a7367d2da7ec102757", "type": "github" }, "original": { -- 2.44.1 From 8b55d63376ce13c27f802e2f9b01365987e810dd Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Tue, 11 Feb 2025 11:20:26 +1000 Subject: [PATCH 22/23] chore(nixos): bump to HEAD of 24.11 and unstable --- flake.lock | 38 ++++++++------------------------------ 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index b9d648c..71c7af6 100644 --- a/flake.lock +++ b/flake.lock @@ -922,15 +922,14 @@ "nixpkgs": [ "nixpkgsUnstable" ], - "nixpkgs-stable": "nixpkgs-stable", - "rust-overlay": "rust-overlay" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1733621779, - "narHash": "sha256-oeBPiHmg8T/Qsf4qMkUqOrn6/xkJwREGo1jA+4xDssk=", + "lastModified": 1736986915, + "narHash": "sha256-kluqu772XQsChMIVFhMWLxCEFqoPsOYeSW4VoYtIxtY=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "b9ec66ed4e1430061ca044e938bb10f3ab629ba3", + "rev": "bd40b6e6c1c3e618da16adb4f622ce2c99377c1d", "type": "github" }, "original": { @@ -4762,11 +4761,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1733412085, - "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", + "lastModified": 1736867362, + "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", + "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc", "type": "github" }, "original": { @@ -5759,7 +5758,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1726755133, @@ -5790,27 +5789,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "cosmicDesktop", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733538766, - "narHash": "sha256-FEDfBpM82XGdHDbLDJC4lV+QXSVN1rERt1MqtBGJZds=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "66526479b295ad238843a8a7367d2da7ec102757", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "ragenix", -- 2.44.1 From 8791584c308447d1b8ead8ab3f86b227db116a03 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 17 Feb 2025 22:51:09 +1000 Subject: [PATCH 23/23] trajto(nextcloud): aldonis "news" Progresses #3 --- profiles/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/nextcloud.nix b/profiles/nextcloud.nix index ecc045c..515b42a 100644 --- a/profiles/nextcloud.nix +++ b/profiles/nextcloud.nix @@ -41,7 +41,7 @@ }; package = pkgs.nextcloud30; extraApps = with config.services.nextcloud.package.packages.apps; { - inherit calendar contacts deck gpoddersync notes tasks twofactor_webauthn; + inherit calendar contacts deck gpoddersync news notes tasks twofactor_webauthn; }; extraAppsEnable = true; settings = { -- 2.44.1