From 786b315fbfd0d7e426b46f36ce757a84562b7a51 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Sun, 15 Dec 2024 13:51:16 +0100 Subject: [PATCH] try xanmod --- modules/graphical/games.nix | 1 + modules/services/nginx.nix | 8 ++++++++ modules/xanmod-kernel.nix | 4 ++++ overlays.nix | 21 ++++++++++----------- systems/pc/configuration.nix | 10 +++++----- 5 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 modules/xanmod-kernel.nix diff --git a/modules/graphical/games.nix b/modules/graphical/games.nix index fd9b88c..19d4e73 100644 --- a/modules/graphical/games.nix +++ b/modules/graphical/games.nix @@ -32,6 +32,7 @@ in { winetricks lutris prismlauncher + steamtinkerlaunch #tetrio-desktop #fuck you osk #libs ]); diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix index 4ff13f8..7c1b45e 100644 --- a/modules/services/nginx.nix +++ b/modules/services/nginx.nix @@ -97,6 +97,14 @@ in { return 301 /comms/; ''; }; + "/kavita-client" = { + extraConfig = '' + return 301 /kavita-client/; + ''; + }; + "/kavita-client/" = { + alias = "/kavita-client/"; + }; }; }; in { diff --git a/modules/xanmod-kernel.nix b/modules/xanmod-kernel.nix new file mode 100644 index 0000000..121ac88 --- /dev/null +++ b/modules/xanmod-kernel.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: { + boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; + boot.kernelModules = [ "ntsync" ]; +} diff --git a/overlays.nix b/overlays.nix index 0413783..20ea4d1 100644 --- a/overlays.nix +++ b/overlays.nix @@ -15,17 +15,16 @@ in { discord = prev.discord-canary.override { withVencord = true; }; #discord = prev.vesktop; tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; }; - #hyprland = prev.hyprland.overrideAttrs (oldAttrs: { - # version = "0.45.0"; - - # src = prev.fetchFromGitHub { - # owner = "hyprwm"; - # repo = "hyprland"; - # fetchSubmodules = true; - # rev = "refs/tags/v0.45.0"; - # hash = "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA="; - # }; - #}); + #hyprland = prev.hyprland.overrideAttrs (oldAttrs: { + # version = "0.45.0"; + # src = prev.fetchFromGitHub { + # owner = "hyprwm"; + # repo = "hyprland"; + # fetchSubmodules = true; + # rev = "refs/tags/v0.45.0"; + # hash = "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA="; + # }; + #}); # mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; #}); diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 4f9d92a..98e7b10 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -2,12 +2,13 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: { +{ config, pkgs, lib, inputs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix ../../modules/flatpak.nix ../../modules/gpg.nix - ../../modules/kernel.nix # use latest kernel + ../../modules/xanmod-kernel.nix + #../../modules/kernel.nix ../../modules/services/syncthing.nix ../../modules/support/ntfs.nix ]; @@ -81,7 +82,7 @@ enable = false; acceleration = "cuda"; }; - + virtualisation.waydroid.enable = true; # apple shit services.usbmuxd.enable = true; @@ -90,8 +91,7 @@ ifuse # optional, to mount using 'ifuse' ]; - nixpkgs.config.permittedInsecurePackages = - [ "electron-27.3.11" ]; + nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" ]; networking.firewall.allowedTCPPorts = [ 6567 ]; # mindustry networking.firewall.allowedUDPPorts = [ 6567 ]; # mindustry