Merge branch 'main' of github.com:JulienMalka/nix-config

machines/enigma/default.nix

@@ -39,10 +39,9 @@
   # Enable OpenGL
   hardware.opengl = {
     enable = true;
-    driSupport = true;
-    #    driSupport32Bit = true;
   };
 
+  boot.kernelParams = [ "nvidia-drm.modeset=1" "module_blacklist=nouveau" ];
   # Load nvidia driver for Xorg and Wayland
   services.xserver.videoDrivers = [ "nvidia" ];
 
@@ -70,11 +69,13 @@
     # accessible via `nvidia-settings`.
     nvidiaSettings = true;
 
+
     # Optionally, you may need to select the appropriate driver version for your specific GPU.
     package = config.boot.kernelPackages.nvidiaPackages.beta;
   };
 
 
+
   boot.initrd.kernelModules = [ "nvidia" ];
   boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
 
@@ -93,6 +94,10 @@
 
   programs.xwayland.enable = true;
 
+  nixpkgs.config.permittedInsecurePackages = [
+    "zotero-6.0.26"
+  ];
+
   time.timeZone = "Europe/Paris";
 
   # Select internationalisation properties.
@@ -103,6 +108,10 @@
   };
 
   programs.dconf.enable = true;
+  services.emacs = {
+    enable = true;
+    package = pkgs.emacs29;
+  };
 
   security.polkit.enable = true;
 
@@ -115,6 +124,7 @@
         maxJobs = 100;
         systems = [ "x86_64-linux" ];
         sshUser = "root";
+        supportedFeatures = [ "kvm" "nixos-test" ];
         sshKey = "/home/julien/.ssh/id_ed25519";
         speedFactor = 2;
       }

machines/enigma/home-julien.nix

@@ -9,6 +9,7 @@
       luj.programs.git.enable = true;
       luj.programs.gtk.enable = true;
       luj.programs.kitty.enable = true;
+      luj.programs.emacs.enable = true;
       luj.emails.enable = true;
 
       programs.rofi = {
@@ -30,6 +31,14 @@
           xkb-options = [ ];
         };
       };
+
+
+      programs.obs-studio = {
+        enable = true;
+        plugins = with pkgs; [ obs-studio-plugins.obs-vkcapture ];
+      };
+
+
       home.packages = with pkgs;
         [
           du-dust
@@ -48,7 +57,6 @@
           htop
           evince
           mosh
-          obsidian
           zotero
           flameshot
           albert

machines/x2100/home-julien.nix

@@ -9,7 +9,6 @@
       luj.programs.git.enable = true;
       luj.programs.gtk.enable = true;
       luj.programs.alacritty.enable = true;
-      luj.programs.hyprland.enable = true;
       luj.programs.waybar.enable = true;
       luj.programs.kitty.enable = true;
       luj.emails.enable = true;