From df6cecdc98efbb3128be3d56bcf30824b72315cb Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 4 Jun 2024 12:56:44 +0200 Subject: [PATCH 01/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 'dagger': 'github:dagger/nix/9e26b2f73eebf9e3b9fbc1a31c378ccb2daf84cd?narHash=sha256-n1UnQ7RbJwDAUX1fq4%2BhUNVVIWDlZKvAsUp/muSkV3g%3D' (2024-05-28) → 'github:dagger/nix/b806c06b83310040821771278fc5bcd745c8934a?narHash=sha256-6hJbR3t2qZi/ozZpfTB9eZRuE5BxtNOR9pTxEm7bYbY%3D' (2024-05-30) • Updated input 'home-manager': 'github:nix-community/home-manager/373ead20606efa9181cd15ba19a5deac7ead1492?narHash=sha256-Zl6e/sEVDh07K47XxDGPsXTYT4nI6llUDbQ4xMIwp7k%3D' (2024-05-28) → 'github:nix-community/home-manager/2cacdd6a27477f1fa46b7026dd806de30f164d3b?narHash=sha256-Xr/oYk3vmyv2a/nY8o/Wd0MdLsI5vaC38Kris7CWunM%3D' (2024-06-04) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac?narHash=sha256-Idcye44UW%2BEgjbjCoklf2IDF%2BXrehV6CVYvxR1omst4%3D' (2024-05-27) → 'github:nix-community/nix-index-database/972a52bee3991ae1f1899e6452e0d7c01ee566d9?narHash=sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0%3D' (2024-06-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/bfb7a882678e518398ce9a31a881538679f6f092?narHash=sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8%3D' (2024-05-24) → 'github:NixOS/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8?narHash=sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0%3D' (2024-05-31) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index fe57175..58d1a6a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1716892732, - "narHash": "sha256-n1UnQ7RbJwDAUX1fq4+hUNVVIWDlZKvAsUp/muSkV3g=", + "lastModified": 1717104796, + "narHash": "sha256-6hJbR3t2qZi/ozZpfTB9eZRuE5BxtNOR9pTxEm7bYbY=", "owner": "dagger", "repo": "nix", - "rev": "9e26b2f73eebf9e3b9fbc1a31c378ccb2daf84cd", + "rev": "b806c06b83310040821771278fc5bcd745c8934a", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1716908526, - "narHash": "sha256-Zl6e/sEVDh07K47XxDGPsXTYT4nI6llUDbQ4xMIwp7k=", + "lastModified": 1717483170, + "narHash": "sha256-Xr/oYk3vmyv2a/nY8o/Wd0MdLsI5vaC38Kris7CWunM=", "owner": "nix-community", "repo": "home-manager", - "rev": "373ead20606efa9181cd15ba19a5deac7ead1492", + "rev": "2cacdd6a27477f1fa46b7026dd806de30f164d3b", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1716772633, - "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", + "lastModified": 1717297675, + "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", + "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { From 1e4fd788ed6f49ad9b9bd82d3593e45d83a6525a Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Wed, 5 Jun 2024 01:00:27 +0200 Subject: [PATCH 02/16] modularize nix version choice --- configs/thilo-laptop/home.nix | 6 ++++++ configs/thilo-pc/home.nix | 17 +++++++++++++++-- configs/wsl/home.nix | 6 ++++++ home-manager/modules/machine.nix | 4 ++++ home-manager/modules/packages.nix | 3 +-- 5 files changed, 32 insertions(+), 4 deletions(-) diff --git a/configs/thilo-laptop/home.nix b/configs/thilo-laptop/home.nix index 35d3481..c97f9da 100644 --- a/configs/thilo-laptop/home.nix +++ b/configs/thilo-laptop/home.nix @@ -21,6 +21,12 @@ home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; }; + + nix = { + package = pkgs.nixVersions.latest; + }; + + home.packages = with pkgs; [ pkgs.nixVersions.latest ]; }; }; } diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix index e9ca8fe..02cadf6 100644 --- a/configs/thilo-pc/home.nix +++ b/configs/thilo-pc/home.nix @@ -1,4 +1,9 @@ -{ inputs, pkgs, ... }: +{ + inputs, + pkgs, + config, + ... +}: { home-manager = { @@ -16,6 +21,7 @@ isGnome = false; noiseSuppression.enable = true; isGraphical = true; + nixVersion = pkgs.lix; }; /* @@ -30,7 +36,14 @@ LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; }; - home.packages = with pkgs; [ libsForQt5.discover ]; + nix = { + package = pkgs.lix; + }; + + home.packages = with pkgs; [ + pkgs.lix + libsForQt5.discover + ]; }; }; } diff --git a/configs/wsl/home.nix b/configs/wsl/home.nix index 3625100..733ea97 100644 --- a/configs/wsl/home.nix +++ b/configs/wsl/home.nix @@ -12,4 +12,10 @@ }; nixpkgs.config.allowUnfree = true; + + nix = { + package = pkgs.nixVersions.latest; + }; + + home.packages = with pkgs; [ pkgs.nixVersions.latest ]; } diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix index 70c15ab..da5e01a 100644 --- a/home-manager/modules/machine.nix +++ b/home-manager/modules/machine.nix @@ -60,6 +60,10 @@ with lib; default = false; description = "Whether to enable noise suppression or not"; }; + nixVersion = mkOption { + type = types.package; + default = pkgs.nixVersions.latest; + }; }; nixGLPrefix = lib.mkOption { type = lib.types.str; diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index 8f8f248..ba24fd3 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -24,7 +24,6 @@ in home.packages = with pkgs; [ - pkgs.nixVersions.latest # because remotely invoked updates are fun ;) up htop rustc @@ -52,7 +51,7 @@ in (pkgs.writeShellScriptBin "yt-dlp-audio" (builtins.readFile ./../scripts/yt-dlp-audio.sh)) (pkgs.writeShellScriptBin "nix-shell-init" (builtins.readFile ./../scripts/nix-shell-init.sh)) (pkgs.writeShellScriptBin "http-server" '' - ${pkgs.caddy}/bin/caddy file-server --listen :2345 + ${pkgs.caddy}/bin/caddy file-server --listen :2345z '') (pkgs.writeShellScriptBin "nix-build-default" '' nix-build -E 'with import { }; callPackage ./default.nix { }' From f8e322451db44afd61e0c36ea16fba2c264a4fe8 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 6 Jun 2024 18:54:36 +0200 Subject: [PATCH 03/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 'nixpkgs': 'github:NixOS/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8?narHash=sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0%3D' (2024-05-31) → 'github:NixOS/nixpkgs/cb0317c4552b5639d7e2d85d2adbf4b9de0ff0d7?narHash=sha256-sQ1FBYvO4SoZwoRvUIDY94hQyg%2BuqakG0UMClRbqyG4%3D' (2024-06-03) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f57675d..feeb7e5 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1717384422, + "narHash": "sha256-sQ1FBYvO4SoZwoRvUIDY94hQyg+uqakG0UMClRbqyG4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "cb0317c4552b5639d7e2d85d2adbf4b9de0ff0d7", "type": "github" }, "original": { From 29b681846f6d2e9ad3c905dafc75e5edbd05caef Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 6 Jun 2024 22:31:49 +0200 Subject: [PATCH 04/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 'nixpkgs': 'github:NixOS/nixpkgs/cb0317c4552b5639d7e2d85d2adbf4b9de0ff0d7?narHash=sha256-sQ1FBYvO4SoZwoRvUIDY94hQyg%2BuqakG0UMClRbqyG4%3D' (2024-06-03) → 'github:NixOS/nixpkgs/e8057b67ebf307f01bdcc8fba94d94f75039d1f6?narHash=sha256-pL9jeus5QpX5R%2B9rsp3hhZ%2BuplVHscNJh8n8VpqscM0%3D' (2024-06-05) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index feeb7e5..15f6781 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717384422, - "narHash": "sha256-sQ1FBYvO4SoZwoRvUIDY94hQyg+uqakG0UMClRbqyG4=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb0317c4552b5639d7e2d85d2adbf4b9de0ff0d7", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { From 7121a83b6c429c887fb85222eded4774861854fb Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Fri, 7 Jun 2024 14:04:05 +0200 Subject: [PATCH 05/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-index-database': 'github:nix-community/nix-index-database/972a52bee3991ae1f1899e6452e0d7c01ee566d9?narHash=sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0%3D' (2024-06-02) → 'github:nix-community/nix-index-database/4ac3639cebb6286f1a68d015b80e9e0c6c869ce6?narHash=sha256-1usk5faO%2BKRn/03xKW3G3ex9/wHeLfwKTa7x8QNcygc%3D' (2024-06-07) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 15f6781..2149306 100644 --- a/flake.lock +++ b/flake.lock @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1717297675, - "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=", + "lastModified": 1717744769, + "narHash": "sha256-1usk5faO+KRn/03xKW3G3ex9/wHeLfwKTa7x8QNcygc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9", + "rev": "4ac3639cebb6286f1a68d015b80e9e0c6c869ce6", "type": "github" }, "original": { From f6732db4f16f87edfd553facba6820964264c19e Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 9 Jun 2024 14:05:23 +0200 Subject: [PATCH 06/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/a7117efb3725e6197dd95424136f79147aa35e5b?narHash=sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz%2Bhg%2Bx1pCcNkAws%3D' (2024-06-04) → 'github:nix-community/home-manager/3d65009effd77cb0d6e7520b68b039836a7606cf?narHash=sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0%3D' (2024-06-09) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/4ac3639cebb6286f1a68d015b80e9e0c6c869ce6?narHash=sha256-1usk5faO%2BKRn/03xKW3G3ex9/wHeLfwKTa7x8QNcygc%3D' (2024-06-07) → 'github:nix-community/nix-index-database/a157a81d0a4bc909b2b6666dd71909bcdc8cd0d6?narHash=sha256-4i/c31%2Bdnpv6KdUA3BhbMDS9Lvg/CDin78caYJlq0bY%3D' (2024-06-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e8057b67ebf307f01bdcc8fba94d94f75039d1f6?narHash=sha256-pL9jeus5QpX5R%2B9rsp3hhZ%2BuplVHscNJh8n8VpqscM0%3D' (2024-06-05) → 'github:NixOS/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e?narHash=sha256-4q0s6m0GUcN7q%2BY2DqD27iLvbcd1G50T2lv08kKxkSI%3D' (2024-06-07) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2149306..714ec35 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1717525419, - "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "lastModified": 1717931644, + "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1717744769, - "narHash": "sha256-1usk5faO+KRn/03xKW3G3ex9/wHeLfwKTa7x8QNcygc=", + "lastModified": 1717919703, + "narHash": "sha256-4i/c31+dnpv6KdUA3BhbMDS9Lvg/CDin78caYJlq0bY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "4ac3639cebb6286f1a68d015b80e9e0c6c869ce6", + "rev": "a157a81d0a4bc909b2b6666dd71909bcdc8cd0d6", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { From 9c8c503e2416af61e5bf744be8be729ffbd6d0e6 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Mon, 10 Jun 2024 14:02:55 +0200 Subject: [PATCH 07/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-index-database': 'github:nix-community/nix-index-database/a157a81d0a4bc909b2b6666dd71909bcdc8cd0d6?narHash=sha256-4i/c31%2Bdnpv6KdUA3BhbMDS9Lvg/CDin78caYJlq0bY%3D' (2024-06-09) → 'github:nix-community/nix-index-database/88ad3d7501e22b2401dd72734b032b7baa794434?narHash=sha256-sFXI%2BZANp/OC%2BMwfJoZgPSf4xMdtzQMe1pS3FGti4C8%3D' (2024-06-10) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 714ec35..f35e43d 100644 --- a/flake.lock +++ b/flake.lock @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1717919703, - "narHash": "sha256-4i/c31+dnpv6KdUA3BhbMDS9Lvg/CDin78caYJlq0bY=", + "lastModified": 1718011381, + "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a157a81d0a4bc909b2b6666dd71909bcdc8cd0d6", + "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", "type": "github" }, "original": { From 339960cced97031aae22b48d340329a0163065a1 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 11 Jun 2024 13:47:59 +0200 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 'nixpkgs': 'github:NixOS/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e?narHash=sha256-4q0s6m0GUcN7q%2BY2DqD27iLvbcd1G50T2lv08kKxkSI%3D' (2024-06-07) → 'github:NixOS/nixpkgs/c7b821ba2e1e635ba5a76d299af62821cbcb09f3?narHash=sha256-GTO3C88%2B5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t%2BD8%3D' (2024-06-09) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f35e43d..03d06a3 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { From 3df409ab43cd5f66179805678e56497b168d5f21 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 11 Jun 2024 18:43:37 +0200 Subject: [PATCH 09/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 'dagger': 'github:dagger/nix/b806c06b83310040821771278fc5bcd745c8934a?narHash=sha256-6hJbR3t2qZi/ozZpfTB9eZRuE5BxtNOR9pTxEm7bYbY%3D' (2024-05-30) → 'github:dagger/nix/2db6055f392c4b41c1886e51c94717d4a5d03dbf?narHash=sha256-mQPEGOKW%2B8GWzdONIgNcvn9k6WeJkH1a7Fona2u5iP8%3D' (2024-06-11) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 03d06a3..07f6ae2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1717104796, - "narHash": "sha256-6hJbR3t2qZi/ozZpfTB9eZRuE5BxtNOR9pTxEm7bYbY=", + "lastModified": 1718120114, + "narHash": "sha256-mQPEGOKW+8GWzdONIgNcvn9k6WeJkH1a7Fona2u5iP8=", "owner": "dagger", "repo": "nix", - "rev": "b806c06b83310040821771278fc5bcd745c8934a", + "rev": "2db6055f392c4b41c1886e51c94717d4a5d03dbf", "type": "github" }, "original": { From ce0f08440605f9ea96d3dc3129b6dabb7b08450f Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Wed, 12 Jun 2024 00:35:32 +0200 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/3d65009effd77cb0d6e7520b68b039836a7606cf?narHash=sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0%3D' (2024-06-09) → 'github:nix-community/home-manager/892f76bd0aa09a0f7f73eb41834b8a904b6d0fad?narHash=sha256-cA%2B6l8ZCZ7MXGijVuY/1f55%2BwF/RT4PlTR9%2Bg4bx86w%3D' (2024-06-11) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 07f6ae2..b3f3517 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1717931644, - "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", + "lastModified": 1718141734, + "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", + "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", "type": "github" }, "original": { From 2dfce89d34a0cd894b3ed383caee80cbb4b2bd1e Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Wed, 12 Jun 2024 19:00:13 +0200 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 'nixpkgs': 'github:NixOS/nixpkgs/c7b821ba2e1e635ba5a76d299af62821cbcb09f3?narHash=sha256-GTO3C88%2B5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t%2BD8%3D' (2024-06-09) → 'github:NixOS/nixpkgs/57d6973abba7ea108bac64ae7629e7431e0199b6?narHash=sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus%3D' (2024-06-12) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b3f3517..b8bfb23 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717974879, - "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { From d9f378dcd10b1d3ae463007a7fa9a38d672c9b64 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Fri, 14 Jun 2024 02:06:59 +0200 Subject: [PATCH 12/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/892f76bd0aa09a0f7f73eb41834b8a904b6d0fad?narHash=sha256-cA%2B6l8ZCZ7MXGijVuY/1f55%2BwF/RT4PlTR9%2Bg4bx86w%3D' (2024-06-11) → 'github:nix-community/home-manager/8d5e27b4807d25308dfe369d5a923d87e7dbfda3?narHash=sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU%3D' (2024-06-13) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b8bfb23..9c7eaa3 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1718141734, - "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", + "lastModified": 1718243258, + "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", + "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "type": "github" }, "original": { From cf87665044362784ba2c896c453bf3ad59954dfb Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Fri, 14 Jun 2024 21:24:11 +0200 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 'dagger': 'github:dagger/nix/2db6055f392c4b41c1886e51c94717d4a5d03dbf?narHash=sha256-mQPEGOKW%2B8GWzdONIgNcvn9k6WeJkH1a7Fona2u5iP8%3D' (2024-06-11) → 'github:dagger/nix/edac329d4a61ca751c9648e663de450ca67aa55a?narHash=sha256-SmuUxQmbF57YCYMT5SmkI3KjsILQeDMGs80OywvjBjE%3D' (2024-06-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/57d6973abba7ea108bac64ae7629e7431e0199b6?narHash=sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus%3D' (2024-06-12) → 'github:NixOS/nixpkgs/e9ee548d90ff586a6471b4ae80ae9cfcbceb3420?narHash=sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY%3D' (2024-06-13) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 9c7eaa3..e356bf7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1718120114, - "narHash": "sha256-mQPEGOKW+8GWzdONIgNcvn9k6WeJkH1a7Fona2u5iP8=", + "lastModified": 1718378711, + "narHash": "sha256-SmuUxQmbF57YCYMT5SmkI3KjsILQeDMGs80OywvjBjE=", "owner": "dagger", "repo": "nix", - "rev": "2db6055f392c4b41c1886e51c94717d4a5d03dbf", + "rev": "edac329d4a61ca751c9648e663de450ca67aa55a", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1718318537, + "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "type": "github" }, "original": { From 11179f57f2d8cebfe2697a30e4b1ad9e185f1ce3 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sat, 15 Jun 2024 15:44:19 +0200 Subject: [PATCH 14/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-alien': 'github:thiagokokada/nix-alien/ea6ebda03c5537eebbb93af57ca6f2c2979981be?narHash=sha256-2hAydsdMk6QmDar%2B16ryyn%2BpVksxudwC5vRiatJbysM%3D' (2024-05-15) → 'github:thiagokokada/nix-alien/d457975f39a4eaf8bec55b7cc3ff26226d4fb062?narHash=sha256-TDzUlwvCmkY4IzEMLV7vmB/GlKznsS%2B/oBO4Z6z9ACE%3D' (2024-06-15) • Updated input 'nix-alien/nix-index-database': 'github:nix-community/nix-index-database/f9027322f48b427da23746aa359a6510dfcd0228?narHash=sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU%3D' (2024-05-12) → 'github:nix-community/nix-index-database/88ad3d7501e22b2401dd72734b032b7baa794434?narHash=sha256-sFXI%2BZANp/OC%2BMwfJoZgPSf4xMdtzQMe1pS3FGti4C8%3D' (2024-06-10) • Updated input 'nix-alien/nix-index-database/nixpkgs': 'github:nixos/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714?narHash=sha256-doPgfj%2B7FFe9rfzWo1siAV2mVCasW%2BBh8I1cToAXEE4%3D' (2024-05-09) → 'github:NixOS/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e?narHash=sha256-4q0s6m0GUcN7q%2BY2DqD27iLvbcd1G50T2lv08kKxkSI%3D' (2024-06-07) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/88ad3d7501e22b2401dd72734b032b7baa794434?narHash=sha256-sFXI%2BZANp/OC%2BMwfJoZgPSf4xMdtzQMe1pS3FGti4C8%3D' (2024-06-10) → 'github:nix-community/nix-index-database/963639a87fb7f746d45f14b8ab429d2c52dbb396?narHash=sha256-FcX3/lTbb%2BWIW783b18SPudPYhdmmNLQADf4S3SsZos%3D' (2024-06-15) --- flake.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index e356bf7..6c22e6d 100644 --- a/flake.lock +++ b/flake.lock @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1715754082, - "narHash": "sha256-2hAydsdMk6QmDar+16ryyn+pVksxudwC5vRiatJbysM=", + "lastModified": 1718448591, + "narHash": "sha256-TDzUlwvCmkY4IzEMLV7vmB/GlKznsS+/oBO4Z6z9ACE=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "ea6ebda03c5537eebbb93af57ca6f2c2979981be", + "rev": "d457975f39a4eaf8bec55b7cc3ff26226d4fb062", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1715483403, - "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", + "lastModified": 1718011381, + "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f9027322f48b427da23746aa359a6510dfcd0228", + "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1718011381, - "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", + "lastModified": 1718458449, + "narHash": "sha256-FcX3/lTbb+WIW783b18SPudPYhdmmNLQADf4S3SsZos=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", + "rev": "963639a87fb7f746d45f14b8ab429d2c52dbb396", "type": "github" }, "original": { @@ -250,15 +250,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", - "owner": "nixos", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" From 8221bde1ccf5922a6398950ba58716c2156f7eab Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 16 Jun 2024 14:08:20 +0200 Subject: [PATCH 15/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/8d5e27b4807d25308dfe369d5a923d87e7dbfda3?narHash=sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU%3D' (2024-06-13) → 'github:nix-community/home-manager/0a7ffb28e5df5844d0e8039c9833d7075cdee792?narHash=sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p%2B27TpeE%3D' (2024-06-16) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/963639a87fb7f746d45f14b8ab429d2c52dbb396?narHash=sha256-FcX3/lTbb%2BWIW783b18SPudPYhdmmNLQADf4S3SsZos%3D' (2024-06-15) → 'github:nix-community/nix-index-database/6af2c5e58c20311276f59d247341cafeebfcb6f4?narHash=sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg%3D' (2024-06-16) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6c22e6d..2c2deef 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1718526747, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1718458449, - "narHash": "sha256-FcX3/lTbb+WIW783b18SPudPYhdmmNLQADf4S3SsZos=", + "lastModified": 1718507237, + "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "963639a87fb7f746d45f14b8ab429d2c52dbb396", + "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", "type": "github" }, "original": { From 14637d2624fd00b4f1c2df1aeee8e32d116fac3d Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 16 Jun 2024 20:30:11 +0200 Subject: [PATCH 16/16] add processing and icons --- configs/thilo-pc/home.nix | 4 ++-- home-manager/modules/packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix index 02cadf6..abc17a2 100644 --- a/configs/thilo-pc/home.nix +++ b/configs/thilo-pc/home.nix @@ -41,8 +41,8 @@ }; home.packages = with pkgs; [ - pkgs.lix - libsForQt5.discover + lix + papirus-icon-theme ]; }; }; diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index ba24fd3..8f2aa2b 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -100,6 +100,7 @@ in [ (nixGL insomnia) (nixGL comma) + (nixGL processing) ] else [ ]