From 66a502d7e69baa0472e18e663649e08089362a97 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 4 Jan 2024 11:30:19 +0100 Subject: [PATCH 1/7] small hydra test --- hosts/falkenstein/modules/mail/default.nix | 2 +- users/rouven/modules/packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/falkenstein/modules/mail/default.nix b/hosts/falkenstein/modules/mail/default.nix index 02bf95b..d1aff0c 100644 --- a/hosts/falkenstein/modules/mail/default.nix +++ b/hosts/falkenstein/modules/mail/default.nix @@ -62,7 +62,7 @@ in domain = "${domain}"; origin = "${domain}"; destination = [ "${hostname}" "${domain}" "localhost" ]; - networks = [ "127.0.0.1" "141.30.30.169" ]; + networks = [ "127.0.0.1" ]; sslCert = "/var/lib/acme/${hostname}/fullchain.pem"; sslKey = "/var/lib/acme/${hostname}/key.pem"; config = { diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index 9a59d4d..9d0faf4 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -67,7 +67,7 @@ programs.obs-studio.enable = true; - programs.firefox.enable = true; + # programs.firefox.enable = true; services.gnome-keyring.enable = true; xdg.mimeApps = { From 41b724b744b1ae16ffd8520da393201d5f42453a Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 4 Jan 2024 14:53:06 +0100 Subject: [PATCH 2/7] one last try --- hosts/thinkpad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 4ee618c..0b61222 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -14,7 +14,7 @@ ./modules/virtualisation ]; - nixpkgs.hostPlatform = { + nixpkgs.crossSystem = { gcc.arch = "tigerlake"; gcc.tune = "tigerlake"; system = "x86_64-linux"; From 20f2a3edb49fec84f79466abfe8e3e39fb7094a0 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 4 Jan 2024 14:54:25 +0100 Subject: [PATCH 3/7] Revert "one last try" This reverts commit 41b724b744b1ae16ffd8520da393201d5f42453a. --- hosts/thinkpad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 0b61222..4ee618c 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -14,7 +14,7 @@ ./modules/virtualisation ]; - nixpkgs.crossSystem = { + nixpkgs.hostPlatform = { gcc.arch = "tigerlake"; gcc.tune = "tigerlake"; system = "x86_64-linux"; From 94689ed2b278d084ebc9979d8984efa7dcbd2bfe Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 4 Jan 2024 14:54:49 +0100 Subject: [PATCH 4/7] disable gcc tuning --- hosts/thinkpad/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 4ee618c..9f08ec6 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -14,11 +14,11 @@ ./modules/virtualisation ]; - nixpkgs.hostPlatform = { - gcc.arch = "tigerlake"; - gcc.tune = "tigerlake"; - system = "x86_64-linux"; - }; + # nixpkgs.hostPlatform = { + # gcc.arch = "tigerlake"; + # gcc.tune = "tigerlake"; + # system = "x86_64-linux"; + # }; nix.settings.system-features = [ "gccarch-tigerlake" ]; From eefcb05e3a9e2ce391d04d622f515ade6cebb2ab Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 4 Jan 2024 14:56:38 +0100 Subject: [PATCH 5/7] another try --- hosts/thinkpad/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 9f08ec6..8b6cb8f 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -14,11 +14,14 @@ ./modules/virtualisation ]; - # nixpkgs.hostPlatform = { - # gcc.arch = "tigerlake"; - # gcc.tune = "tigerlake"; - # system = "x86_64-linux"; - # }; + nixpkgs.hostPlatform = { + gcc.arch = "tigerlake"; + gcc.tune = "tigerlake"; + system = "x86_64-linux"; + }; + nixpkgs.buildPlatform = { + system = "x86_64-linux"; + }; nix.settings.system-features = [ "gccarch-tigerlake" ]; From 3a052ca275d464f1707a4aeaa6453d887b98a0eb Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 4 Jan 2024 17:26:11 +0100 Subject: [PATCH 6/7] Revert "another try" This reverts commit eefcb05e3a9e2ce391d04d622f515ade6cebb2ab. --- hosts/thinkpad/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 8b6cb8f..9f08ec6 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -14,14 +14,11 @@ ./modules/virtualisation ]; - nixpkgs.hostPlatform = { - gcc.arch = "tigerlake"; - gcc.tune = "tigerlake"; - system = "x86_64-linux"; - }; - nixpkgs.buildPlatform = { - system = "x86_64-linux"; - }; + # nixpkgs.hostPlatform = { + # gcc.arch = "tigerlake"; + # gcc.tune = "tigerlake"; + # system = "x86_64-linux"; + # }; nix.settings.system-features = [ "gccarch-tigerlake" ]; From 7337a98d7e722876f184b5534ab63e74f815f155 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 4 Jan 2024 17:38:58 +0100 Subject: [PATCH 7/7] updates --- flake.lock | 12 ++++++------ users/rouven/modules/packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 98edfba..b0f905e 100644 --- a/flake.lock +++ b/flake.lock @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1704311514, - "narHash": "sha256-j6JsfCv31bW7LzV06q2L/27QZ4k1Zq7lEq2AR9R150A=", + "lastModified": 1704383912, + "narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=", "owner": "nix-community", "repo": "home-manager", - "rev": "fcbc70a7ee064f2b65dc1fac1717ca2a9813bbe6", + "rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index 9d0faf4..9a59d4d 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -67,7 +67,7 @@ programs.obs-studio.enable = true; - # programs.firefox.enable = true; + programs.firefox.enable = true; services.gnome-keyring.enable = true; xdg.mimeApps = {