From 2ba7e5b29d3f37dcd7d444e6e54178c707f48024 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Thu, 22 Dec 2022 11:33:21 +0100 Subject: [PATCH 1/6] Update flake.lock --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 2e65311..3006ddc 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1671268121, - "narHash": "sha256-LIOLFw5m2mYDjMo7eBB/cxYjhEqBnvQ8dpZvTjR6+Lo=", + "lastModified": 1671593498, + "narHash": "sha256-q7dFB64LNADOXr9jD5OGzV5BKxAS6JX08Dl1FiU9Ptc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "249d14bdd55995eea2e0c9cfed8a230525faebde", + "rev": "04c69f9d921e5090965f92842f225734652835e0", "type": "github" }, "original": { @@ -156,11 +156,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1671209729, - "narHash": "sha256-zxn1eA/rMi2DOx43V7q87bGaDzvL7CMVY/Ti7lJ92DQ=", + "lastModified": 1671578428, + "narHash": "sha256-YmbpBcPaGz9KE2bC4xPvSdgCSMk0BmS/L3ePvy9TR/M=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d55a72d4c1df694e87a41a7e6c9a7b6e9a40ca3", + "rev": "0f8bf4f92efa3c6168705b49a6788abb3612033a", "type": "github" }, "original": { @@ -179,11 +179,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1671221264, - "narHash": "sha256-c2F1OLBjYKCRRQjSmNymsZqAkqiR3yb8UqayLL+/V6I=", + "lastModified": 1671577645, + "narHash": "sha256-JCD8GhZJtTmB+k07W/zj7lAzDs6hbsG2eriZZP/Tol8=", "owner": "Hyprwm", "repo": "Hyprland", - "rev": "deb8d3d82ebe4154b04bd97af847cf83c3ae1ce2", + "rev": "fc37ce4a724101def1befa01b353162830f4393f", "type": "github" }, "original": { @@ -272,11 +272,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1671228065, - "narHash": "sha256-Az/ig9LVL5xdqtyl4/CVKJIH1G7sP/9Ott2XnNyie0E=", + "lastModified": 1671467847, + "narHash": "sha256-eIeZIQbbW0QYDW0nhDaieokw6VakPO3TyJ3RmxqGHOs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e462a4baf75eeac639b4942481759de08a3bc94e", + "rev": "25010a042c23695ae457a97aad60e9b1d49f2ecc", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671200928, - "narHash": "sha256-mZfzDyzojwj6I0wyooIjGIn81WtGVnx6+avU5Wv+VKU=", + "lastModified": 1671359686, + "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "757b82211463dd5ba1475b6851d3731dfe14d377", + "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1668984258, - "narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=", + "lastModified": 1671271954, + "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a", + "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1670146390, - "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=", + "lastModified": 1671459584, + "narHash": "sha256-6wRK7xmeHfClJ0ICOkax1avLZVGTDqBodQlkl/opccY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "86370507cb20c905800527539fc049a2bf09c667", + "rev": "87b58217c9a05edcf7630b9be32570f889217aef", "type": "github" }, "original": { @@ -389,11 +389,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1671180323, - "narHash": "sha256-qAE390OdYvzSMe58HLpoMZ7llPlp+zIy84pXPnuXqCo=", + "lastModified": 1671452357, + "narHash": "sha256-HqzXiQEegpRQ4VEl9pEPgHSIxhJrNJ27HfN1wOc7w2E=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a49fc91a606dbbb7a916c56bc09776fc67b5c121", + "rev": "200790e9c77064c53eaf95805b013d96615ecc27", "type": "github" }, "original": { @@ -432,11 +432,11 @@ ] }, "locked": { - "lastModified": 1671243596, - "narHash": "sha256-vQ1q6uwx2gKsHbQVhkq17nT8HwUmRbIG8cJVFafNb5s=", + "lastModified": 1671589280, + "narHash": "sha256-FmJ4SC+Ewi1iMhdtRcrwirMfvW7h2jakT7ILLo9BVws=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "905db21103d646ddc1eb81920e05180e6e2b6734", + "rev": "bfc54bcf98dacdc649c88a82bf14d00b399aa3bb", "type": "github" }, "original": { @@ -453,11 +453,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1670149631, - "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=", + "lastModified": 1671472949, + "narHash": "sha256-9iHSGpljCX+RypahQssBXPwkru9onfKfceCTeVrMpH4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "da98a111623101c64474a14983d83dad8f09f93d", + "rev": "32840f16ffa0856cdf9503a8658f2dd42bf70342", "type": "github" }, "original": { From 676ce014bd076bc0c081276ad497864ab11a7166 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Thu, 22 Dec 2022 11:34:55 +0100 Subject: [PATCH 2/6] Enable icecream daemon --- machines/mimir/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix index dcf28f3..8a34721 100644 --- a/machines/mimir/configuration.nix +++ b/machines/mimir/configuration.nix @@ -136,6 +136,12 @@ openFirewall = true; }; + services.icecream.daemon = { + enable = true; + + schedulerHost = "icecream.internal.horus.nu"; + }; + # sops = { # defaultSopsFile = ./secrets.yaml; From 4bcff8ed1b82cac0d13a9d2be81379142596d563 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Thu, 22 Dec 2022 11:35:17 +0100 Subject: [PATCH 3/6] Fix NVidia stuff, add insecure registries to docker --- machines/mimir/configuration.nix | 3 +++ machines/mimir/hardware-configuration.nix | 6 +++++- modules/docker/default.nix | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix index 8a34721..cf9bef1 100644 --- a/machines/mimir/configuration.nix +++ b/machines/mimir/configuration.nix @@ -89,6 +89,9 @@ # sccache server 10501 + + # Celantur + 7000 ]; }; }; diff --git a/machines/mimir/hardware-configuration.nix b/machines/mimir/hardware-configuration.nix index 6b51c19..9b7bcf2 100644 --- a/machines/mimir/hardware-configuration.nix +++ b/machines/mimir/hardware-configuration.nix @@ -41,7 +41,11 @@ hardware = { video.hidpi.enable = true; enableAllFirmware = true; - nvidia.modesetting.enable = true; + nvidia = { + modesetting.enable = true; + powerManagement.enable = true; + forceFullCompositionPipeline = true; + }; opengl = { driSupport32Bit = true; diff --git a/modules/docker/default.nix b/modules/docker/default.nix index c481b2e..7b4fb55 100644 --- a/modules/docker/default.nix +++ b/modules/docker/default.nix @@ -24,6 +24,10 @@ in enable = true; dates = "weekly"; }; + + daemon.settings = { + insecure-registries = config.virtualisation.containers.registries.insecure; + }; }; virtualisation.containers = { From e450d44b54e79cb55d89b1d7967a4df754cf3a6b Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Thu, 22 Dec 2022 11:36:25 +0100 Subject: [PATCH 4/6] Teamviewer, gtk4 settings, add minio-client --- users/erwin/work.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/users/erwin/work.nix b/users/erwin/work.nix index 190339b..af7610f 100644 --- a/users/erwin/work.nix +++ b/users/erwin/work.nix @@ -103,6 +103,7 @@ in (jetbrains.clion.override { jdk = pkgs.jetbrains.jdk; }) libnotify libreoffice-fresh + minio-client mpv nordzy-cursor-theme onefetch @@ -175,6 +176,11 @@ in gtk-cursor-theme-name = "Nordzy-cursors"; }; }; + + gtk4.extraConfig = { + gtk-application-prefer-dark-theme = true; + gtk-cursor-theme-name = "Nordzy-cursors"; + }; }; imports = [ @@ -193,6 +199,8 @@ in home.stateVersion = "22.11"; }; + services.teamviewer.enable = true; + services.xserver = { layout = "us,us"; xkbVariant = "colemak,"; From 9c9cf6473c5b478cbc15c9c28f98ae7e998b97c9 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Fri, 23 Dec 2022 08:18:54 +0100 Subject: [PATCH 5/6] Update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 3006ddc..0543f9b 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1671593498, - "narHash": "sha256-q7dFB64LNADOXr9jD5OGzV5BKxAS6JX08Dl1FiU9Ptc=", + "lastModified": 1671705076, + "narHash": "sha256-HV9mPW5WAAAn+5agTkeiaJU43RQ9g1We/N4yY4D9bCA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "04c69f9d921e5090965f92842f225734652835e0", + "rev": "9e9226725def97c722597984175d6f1cb2ecc320", "type": "github" }, "original": { @@ -179,11 +179,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1671577645, - "narHash": "sha256-JCD8GhZJtTmB+k07W/zj7lAzDs6hbsG2eriZZP/Tol8=", + "lastModified": 1671672304, + "narHash": "sha256-gMfYiZbb81h6Cb71Q1SyTVS53PqqRn/kbft6dRh99Cw=", "owner": "Hyprwm", "repo": "Hyprland", - "rev": "fc37ce4a724101def1befa01b353162830f4393f", + "rev": "eb9d06322928bbd5bc576dc15a869b0f833be48c", "type": "github" }, "original": { @@ -272,11 +272,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1671467847, - "narHash": "sha256-eIeZIQbbW0QYDW0nhDaieokw6VakPO3TyJ3RmxqGHOs=", + "lastModified": 1671631481, + "narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "25010a042c23695ae457a97aad60e9b1d49f2ecc", + "rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd", "type": "github" }, "original": { @@ -432,11 +432,11 @@ ] }, "locked": { - "lastModified": 1671589280, - "narHash": "sha256-FmJ4SC+Ewi1iMhdtRcrwirMfvW7h2jakT7ILLo9BVws=", + "lastModified": 1671675758, + "narHash": "sha256-wCrqs6waxH/cuaWiNdudjOBmzM1f4z4vtRgH8Zn0XbA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bfc54bcf98dacdc649c88a82bf14d00b399aa3bb", + "rev": "225c0b73534b7ead914c89fcb86c8de3df66eb15", "type": "github" }, "original": { From 28060dfe862a51bcd42fc984414cf0b3a33ab01e Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Fri, 23 Dec 2022 08:19:07 +0100 Subject: [PATCH 6/6] Set up icecream --- machines/mimir/configuration.nix | 3 +++ users/erwin/work.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix index cf9bef1..12c24f7 100644 --- a/machines/mimir/configuration.nix +++ b/machines/mimir/configuration.nix @@ -143,6 +143,9 @@ enable = true; schedulerHost = "icecream.internal.horus.nu"; + noRemote = true; + openFirewall = false; + openBroadcast = true; }; # sops = { diff --git a/users/erwin/work.nix b/users/erwin/work.nix index af7610f..44b29c3 100644 --- a/users/erwin/work.nix +++ b/users/erwin/work.nix @@ -98,6 +98,7 @@ in git gnome.nautilus headsetcontrol + icemon imagemagick iotop (jetbrains.clion.override { jdk = pkgs.jetbrains.jdk; })