Merge branch 'main' of git.sr.ht:~xqtc/nixos-config

common/default.nix

@@ -2,5 +2,6 @@
 {
   nixpkgs.config.permittedInsecurePackages = [
     "electron-25.9.0"
+    "electron-24.8.6"
   ];
 }

home/default.nix

@@ -182,6 +182,10 @@ $character'';
       textColor = "#cdd6f4";
     };
 
+    services.easyeffects = {
+      enable = true;
+    };
+
     home.packages = with pkgs; [
       neofetch
       uwufetch
@@ -232,6 +236,7 @@ $character'';
       spotify
       sayonara
       mpv
+      feishin
       
       nixos-icons
       swww

hosts/asmodeus/default.nix

@@ -16,12 +16,16 @@
 ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠛⠛⠛⠛⠛⠛⠉⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
 */
 
-{ config, lib, pkgs, ... }:
+{ config, inputs, lib, pkgs, ... }:
 
 {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../common
+      #../antivirus.nix
+      ../../modules/home-manager.nix
+      ../gc.nix
     ];
   
   nixpkgs.config.allowUnfree = true;
@@ -199,7 +203,7 @@
 
   services.tailscale.enable = true;
   # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 8096 8080 8082 ];
+  networking.firewall.allowedTCPPorts = [ 2234 8096 8080 8082 ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;

hosts/seraphim/default.nix

@@ -1,13 +1,12 @@
-# Edit this configuration file to define what should be installed on
+{ config, inputs, lib, pkgs, ... }:
-# your system. Help is available in the configuration.nix(5) man page, on
-# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
-
-{ config, lib, pkgs, ... }:
 
 {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../modules/home-manager.nix
+      ../../common
+      inputs.nixos-hardware.nixosModules.common-cpu-intel
       ../gc.nix
     ];
   nixpkgs.config.allowUnfree = true;
@@ -20,6 +19,19 @@
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   #networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+  nixpkgs.config.packageOverrides = pkgs: {
+    intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
+  };
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      intel-media-driver # LIBVA_DRIVER_NAME=iHD
+      intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+      vaapiVdpau
+      libvdpau-va-gl
+    ];
+  };
+  environment.sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; # Force intel-media-driver
 
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
@@ -112,16 +124,16 @@
   services.jellyfin.enable = true;
   services.jellyfin.user = "xqtc";
 
-  services.slskd = {
+  #services.slskd = {
-    enable = true;
+  #  enable = true;
-    nginx.enable = true;
+  #  nginx.enable = true;
-    nginx.domainName = "seraphim";
+  #  nginx.domainName = "seraphim";
-    settings = {
+  #  settings = {
-      soulseek = {
+  #    soulseek = {
-	username = "razorbladeramen";
+  #      username = "razorbladeramen";
-      };
+  #    };
-    };
+  #  };
-  };
+  #};
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.