From 5ee7ab22bd917a76a90b8842df34971b584af30f Mon Sep 17 00:00:00 2001
From: Morten Olsen <fbtijfdq@void.black>
Date: Tue, 30 Apr 2024 14:30:50 +0200
Subject: [PATCH] update

---
 desktop/gnome/default.nix                         |  6 +++---
 modules/basic/default.nix                         |  6 ++++++
 modules/basic/security.nix                        | 14 +++++++-------
 user/default.nix                                  |  2 ++
 user/home.nix                                     |  4 ++--
 user/programs/terminal/default.nix                | 11 ++++++++++-
 user/programs/terminal/files/shell/rc.d/05-nvm.sh |  3 +++
 7 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 user/programs/terminal/files/shell/rc.d/05-nvm.sh

diff --git a/desktop/gnome/default.nix b/desktop/gnome/default.nix
index cd9acdf..2d593d9 100644
--- a/desktop/gnome/default.nix
+++ b/desktop/gnome/default.nix
@@ -68,7 +68,7 @@
       #pkgs.firefox # pkgs.gnome.epiphany
     ];
 
-    sessionVariables.NIXOS_OZONE_WL = "1";
+    # sessionVariables.NIXOS_OZONE_WL = "1";
 
     gnome.excludePackages = [
       pkgs.gnome-connections
@@ -77,7 +77,7 @@
       pkgs.gnome-tour
       # pkgs.gnome.adwaita-icon-theme
       pkgs.gnome.epiphany
-      pkgs.gnome.evince
+      # pkgs.gnome.evince
       pkgs.gnome.file-roller
       pkgs.gnome.geary
       pkgs.gnome.gnome-backgrounds
@@ -94,7 +94,7 @@
       # pkgs.gnome.nautilus
       pkgs.gnome.simple-scan
       pkgs.gnome.sushi
-      pkgs.gnome.totem
+      # pkgs.gnome.totem
       pkgs.gnome.yelp
       pkgs.orca
     ];
diff --git a/modules/basic/default.nix b/modules/basic/default.nix
index 69b6f81..393e76b 100644
--- a/modules/basic/default.nix
+++ b/modules/basic/default.nix
@@ -9,6 +9,12 @@
     ./udev.nix
   ];
 
+   environment.systemPackages = with pkgs; [
+     linuxPackages.v4l2loopback
+   ];
+
+  boot.kernelModules = [ "v4l2loopback" ];
+
   services = {
     fwupd.enable = true;
 
diff --git a/modules/basic/security.nix b/modules/basic/security.nix
index b7b1d4a..c9873f2 100644
--- a/modules/basic/security.nix
+++ b/modules/basic/security.nix
@@ -5,13 +5,13 @@
   services.pcscd.enable = true;
   security.apparmor.enable = true;
   programs.firejail.enable = true;
-  programs.firejail.wrappedBinaries = {
-    signal-desktop = {
-      executable = "${pkgs.signal-desktop}/bin/signal-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland";
-      profile = "${pkgs.firejail}/etc/firejail/signal-desktop.profile";
-      extraArgs = [ "--env=LC_ALL=C" "--env=GTK_THEME=Adwaita:dark" ];
-    };
-  };
+  # programs.firejail.wrappedBinaries = {
+  #   signal-desktop = {
+  #     executable = "${pkgs.signal-desktop}/bin/signal-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland";
+  #     profile = "${pkgs.firejail}/etc/firejail/signal-desktop.profile";
+  #     extraArgs = [ "--env=LC_ALL=C" "--env=GTK_THEME=Adwaita:dark" ];
+  #   };
+  # };
   
   environment.systemPackages = [
     pkgs.gnupg
diff --git a/user/default.nix b/user/default.nix
index 0f56220..8757a0b 100644
--- a/user/default.nix
+++ b/user/default.nix
@@ -11,6 +11,8 @@
     shell = pkgs.zsh;
   };
 
+  programs.nix-ld.enable = true;
+
   users.users."alice".openssh.authorizedKeys.keys = [
     "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCj8wspkAnOpEmipwB/xd8vpEx9aqNbyjD2xzv0msDJvYMn26ZO3cbtbWbMI9Uns55aHcL0bStdbaJQIcL8ZVzvQtKq+spdZYQpN4cFlN16HXKR/UjBYtJEdHVxb2cwb2DM04aLDuAlCAJGChEAqpIQFpvlByyAaxSPwor5Cy5JHmm5fMkvcJEvPtxQOo4yovY8qW9scWlOCrzNSAYtBwTGG8REcRuTaEW9EJlmn8QZA+T+cE7nFdZOlmm752jW9wBCAIKlg6W5gX0rysSxy+MkKB/2ohpLI+0SeWAM8+CEtZjO7GP6xRPXZgrZJssytzQsJoiMTs6rJM5ovHUMVNPGDLCB6+8lWM7Jk4hh0lIQTOC5AMucH2jRJSyQb2AA3kbPuWOwHDDIlSUnNFsI/xUVs1lfx3ikIZEb9oZcKwWBB2PeL/KT6ca7dsI3PyFL+hC5Wi7ll0Aj5w+dBZOxwW1agSo4ujPKO9oIVwqEA+PqoK/GZtIHAx6t/m3DK8T4HAo2GZMqyzRgcqk1bttaCFzX2h074yW1du8+l4yIqWrooqD474V3MT05HUxkA1+9S5ldEwK4J50WfKlhNuZn5YeiHLngisu8WyIGREYDGlkM+1qxwHiJGohigS20kpmTUkKvyLRXItAcvQYBknCV3qb8B1Kj1bvbN3sCaqQAeVWxDw=="
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFaIAP/ZJ7+7jeR44e1yIJjfQAB6MN351LDKJAXVF62P"
diff --git a/user/home.nix b/user/home.nix
index 3329337..9781144 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -10,7 +10,7 @@
     ./programs/kitty
     ./programs/firefox
     ./programs/devbox
-    #./programs/vscode
+    ./programs/vscode
   ];
 
   home.file = {
@@ -19,7 +19,7 @@
 
   home.stateVersion = "23.11";
   home.packages = with pkgs; [
-    signal-desktop
+    # signal-desktop
     gnomeExtensions.user-themes
     gnomeExtensions.tray-icons-reloaded
     gnomeExtensions.vitals
diff --git a/user/programs/terminal/default.nix b/user/programs/terminal/default.nix
index 6267e80..b6159ca 100644
--- a/user/programs/terminal/default.nix
+++ b/user/programs/terminal/default.nix
@@ -1,6 +1,11 @@
 { config, pkgs, ... }:
 
-{
+let
+  nvm = builtins.fetchGit {
+    url = "https://github.com/nvm-sh/nvm";
+    rev = "811c039e2b6fb305e6eb2269d7aa0d21eb067586";
+  };
+in {
   imports = [
     ../fzf
     ../direnv
@@ -57,5 +62,9 @@
     ".shellrc/rc.d" = {
       source = ./files/shell/rc.d;
     };
+    ".nvm" = {
+      source = nvm;
+      recursive = true;
+    };
   };
 }
diff --git a/user/programs/terminal/files/shell/rc.d/05-nvm.sh b/user/programs/terminal/files/shell/rc.d/05-nvm.sh
new file mode 100644
index 0000000..acc6ed5
--- /dev/null
+++ b/user/programs/terminal/files/shell/rc.d/05-nvm.sh
@@ -0,0 +1,3 @@
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion