From e093396119042ff9cf6cc136c89e21b1a6b73fdd Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Wed, 6 Mar 2024 17:19:49 +0100 Subject: [PATCH 1/3] idk anymore --- common/default.nix | 1 + home/default.nix | 5 +++++ hosts/asmodeus/default.nix | 8 ++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/common/default.nix b/common/default.nix index d168e6b..89e1b16 100644 --- a/common/default.nix +++ b/common/default.nix @@ -2,5 +2,6 @@ { nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" + "electron-24.8.6" ]; } diff --git a/home/default.nix b/home/default.nix index 10db627..657e30a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -171,6 +171,10 @@ $character''; textColor = "#cdd6f4"; }; + services.easyeffects = { + enable = true; + }; + home.packages = with pkgs; [ neofetch uwufetch @@ -220,6 +224,7 @@ $character''; spotify sayonara mpv + feishin nixos-icons swww diff --git a/hosts/asmodeus/default.nix b/hosts/asmodeus/default.nix index b3b83e6..57f418f 100644 --- a/hosts/asmodeus/default.nix +++ b/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; From 83fa01f1700dac97d6665cdde128dad61926f309 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Wed, 6 Mar 2024 18:07:11 +0100 Subject: [PATCH 2/3] Disabled slskd for now; Adding Intel GPU support --- hosts/seraphim/default.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/hosts/seraphim/default.nix b/hosts/seraphim/default.nix index 3c75917..c7efebe 100644 --- a/hosts/seraphim/default.nix +++ b/hosts/seraphim/default.nix @@ -2,12 +2,15 @@ # 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, ... }: +{ config, inputs, lib, pkgs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ../../modules/home-manager.nix + ../../common + inputs.nixos-hardware.nixosModules.common-gpu-intel ../gc.nix ]; nixpkgs.config.allowUnfree = true; @@ -112,16 +115,16 @@ services.jellyfin.enable = true; services.jellyfin.user = "xqtc"; - services.slskd = { - enable = true; - nginx.enable = true; - nginx.domainName = "seraphim"; - settings = { - soulseek = { - username = "razorbladeramen"; - }; - }; - }; + #services.slskd = { + # enable = true; + # nginx.enable = true; + # nginx.domainName = "seraphim"; + # settings = { + # soulseek = { + # username = "razorbladeramen"; + # }; + # }; + #}; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. From afda1f5e85115796a0226993401ac24c5f2bcd55 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Wed, 6 Mar 2024 19:42:04 +0100 Subject: [PATCH 3/3] further intel cpu/gpu config --- hosts/seraphim/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/hosts/seraphim/default.nix b/hosts/seraphim/default.nix index c7efebe..9aa4770 100644 --- a/hosts/seraphim/default.nix +++ b/hosts/seraphim/default.nix @@ -1,7 +1,3 @@ -# Edit this configuration file to define what should be installed on -# 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, inputs, lib, pkgs, ... }: { @@ -10,7 +6,7 @@ ./hardware-configuration.nix ../../modules/home-manager.nix ../../common - inputs.nixos-hardware.nixosModules.common-gpu-intel + inputs.nixos-hardware.nixosModules.common-cpu-intel ../gc.nix ]; nixpkgs.config.allowUnfree = true; @@ -23,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";