From 1d4666739ce9d445d0f773ca02f9c6a17a83d05a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 00:57:05 +0100 Subject: [PATCH 01/16] 24.05 -> 24.11 beta - switching to NixOS 24.11 family of inputs - after th branchoff, no channel bump or home-manager release has been made yet, thus pointing towards some preliminary branches so far - had to disable a few packages for now --- common/default.nix | 2 +- flake.lock | 40 +++++++++++++++++++------------------- flake.nix | 6 ++++-- home/modules/packages.nix | 12 +++++++----- hosts/framenix/default.nix | 3 --- 5 files changed, 32 insertions(+), 31 deletions(-) diff --git a/common/default.nix b/common/default.nix index da46b63..9c00df7 100644 --- a/common/default.nix +++ b/common/default.nix @@ -42,7 +42,7 @@ in # Some programs need SUID wrappers, can be configured further or are # started in user sessions. - programs.bash.enableCompletion = true; + programs.bash.completion.enable = true; programs.wireshark = { enable = true; package = pkgs.wireshark; diff --git a/flake.lock b/flake.lock index b6617ed..38da4fb 100644 --- a/flake.lock +++ b/flake.lock @@ -117,16 +117,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1731604581, + "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731332224, - "narHash": "sha256-0ctfVp27ingWtY7dbP5+QpSQ98HaOZleU0teyHQUAw0=", + "lastModified": 1731403644, + "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "184687ae1a3139faa4746168baf071f60d0310c8", + "rev": "f6581f1c3b137086e42a08a906bdada63045f991", "type": "github" }, "original": { @@ -258,27 +258,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", + "lastModified": 1731613620, + "narHash": "sha256-Qb4cpVp1pr29mvbqMROn7BcYt60GJ948RSM4UKU2DV4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", + "rev": "f4a0fbc120cd775346111246b453f8af94afc1d1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "release-24.11", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1731350327, - "narHash": "sha256-FQg83gsyB++oVNPg6QP9enTlYxG9d5K5wcdc8jE5tTk=", + "lastModified": 1731623759, + "narHash": "sha256-v7ow++vH4cgaWeKnMdt/HGmvFPqCTyzkghyY/JdkMGE=", "owner": "nix-community", "repo": "NUR", - "rev": "4d77b647a89d6405bfd2a6a2fecf613a3520683b", + "rev": "b53bdb77031c86c9525329368fdd87b28792b1db", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1729613947, - "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { @@ -412,11 +412,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 796a574..2bc13e4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,13 @@ description = "NixOS system flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; + #nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/master"; + #url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index af65012..2d289ae 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -41,7 +41,7 @@ let musescore tenacity soundkonverter - config.nur.repos.fooker.studio-link + #config.nur.repos.fooker.studio-link ]; cliApps = @@ -150,7 +150,7 @@ let chromium falkon thunderbird - calibre + #calibre # FIXME: using bin due to failing tests dino zotero ding @@ -179,7 +179,7 @@ let yate # split and merge PDFs in a GUI pdfarranger - #qbittorrent # currently insecure + qbittorrent #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) @@ -193,12 +193,14 @@ let ]; kdeTools = - [ okteta ] + [ + okteta + plasma5Packages.kdeconnect-kde + ] ++ (with kdePackages; [ okular gwenview yakuake - kdeconnect dolphin spectacle kate diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 688dd48..86cb501 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -20,9 +20,6 @@ in networking.hostName = "framenix"; # Define your hostname. - # use newer linux-firmware from unstable - hardware.firmware = lib.mkBefore [ unstable.linux-firmware ]; - # override tmpdir for daemon systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; From 57b91bbcbec7cb4ff4c5f7289b123e5191446d4e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 01:14:47 +0100 Subject: [PATCH 02/16] nix: repl-flake feature not required anymore --- common/nix-settings.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/common/nix-settings.nix b/common/nix-settings.nix index a83f77e..caa16f9 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -26,7 +26,6 @@ in experimental-features = [ "nix-command" "flakes" - "repl-flake" ]; # use all cores for building cores = 0; From 92dfeb989bdb6acb06120738c74d60cd9d61950a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 01:15:08 +0100 Subject: [PATCH 03/16] workmac: package name changes for 24.11 update --- home/workmac.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/workmac.nix b/home/workmac.nix index 5aab318..724f64f 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -23,7 +23,7 @@ in home.packages = [ wireshark # on NixOS systems enabled via system config - _1password + _1password-cli # also TODO: color schemes nix-darwin ]; From b8d2906190bb57fed54c7610e547ee7b8a4a19cc Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 01:19:59 +0100 Subject: [PATCH 04/16] nixfmt(-rfc-style): rename to new default --- flake.nix | 2 +- home/modules/packages.nix | 2 +- home/modules/vscodium.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 2bc13e4..4162d81 100644 --- a/flake.nix +++ b/flake.nix @@ -102,7 +102,7 @@ { pkgs, ... }: { projectRootFile = "flake.nix"; - programs.nixfmt-rfc-style.enable = true; + programs.nixfmt.enable = true; }; in { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 2d289ae..1e23bd1 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -91,7 +91,7 @@ let nixHelpers = [ nixpkgs-review - unstable.nixfmt-rfc-style + nixfmt nix-top statix ]; diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 76b4c8d..2a2fa42 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -78,7 +78,7 @@ "editor.formatOnSave" = false; "editor.formatOnType" = false; }; - "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; + "nix.formatterPath" = lib.getExe pkgs.nixfmt; "nix.enableLanguageServer" = true; "nix.serverPath" = lib.getExe pkgs.nixd; "nix.serverSettings" = { }; From 8d9e6f53ad4a5f028fc30d804e9d60ab984d39d7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 20:58:09 +0100 Subject: [PATCH 05/16] nixfmt: still user RC style package --- home/modules/packages.nix | 2 +- home/modules/vscodium.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 1e23bd1..0d5fdd9 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -91,7 +91,7 @@ let nixHelpers = [ nixpkgs-review - nixfmt + nixfmt-rfc-style nix-top statix ]; diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 2a2fa42..76b4c8d 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -78,7 +78,7 @@ "editor.formatOnSave" = false; "editor.formatOnType" = false; }; - "nix.formatterPath" = lib.getExe pkgs.nixfmt; + "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; "nix.enableLanguageServer" = true; "nix.serverPath" = lib.getExe pkgs.nixd; "nix.serverSettings" = { }; From f9e5a42ca94e8d64235ff825000bcb3d61a877c5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 20:58:45 +0100 Subject: [PATCH 06/16] calibre: continue to pull in from nixos-24.05 for now On 24.11, there's a test failure. --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + home/modules/packages.nix | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 38da4fb..d2f63a3 100644 --- a/flake.lock +++ b/flake.lock @@ -192,6 +192,22 @@ "type": "github" } }, + "nixos-2405": { + "locked": { + "lastModified": 1731386116, + "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "689fed12a013f56d4c4d3f612489634267d86529", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1731403644, @@ -324,6 +340,7 @@ "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", "nix-darwin": "nix-darwin", + "nixos-2405": "nixos-2405", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 4162d81..fcdd618 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; #nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixos-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 0d5fdd9..32b5f33 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -150,7 +150,7 @@ let chromium falkon thunderbird - #calibre # FIXME: using bin due to failing tests + inputs.nixos-unstable.legacyPackages.${system}.calibre # FIXME: test failure in 24.11 dino zotero ding From f253285bae1c127ee63e48065446bc683fb19ff9 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 19 Nov 2024 12:43:32 +0100 Subject: [PATCH 07/16] flake: switch to proper 24.11 channels --- flake.lock | 16 ++++++++-------- flake.nix | 6 ++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index d2f63a3..5964148 100644 --- a/flake.lock +++ b/flake.lock @@ -117,16 +117,16 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1731880681, + "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -274,16 +274,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731613620, - "narHash": "sha256-Qb4cpVp1pr29mvbqMROn7BcYt60GJ948RSM4UKU2DV4=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f4a0fbc120cd775346111246b453f8af94afc1d1", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.11", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index fcdd618..fddebc0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,12 @@ description = "NixOS system flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; - #nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/master"; - #url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { From 5c9f10a9f1f7e55adc30496fe7895f36bcbdef14 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 20 Nov 2024 22:50:49 +0100 Subject: [PATCH 08/16] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/f6581f1c3b137086e42a08a906bdada63045f991' (2024-11-12) → 'github:NixOS/nixos-hardware/672ac2ac86f7dff2f6f3406405bddecf960e0db6' (2024-11-16) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11) → 'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367' (2024-11-19) • Updated input 'nur': 'github:nix-community/NUR/b53bdb77031c86c9525329368fdd87b28792b1db' (2024-11-14) → 'github:nix-community/NUR/34ea536162b11e0db2449bd2eb248dccce1bb9e6' (2024-11-20) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 5964148..158c398 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -226,11 +226,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -290,11 +290,11 @@ }, "nur": { "locked": { - "lastModified": 1731623759, - "narHash": "sha256-v7ow++vH4cgaWeKnMdt/HGmvFPqCTyzkghyY/JdkMGE=", + "lastModified": 1732134607, + "narHash": "sha256-vWkWJWMujimxIan8vSSXmB6ujov6SgQca3wD4c2EGIk=", "owner": "nix-community", "repo": "NUR", - "rev": "b53bdb77031c86c9525329368fdd87b28792b1db", + "rev": "34ea536162b11e0db2449bd2eb248dccce1bb9e6", "type": "github" }, "original": { From d9981eead30231f850f9bb69ef392ced900e04ac Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 21 Nov 2024 15:32:21 +0100 Subject: [PATCH 09/16] libreoffice: switch to qt6 build also downgrade from fresh to still version --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 32b5f33..dbc1e22 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -163,7 +163,7 @@ let hunspellDicts.en-gb-ise seafile-client alacritty - libreoffice-qt # fresh with KDE integration + libreoffice-qt6 # still with KDE integration backintime-common anki signal-desktop From b3b209be35867f8d49b705109009236a3eb6a97b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 23 Nov 2024 13:40:56 +0100 Subject: [PATCH 10/16] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/aecd341dfead1c3ef7a3c15468ecd71e8343b7c6' (2024-11-17) → 'github:nix-community/home-manager/f8831cc700030e11fc91da9ef6270593e6440edc' (2024-11-22) • Updated input 'nur': 'github:nix-community/NUR/34ea536162b11e0db2449bd2eb248dccce1bb9e6' (2024-11-20) → 'github:nix-community/NUR/86997491ed2896f76088abf22617a54a45f3d22e' (2024-11-23) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 158c398..6719f0d 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1731880681, - "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=", + "lastModified": 1732319136, + "narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=", "owner": "nix-community", "repo": "home-manager", - "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6", + "rev": "f8831cc700030e11fc91da9ef6270593e6440edc", "type": "github" }, "original": { @@ -290,11 +290,11 @@ }, "nur": { "locked": { - "lastModified": 1732134607, - "narHash": "sha256-vWkWJWMujimxIan8vSSXmB6ujov6SgQca3wD4c2EGIk=", + "lastModified": 1732361011, + "narHash": "sha256-dSAfd7wSrxd0GtwGRaW7MJv3OBNyw3XLM5AU+6mAKL4=", "owner": "nix-community", "repo": "NUR", - "rev": "34ea536162b11e0db2449bd2eb248dccce1bb9e6", + "rev": "86997491ed2896f76088abf22617a54a45f3d22e", "type": "github" }, "original": { From 5510b5e2af0b298f47d2b8307080501a6801367b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 24 Nov 2024 00:50:28 +0100 Subject: [PATCH 11/16] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nur': 'github:nix-community/NUR/86997491ed2896f76088abf22617a54a45f3d22e' (2024-11-23) → 'github:nix-community/NUR/7a3e6d03844e420619c76108379d012026a45d10' (2024-11-23) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6719f0d..5f93159 100644 --- a/flake.lock +++ b/flake.lock @@ -290,11 +290,11 @@ }, "nur": { "locked": { - "lastModified": 1732361011, - "narHash": "sha256-dSAfd7wSrxd0GtwGRaW7MJv3OBNyw3XLM5AU+6mAKL4=", + "lastModified": 1732405614, + "narHash": "sha256-Xi/S5NN8R75fy0SJmYfDv0ACGHqjL0Xc9fX7okOGt/g=", "owner": "nix-community", "repo": "NUR", - "rev": "86997491ed2896f76088abf22617a54a45f3d22e", + "rev": "7a3e6d03844e420619c76108379d012026a45d10", "type": "github" }, "original": { From 16cc85b93d7b02b597928d6a0204eb7e68ec4b4d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 24 Nov 2024 00:58:46 +0100 Subject: [PATCH 12/16] ausweisapp: install on NixOS hosts, open firewall --- common/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/default.nix b/common/default.nix index 9c00df7..635b8ba 100644 --- a/common/default.nix +++ b/common/default.nix @@ -53,6 +53,11 @@ in programs.mtr.enable = true; # programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; + programs.ausweisapp = { + enable = true; + openFirewall = true; + }; + # List services that you want to enable: # Enable the OpenSSH daemon. From 3869ef68413a4a253f7bdb82e889d0f0d9399fb1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 27 Nov 2024 00:19:30 +0100 Subject: [PATCH 13/16] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/6c71c49e2448e51ad830ed211024e6d0edc50116?narHash=sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3%2BTDqfX3Kp63oM%3D' (2024-11-12) → 'github:LnL7/nix-darwin/6ab87b7c84d4ee873e937108c4ff80c015a40c7a?narHash=sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8%3D' (2024-11-26) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19) → 'github:NixOS/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d?narHash=sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0%3D' (2024-11-25) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/057f63b6dc1a2c67301286152eb5af20747a9cb4?narHash=sha256-v5P3dk5JdiT%2B4x69ZaB18B8%2BRcu3TIOrcdG4uEX7WZ8%3D' (2024-11-16) → 'github:NixOS/nixpkgs/0c582677378f2d9ffcb01490af2f2c678dcb29d3?narHash=sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4%3D' (2024-11-23) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 5f93159..99f93a3 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1731454423, - "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=", + "lastModified": 1732603785, + "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116", + "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", "type": "github" }, "original": { @@ -226,11 +226,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1732350895, + "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", "type": "github" }, "original": { From 1dc8be97d2497271384c8919e203b84f140fd332 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 27 Nov 2024 00:56:02 +0100 Subject: [PATCH 14/16] Revert "calibre: continue to pull in from nixos-24.05 for now" This reverts commit f9e5a42ca94e8d64235ff825000bcb3d61a877c5. --- flake.lock | 17 ----------------- flake.nix | 1 - home/modules/packages.nix | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 99f93a3..6800461 100644 --- a/flake.lock +++ b/flake.lock @@ -192,22 +192,6 @@ "type": "github" } }, - "nixos-2405": { - "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1731797098, @@ -340,7 +324,6 @@ "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", "nix-darwin": "nix-darwin", - "nixos-2405": "nixos-2405", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index fddebc0..0fac46e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixos-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index dbc1e22..83b203b 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -150,7 +150,7 @@ let chromium falkon thunderbird - inputs.nixos-unstable.legacyPackages.${system}.calibre # FIXME: test failure in 24.11 + #calibre # FIXME: using bin due to failing tests dino zotero ding From e7bcda274c9b39fa6ef454bbea3a4bff31052026 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 27 Nov 2024 01:18:11 +0100 Subject: [PATCH 15/16] calibre: unbreak, pull in from main nixpkgs again --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 83b203b..a164d91 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -150,7 +150,7 @@ let chromium falkon thunderbird - #calibre # FIXME: using bin due to failing tests + calibre dino zotero ding From b847233c5f3d256ab1797307bae9c14972771e3e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 1 Dec 2024 19:43:07 +0100 Subject: [PATCH 16/16] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/f8831cc700030e11fc91da9ef6270593e6440edc' (2024-11-22) → 'github:nix-community/home-manager/62d536255879be574ebfe9b87c4ac194febf47c5' (2024-12-01) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/672ac2ac86f7dff2f6f3406405bddecf960e0db6' (2024-11-16) → 'github:NixOS/nixos-hardware/fe01780d356d70fd119a19277bff71d3e78dad00' (2024-12-01) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d' (2024-11-25) → 'github:NixOS/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370' (2024-11-28) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0c582677378f2d9ffcb01490af2f2c678dcb29d3' (2024-11-23) → 'github:NixOS/nixpkgs/62c435d93bf046a5396f3016472e8f7c8e2aed65' (2024-11-30) • Updated input 'nur': 'github:nix-community/NUR/7a3e6d03844e420619c76108379d012026a45d10' (2024-11-23) → 'github:nix-community/NUR/2b3136c2f2b55f97424a6ffe5926e811e14b3c71' (2024-12-01) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 6800461..662ca8a 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1732319136, - "narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8831cc700030e11fc91da9ef6270593e6440edc", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733066523, + "narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "fe01780d356d70fd119a19277bff71d3e78dad00", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732350895, - "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1732405614, - "narHash": "sha256-Xi/S5NN8R75fy0SJmYfDv0ACGHqjL0Xc9fX7okOGt/g=", + "lastModified": 1733077621, + "narHash": "sha256-Zo1md8M9LzlfFIrM7/wfEtm/4TbiObWmTckJ7yrgiJw=", "owner": "nix-community", "repo": "NUR", - "rev": "7a3e6d03844e420619c76108379d012026a45d10", + "rev": "2b3136c2f2b55f97424a6ffe5926e811e14b3c71", "type": "github" }, "original": {