From a97cb75ee3b4d0429b65395d4f2d4fcf1c61b050 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Mon, 29 Apr 2024 22:00:26 +0200 Subject: [PATCH 1/6] 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/c1609d584a6b5e9e6a02010f51bd368cb4782f8e?narHash=sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ%3D' (2024-04-27) → 'github:nix-community/home-manager/2af7c78b7bb9cf18406a193eba13ef9f99388f49?narHash=sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E%3D' (2024-04-29) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856?narHash=sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY%3D' (2024-04-25) → 'github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994?narHash=sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc%3D' (2024-04-27) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6dde04c..e49d22f 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1714203603, - "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", + "lastModified": 1714377222, + "narHash": "sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", + "rev": "2af7c78b7bb9cf18406a193eba13ef9f99388f49", "type": "github" }, "original": { @@ -283,11 +283,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { From 4d822e5e3ec15a9072deb70c835b83f8eb8f7b0b Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 30 Apr 2024 03:02:50 +0200 Subject: [PATCH 2/6] 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/2af7c78b7bb9cf18406a193eba13ef9f99388f49?narHash=sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E%3D' (2024-04-29) → 'github:nix-community/home-manager/f8e6694edabe4aaa7a85aac47b43ea5d978b116d?narHash=sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q%3D' (2024-04-29) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e49d22f..0da15f5 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1714377222, - "narHash": "sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E=", + "lastModified": 1714430505, + "narHash": "sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "2af7c78b7bb9cf18406a193eba13ef9f99388f49", + "rev": "f8e6694edabe4aaa7a85aac47b43ea5d978b116d", "type": "github" }, "original": { From 3cb797a8542b6f6af21e0383b5701b3d61ec7615 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Wed, 1 May 2024 14:24:38 +0200 Subject: [PATCH 3/6] 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/f8e6694edabe4aaa7a85aac47b43ea5d978b116d?narHash=sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q%3D' (2024-04-29) → 'github:nix-community/home-manager/6d3b6dc9222c12b951169becdf4b0592ee9576ef?narHash=sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY%3D' (2024-04-30) • Updated input 'nixpkgs-update': 'github:ryantm/nixpkgs-update/df23e62c3322a6471671ec8cb4ad0da36ab7f8a7?narHash=sha256-s77XshW%2B9EoghBWmOf0tFVQZ%2B8rX4%2BbOCz0StL%2BTkvQ%3D' (2024-04-28) → 'github:ryantm/nixpkgs-update/f368b504aa1d766c835c3a89ec24e86077a97272?narHash=sha256-mgjwvt9hzjGBisOx4Sn9V0Im4XEnld288F6KtmNhyM0%3D' (2024-05-01) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0da15f5..214d8ea 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1714430505, - "narHash": "sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q=", + "lastModified": 1714515075, + "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8e6694edabe4aaa7a85aac47b43ea5d978b116d", + "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", "type": "github" }, "original": { @@ -268,11 +268,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1714270547, - "narHash": "sha256-s77XshW+9EoghBWmOf0tFVQZ+8rX4+bOCz0StL+TkvQ=", + "lastModified": 1714534265, + "narHash": "sha256-mgjwvt9hzjGBisOx4Sn9V0Im4XEnld288F6KtmNhyM0=", "owner": "ryantm", "repo": "nixpkgs-update", - "rev": "df23e62c3322a6471671ec8cb4ad0da36ab7f8a7", + "rev": "f368b504aa1d766c835c3a89ec24e86077a97272", "type": "github" }, "original": { From c6b459cc1039093f6fa527c447626872b2511c02 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 2 May 2024 23:07:10 +0200 Subject: [PATCH 4/6] 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/6d3b6dc9222c12b951169becdf4b0592ee9576ef?narHash=sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY%3D' (2024-04-30) → 'github:nix-community/home-manager/9036fe9ef8e15a819fa76f47a8b1f287903fb848?narHash=sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt%2Bcu4tWDVS2FI%3D' (2024-05-02) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 214d8ea..e74d0e2 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1714515075, - "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", + "lastModified": 1714679908, + "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", + "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "type": "github" }, "original": { From 8f37a6b7abff49b2e516fa716f4e32f35b889626 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 2 May 2024 23:11:59 +0200 Subject: [PATCH 5/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994?narHash=sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc%3D' (2024-04-27) → 'github:NixOS/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f?narHash=sha256-4cPymbty65RvF1DWQfc%2BBc8B233A1BWxJnNULJKQ1EY%3D' (2024-05-02) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e74d0e2..f2a86f5 100644 --- a/flake.lock +++ b/flake.lock @@ -283,11 +283,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { From 1c5cf3ae2de4db3773b4a106e00e5c6f18c13b67 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Fri, 3 May 2024 00:17:20 +0200 Subject: [PATCH 6/6] package shift --- home-manager/modules/packages.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index 5989800..f536b75 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -54,8 +54,6 @@ in (callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit python3Packages; }) (callPackage ./../pkgs/extract.nix { inherit pkgs; }) nixpkgs-fmt - toolbox - distrobox ddev act mkcert @@ -79,6 +77,14 @@ in nodePackages.pnpm npm-check-updates ] ++ ( + if ( + !config.machine.isGeneric + ) then [ + toolbox + distrobox + ] else + [ ] + ) ++ ( if ( config.machine.isGraphical ) then [