From 728ca3983668c244873928c2b86f5f3c74c7dcfc Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Mon, 18 Nov 2024 19:57:40 +0100 Subject: [PATCH 1/5] disables vesktop on startup, as it is causing wayland crashes on boot --- config/autostart/vesktop.desktop | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 config/autostart/vesktop.desktop diff --git a/config/autostart/vesktop.desktop b/config/autostart/vesktop.desktop deleted file mode 100644 index 5cceedf..0000000 --- a/config/autostart/vesktop.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Categories=Network;InstantMessaging;Chat -Exec=vesktop %U -GenericName=Internet Messenger -Icon=vesktop -Keywords=discord;vencord;electron;chat -Name=Vesktop -StartupWMClass=Vesktop -Type=Application -Version=1.4 From 4a80da399537d7a1b96585710499ca1bdfeb1edd Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Mon, 18 Nov 2024 19:58:19 +0100 Subject: [PATCH 2/5] adds plex media player (new version) as flatpak --- config/autostart/ulauncher.desktop | 2 +- config/flatpaks/tv.plex.PlexDesktop.flatpakref | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 config/flatpaks/tv.plex.PlexDesktop.flatpakref diff --git a/config/autostart/ulauncher.desktop b/config/autostart/ulauncher.desktop index 4eb8137..d27731b 120000 --- a/config/autostart/ulauncher.desktop +++ b/config/autostart/ulauncher.desktop @@ -1 +1 @@ -/nix/store/4jqpwdf5q8rh58a9vk80r4naaz9aic6z-home-manager-files/.config/autostart/ulauncher.desktop \ No newline at end of file +/nix/store/ya7gf1qaczdxzgrb0phms5zhc7yfbvim-home-manager-files/.config/autostart/ulauncher.desktop \ No newline at end of file diff --git a/config/flatpaks/tv.plex.PlexDesktop.flatpakref b/config/flatpaks/tv.plex.PlexDesktop.flatpakref new file mode 100644 index 0000000..d7fab83 --- /dev/null +++ b/config/flatpaks/tv.plex.PlexDesktop.flatpakref @@ -0,0 +1,10 @@ +[Flatpak Ref] +Name=tv.plex.PlexDesktop +Branch=stable +Title=tv.plex.PlexDesktop from flathub +IsRuntime=false +Url=https://dl.flathub.org/repo/ +SuggestRemoteName=flathub +GPGKey=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 +RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo + From 93b1aba78d775d6da7b12cde74725ccb8efaabff Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Mon, 18 Nov 2024 21:28:34 +0100 Subject: [PATCH 3/5] adds nvtop for all hosts --- config/nixos/hardware/mennos-gamingpc.nix | 3 ++- config/nixos/hardware/mennos-laptop.nix | 6 ++++++ config/nixos/hardware/mennos-server.nix | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/config/nixos/hardware/mennos-gamingpc.nix b/config/nixos/hardware/mennos-gamingpc.nix index 3cf93c9..a731fe3 100644 --- a/config/nixos/hardware/mennos-gamingpc.nix +++ b/config/nixos/hardware/mennos-gamingpc.nix @@ -33,12 +33,13 @@ ]; }; - # Add ROCm packages + # Add ROCm packages and nvtop environment.systemPackages = with pkgs; [ rocmPackages.rocm-smi rocmPackages.clr rocmPackages.rocm-core rocmPackages.hipcc rocmPackages.rocm-device-libs + nvtopPackages.amd ]; } diff --git a/config/nixos/hardware/mennos-laptop.nix b/config/nixos/hardware/mennos-laptop.nix index 0e21653..3f4deee 100644 --- a/config/nixos/hardware/mennos-laptop.nix +++ b/config/nixos/hardware/mennos-laptop.nix @@ -19,6 +19,12 @@ # Load nvidia driver for Xorg and Wayland services.xserver.videoDrivers = [ "nvidia" ]; + # nvtop, a system monitor for GPUs + environment.systemPackages = with pkgs; [ + nvtopPackages.nvidia + nvtopPackages.amd + ]; + hardware.nvidia = { # Modesetting is required. modesetting.enable = true; diff --git a/config/nixos/hardware/mennos-server.nix b/config/nixos/hardware/mennos-server.nix index bdbdb2d..c875854 100644 --- a/config/nixos/hardware/mennos-server.nix +++ b/config/nixos/hardware/mennos-server.nix @@ -27,6 +27,9 @@ driSupport32Bit = true; }; + # nvtop, a system monitor for GPUs + environment.systemPackages = with pkgs; [ nvtopPackages.nvidia ]; + # Enable NVIDIA Docker support # test with: $ docker run --rm -it --device=nvidia.com/gpu=all ubuntu:latest nvidia-smi hardware.nvidia-container-toolkit.enable = true; From 0d26f302610dc3745a12f91de01d67009655cae7 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Mon, 18 Nov 2024 22:11:29 +0100 Subject: [PATCH 4/5] adds ollama-cuda to home packages for mennos-server --- config/home-manager/packages/common/hosts/mennos-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/home-manager/packages/common/hosts/mennos-server.nix b/config/home-manager/packages/common/hosts/mennos-server.nix index 46f1ad7..1f6e8e1 100644 --- a/config/home-manager/packages/common/hosts/mennos-server.nix +++ b/config/home-manager/packages/common/hosts/mennos-server.nix @@ -1,4 +1,4 @@ { pkgs-unstable, ... }: { - home.packages = with pkgs-unstable; [ ]; + home.packages = with pkgs-unstable; [ ollama-cuda ]; } From 70335cf637228f0265dfaf4b49d840ff34bdf6f9 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Mon, 18 Nov 2024 22:32:49 +0100 Subject: [PATCH 5/5] updates authorized_keys files to add new SSH key for Samsung S24U --- config/ssh/authorized_keys/homeserver-pc | 5 ++++- config/ssh/authorized_keys/mennos-gamingpc | 7 +++++-- config/ssh/authorized_keys/mennos-laptop | 5 ++++- config/ssh/authorized_keys/mennos-server | 7 +++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/config/ssh/authorized_keys/homeserver-pc b/config/ssh/authorized_keys/homeserver-pc index 26b28a2..31af7f9 100644 --- a/config/ssh/authorized_keys/homeserver-pc +++ b/config/ssh/authorized_keys/homeserver-pc @@ -1,2 +1,5 @@ # This is the authrorized_keys file for the user mennos-laptop -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr \ No newline at end of file +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr + +# Samsung S24U +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost diff --git a/config/ssh/authorized_keys/mennos-gamingpc b/config/ssh/authorized_keys/mennos-gamingpc index f4d8226..31af7f9 100644 --- a/config/ssh/authorized_keys/mennos-gamingpc +++ b/config/ssh/authorized_keys/mennos-gamingpc @@ -1,2 +1,5 @@ -# This is the authrorized_keys file for the user mennos-gamingpc -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr \ No newline at end of file +# This is the authrorized_keys file for the user mennos-laptop +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr + +# Samsung S24U +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost diff --git a/config/ssh/authorized_keys/mennos-laptop b/config/ssh/authorized_keys/mennos-laptop index 26b28a2..31af7f9 100644 --- a/config/ssh/authorized_keys/mennos-laptop +++ b/config/ssh/authorized_keys/mennos-laptop @@ -1,2 +1,5 @@ # This is the authrorized_keys file for the user mennos-laptop -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr \ No newline at end of file +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr + +# Samsung S24U +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost diff --git a/config/ssh/authorized_keys/mennos-server b/config/ssh/authorized_keys/mennos-server index c6cf11e..31af7f9 100644 --- a/config/ssh/authorized_keys/mennos-server +++ b/config/ssh/authorized_keys/mennos-server @@ -1,2 +1,5 @@ -# This is the authrorized_keys file for the user mennos-server -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr \ No newline at end of file +# This is the authrorized_keys file for the user mennos-laptop +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr + +# Samsung S24U +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost