Merge branch 'main' of ssh://gitea.xeovalyte.dev:2222/xeovalyte/nix

Merge
This commit is contained in:
xeovalyte 2024-06-20 13:01:28 +02:00
commit 4d2ee54904
Signed by: xeovalyte
SSH Key Fingerprint: SHA256:kSQDrQDmKzljJzfGYcd3m9RqHi4h8rSwkZ3sQ9kBURo
6 changed files with 75 additions and 53 deletions

View File

@ -3,19 +3,20 @@
{
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
../../modules/system/desktop/hyprland.nix
../../modules/system/desktop/noisetorch.nix
# ../../modules/system/desktop/hyprland.nix
../../modules/system/desktop/plasma.nix
# ../../modules/system/desktop/noisetorch.nix
../../modules/system/desktop/nvidia.nix
../../modules/system/programs/syncthing.nix
../../modules/system/programs/thunar.nix
../../modules/system/programs/steam.nix
../../modules/system/utils/common.nix
../../modules/system/utils/docker.nix
../../modules/system/utils/firewall.nix
# ../../modules/system/programs/syncthing.nix
# ../../modules/system/programs/thunar.nix
# ../../modules/system/programs/steam.nix
# ../../modules/system/utils/common.nix
# ../../modules/system/utils/docker.nix
# ../../modules/system/utils/firewall.nix
#../../modules/system/utils/fprint.nix
../../modules/system/utils/garbage-collection.nix
../../modules/system/utils/locale.nix
../../modules/system/utils/printing.nix
# ../../modules/system/utils/printing.nix
../../modules/system/programs/sunshine.nix
];
@ -34,11 +35,14 @@
# Bootloader.
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.grub = {
enable = true;
efiSupport = true;
device = "nodev";
};
# boot.loader.grub = {
# enable = true;
# efiSupport = true;
# device = "nodev";
# };
boot.loader.systemd-boot.enable = true;
networking.networkmanager.enable = true;
networking.hostName = "xv-desktop"; # Define your hostname.
networking.interfaces.enp7s0.wakeOnLan.enable = true;
@ -49,10 +53,13 @@
extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
};
services.printing.enable = true;
services.displayManager.autoLogin = {
enable = true;
user = "xeovalyte";
};
# Keyboard
hardware.ckb-next.enable = true;
systemd.services."getty@tty1".enable = false;
systemd.services."autovt@tty1".enable = false;
system.stateVersion = "24.05";

View File

@ -14,18 +14,17 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/60a347a6-cec9-4e0e-a179-f04285d6a649";
{ device = "/dev/disk/by-uuid/b4cefbc5-dd3d-4a4b-84d0-031b2ed7655c";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/154C-D14F";
{ device = "/dev/disk/by-uuid/9A7D-7464";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/ad0bc462-5a03-4d7a-a14b-d60fa6d85c89"; }
];
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -2,18 +2,18 @@
{
imports = [
../../modules/home/desktop/hyprland
# ../../modules/home/desktop/hyprland
# ../../modules/home/programs/barrier.nix
../../modules/home/programs/common.nix
../../modules/home/programs/develop.nix
# ../../modules/home/programs/common.nix
# ../../modules/home/programs/develop.nix
../../modules/home/programs/firefox.nix
../../modules/home/programs/modrinth.nix
../../modules/home/programs/neovim
../../modules/home/programs/git.nix
../../modules/home/programs/ssh.nix
../../modules/home/theme
../../modules/home/theme/blueish.nix
../../modules/home/utils/fonts.nix
# ../../modules/home/programs/modrinth.nix
# ../../modules/home/programs/neovim
# ../../modules/home/programs/git.nix
# ../../modules/home/programs/ssh.nix
# ../../modules/home/theme
# ../../modules/home/theme/blueish.nix
# ../../modules/home/utils/fonts.nix
];
home = {
@ -23,21 +23,21 @@
home.packages = with pkgs; [
# Desktop Applications
kdenlive
gthumb
unstable.arduino-ide
# kdenlive
# gthumb
unstable.bitwarden
unstable.prismlauncher
blender
# blender
unstable.surrealist
# unstable.surrealist
];
home.sessionVariables = {
LIBVA_DRIVER_NAME = "nvidia";
XDG_SESSION_TYPE = "wayland";
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
WLR_NO_HARDWARE_CURSORS = 1;
};
# home.sessionVariables = {
# LIBVA_DRIVER_NAME = "nvidia";
# XDG_SESSION_TYPE = "wayland";
# __GLX_VENDOR_LIBRARY_NAME = "nvidia";
# WLR_NO_HARDWARE_CURSORS = 1;
# };
home.stateVersion = "24.05";
}

View File

@ -31,11 +31,9 @@
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
# Only available from driver 515.43.04+
# Currently alpha-quality/buggy, so false is currently the recommended setting.
open = true;
open = false;
nvidiaSettings = true;
package = pkgs.unstable.linuxKernel.packages.linux_6_6.nvidia_x11_beta;
package = config.boot.kernelPackages.nvidiaPackages.stable;
};
programs.gamemode.enable = true;
}

View File

@ -0,0 +1,18 @@
{ pkgs, ... }:
{
services.xserver.enable = true;
services.displayManager.sddm.enable = true;
services.desktopManager.plasma6.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
}

View File

@ -1,10 +1,10 @@
{ ..., pkgs }:
{ pkgs, ... }:
{
services.sunshine = {
enable = true;
package = pkgs.unstable.sunshine;
autostart = true;
package = pkgs.unstable.sunshine.override { cudaSupport = true; };
autoStart = true;
capSysAdmin = true;
openFirewall = true;
};