diff --git a/backup/desktop.nix b/backup/desktop.nix deleted file mode 100755 index 84a7b44..0000000 --- a/backup/desktop.nix +++ /dev/null @@ -1,151 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - secrets = import ../configs/secrets.nix; - secrets-desktop = import ../configs/secrets-desktop.nix; - be = import ../configs/borg-exclude.nix; -in -{ - imports = - [ - /etc/nixos/hardware-configuration.nix - ../configs/docker.nix - ../configs/libvirt.nix - ../configs/common.nix - ../configs/user-gui-applications.nix - ../configs/user-gui.nix - ../configs/user.nix - ../configs/bspwm.nix - #../configs/pantheon.nix - ]; - - fileSystems."/".options = [ "noatime" "discard" ]; - fileSystems."/boot".options = [ "noatime" "discard" ]; - fileSystems."/mnt/second" = { - device = "/dev/disk/by-uuid/49c04c91-752d-4dff-b4d9-40a0b9a7bf7c"; - fsType = "ext4"; - options = [ "noatime" "discard" ]; - }; - - boot = { - loader = { - grub = { - enable = true; - version = 2; - device = "nodev"; - efiSupport = true; - gfxmodeEfi = "1024x768"; - configurationLimit = 5; - }; - - efi.canTouchEfiVariables = true; - }; - - initrd.kernelModules = [ "amdgpu" ]; - plymouth.enable = true; - extraModulePackages = with pkgs.linuxPackages_lqx; [ it87 ]; - kernelModules = [ "it87" "v4l2loopback" ]; - kernelPackages = pkgs.linuxPackages_lqx; - }; - - networking = { - hostName = "desktop"; - useDHCP = false; - wireguard.interfaces = { - wg0 = { - ips = [ "10.100.0.2/24" ]; - privateKey = secrets-desktop.wireguard-private; - - peers = [ - { - publicKey = secrets.wireguard-vps-public; - presharedKey = secrets.wireguard-preshared; - allowedIPs = [ "10.100.0.0/24" ]; - endpoint = "szczepan.ski:51820"; - persistentKeepalive = 25; - } - ]; - }; - }; - }; - - time.timeZone = "Europe/Berlin"; - - console = { - font = "latarcyrheb-sun32"; - keyMap = "us"; - }; - - hardware = { - cpu.amd.updateMicrocode = true; - - opengl = { - driSupport = true; - driSupport32Bit = true; - extraPackages = with pkgs; [ - rocm-opencl-icd - rocm-opencl-runtime - # amdvlk - ]; - # extraPackages32 = with pkgs; [ - # driversi686Linux.amdvlk - # ]; - }; - - fancontrol = { - enable = true; - config = '' - INTERVAL=10 - DEVPATH=hwmon2=devices/platform/it87.656 - DEVNAME=hwmon2=it8665 - FCTEMPS=hwmon2/pwm3=hwmon2/temp1_input hwmon2/pwm2=hwmon2/temp1_input hwmon2/pwm1=hwmon2/temp1_input - FCFANS=hwmon2/pwm3=hwmon2/fan2_input hwmon2/pwm2=hwmon2/fan1_input hwmon2/pwm1= - MINTEMP=hwmon2/pwm3=60 hwmon2/pwm2=60 hwmon2/pwm1=60 - MAXTEMP=hwmon2/pwm3=75 hwmon2/pwm2=75 hwmon2/pwm1=75 - MINSTART=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51 - MINSTOP=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51 - MINPWM=hwmon2/pwm1=51 hwmon2/pwm2=51 hwmon2/pwm3=51 - MAXPWM=hwmon2/pwm3=127 hwmon2/pwm2=204 - ''; - }; - - pulseaudio = { - enable = true; - support32Bit = true; - }; - }; - - sound.enable = true; - - services = { - netdata.enable = true; - printing.enable = true; - xserver.videoDrivers = [ "amdgpu" ]; - xserver.deviceSection = '' - Option "TearFree" "true" - ''; - # hardware.xow.enable = true; - borgbackup.jobs.home = rec { - compression = "auto,zstd"; - encryption = { - mode = "repokey-blake2"; - passphrase = secrets-desktop.borg-key; - }; - extraCreateArgs = "--checkpoint-interval 600 --exclude-caches"; - environment.BORG_RSH = "ssh -i ~/.ssh/id_borg_rsa"; - paths = "/home/alex"; - repo = secrets-desktop.borg-repo; - startAt = "daily"; - user = "alex"; - prune.keep = { - daily = 7; - weekly = 4; - monthly = 6; - }; - extraPruneArgs = "--save-space --list --stats"; - exclude = map (x: paths + "/" + x) be.borg-exclude; - }; - }; - - system.stateVersion = "21.11"; -} diff --git a/configs/games.nix b/configs/games.nix index 33d23ca..2b626f5 100755 --- a/configs/games.nix +++ b/configs/games.nix @@ -1,28 +1,23 @@ { config, pkgs, lib, ... }: let -unstable = import { - config.allowUnfree = true; - config.packageOverrides = pkgs: { - steam = pkgs.steam.override { - extraPkgs = pkgs: with unstable.pkgs; [ - gamescope - mangohud - ncurses6 - ]; - }; - lutris = pkgs.lutris.override { - extraPkgs = pkgs: with unstable.pkgs; [ - gamescope - mangohud - ]; + unstable = import { + config.allowUnfree = true; + config.packageOverrides = pkgs: { + steam = pkgs.steam.override { + extraPkgs = pkgs: with unstable.pkgs; [ gamescope mangohud ncurses6 ]; + }; + lutris = pkgs.lutris.override { + extraPkgs = pkgs: with unstable.pkgs; [ gamescope mangohud ]; + }; }; }; -}; -in -{ - programs.steam = { - enable = true; - package = unstable.pkgs.steam; +in { + programs = { + gamescope.enable = true; + steam = { + enable = true; + package = unstable.pkgs.steam; + }; }; environment.systemPackages = with unstable.pkgs; [ diff --git a/configs/pantheon.nix b/configs/pantheon.nix index 636280c..ccf126f 100755 --- a/configs/pantheon.nix +++ b/configs/pantheon.nix @@ -54,8 +54,6 @@ # App indicator environment.pathsToLink = [ "/libexec" ]; environment.systemPackages = with pkgs; [ - # blackbox-terminal - # cinnamon.nemo-with-extensions gnome-online-accounts gnome.gnome-control-center gnome.gnome-system-monitor diff --git a/configs/plasma.nix b/configs/plasma.nix index 90d96f9..f57571c 100755 --- a/configs/plasma.nix +++ b/configs/plasma.nix @@ -38,4 +38,9 @@ # updateDbusEnvironment = true; # }; }; + + environment.systemPackages = with pkgs; [ + catppuccin-kde + sweet-nova + ]; } diff --git a/machine/desktop.nix b/machine/desktop.nix index 5cdc695..6fee550 100755 --- a/machine/desktop.nix +++ b/machine/desktop.nix @@ -3,6 +3,7 @@ let secrets = import ../configs/secrets.nix; wireguard = import ../configs/wireguard.nix; + unstable = import { config.allowUnfree = true; }; in { imports = [ @@ -12,7 +13,7 @@ in ../configs/docker.nix ../configs/games.nix ../configs/libvirt.nix - ../configs/pantheon.nix + ../configs/plasma.nix ../configs/user-gui.nix ../configs/user.nix ]; @@ -25,45 +26,41 @@ in # options = [ "noatime" "discard" ]; # }; - # nixpkgs.localSystem = { - # gcc.arch = "znver2"; - # gcc.tune = "znver2"; - # system = "x86_64-linux"; - # }; + # nixpkgs.localSystem = { + # gcc.arch = "znver2"; + # gcc.tune = "znver2"; + # system = "x86_64-linux"; + # }; nix.settings.system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-znver2" ]; + nixpkgs.config.allowUnfree = true; + boot = { - initrd.systemd.enable = true; + initrd.systemd.enable = true; loader = { systemd-boot.enable = true; - efi = { - canTouchEfiVariables = true; - }; + efi = { canTouchEfiVariables = true; }; }; - - # loader = { - # grub = { - # enable = true; - # device = "nodev"; - # efiSupport = true; - # gfxmodeEfi = "1024x768"; - # configurationLimit = 5; - # }; - - # efi.canTouchEfiVariables = true; - # }; - initrd.kernelModules = [ "amdgpu" ]; plymouth.enable = true; - extraModulePackages = with pkgs.linuxPackages_lqx; [ it87 ]; - kernelModules = [ "it87" "v4l2loopback" ]; - kernelPackages = pkgs.linuxPackages_lqx; + extraModulePackages = with pkgs.linuxPackages; [ it87 ]; + kernelModules = [ "it87" ]; + kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ]; supportedFilesystems = [ "ntfs" ]; }; + systemd.services = { + monitor = { + description = "AMDGPU Control Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "multi-user.target" ]; + serviceConfig = { ExecStart = "${unstable.pkgs.lact}/bin/lact daemon"; }; + }; + }; + networking = { hostName = "desktop"; useDHCP = false; @@ -89,43 +86,52 @@ in keyMap = "us"; }; + environment.systemPackages = with unstable.pkgs; [ + rustdesk + unigine-valley + unigine-superposition + lact + amdgpu_top + ]; + hardware = { + keyboard.qmk.enable = true; + enableAllFirmware = true; + xone.enable = true; cpu.amd.updateMicrocode = true; + bluetooth.enable = true; opengl = { driSupport = true; driSupport32Bit = true; extraPackages = with pkgs; [ rocm-opencl-icd rocm-opencl-runtime - # amdvlk + amdvlk + ]; + extraPackages32 = with pkgs; [ + driversi686Linux.amdvlk ]; - # extraPackages32 = with pkgs; [ - # driversi686Linux.amdvlk - # ]; }; fancontrol = { enable = true; config = '' INTERVAL=10 - DEVPATH=hwmon2=devices/platform/it87.656 - DEVNAME=hwmon2=it8665 - FCTEMPS=hwmon2/pwm3=hwmon2/temp1_input hwmon2/pwm2=hwmon2/temp1_input hwmon2/pwm1=hwmon2/temp1_input - FCFANS=hwmon2/pwm3=hwmon2/fan2_input hwmon2/pwm2=hwmon2/fan1_input hwmon2/pwm1= - MINTEMP=hwmon2/pwm3=60 hwmon2/pwm2=60 hwmon2/pwm1=60 - MAXTEMP=hwmon2/pwm3=75 hwmon2/pwm2=75 hwmon2/pwm1=75 - MINSTART=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51 - MINSTOP=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51 - MINPWM=hwmon2/pwm1=51 hwmon2/pwm2=51 hwmon2/pwm3=51 - MAXPWM=hwmon2/pwm3=127 hwmon2/pwm2=204 + DEVPATH=hwmon3=devices/platform/it87.656 + DEVNAME=hwmon3=it8665 + FCTEMPS=hwmon3/pwm3=hwmon3/temp1_input hwmon3/pwm2=hwmon3/temp1_input hwmon3/pwm1=hwmon3/temp1_input + FCFANS=hwmon3/pwm3=hwmon3/fan2_input hwmon3/pwm2=hwmon3/fan1_input hwmon3/pwm1= + MINTEMP=hwmon3/pwm3=60 hwmon3/pwm2=60 hwmon3/pwm1=60 + MAXTEMP=hwmon3/pwm3=75 hwmon3/pwm2=75 hwmon3/pwm1=75 + MINSTART=hwmon3/pwm3=51 hwmon3/pwm2=51 hwmon3/pwm1=51 + MINSTOP=hwmon3/pwm3=51 hwmon3/pwm2=51 hwmon3/pwm1=51 + MINPWM=hwmon3/pwm1=51 hwmon3/pwm2=51 hwmon3/pwm3=51 + MAXPWM=hwmon3/pwm3=127 hwmon3/pwm2=204 ''; }; - pulseaudio = { - enable = true; - support32Bit = true; - }; + pulseaudio.enable = false; }; sound.enable = true; @@ -134,10 +140,19 @@ in netdata.enable = true; printing.enable = true; xserver.videoDrivers = [ "amdgpu" ]; - # xserver.deviceSection = '' - # Option "TearFree" "true" - # ''; - # hardware.xow.enable = true; + + displayManager.autoLogin = { + enable = true; + user = "alex"; + }; + + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + # borgbackup.jobs.home = rec { # compression = "auto,zstd"; # encryption = { @@ -167,6 +182,5 @@ in server = "192.168.0.168:24800"; }; - - system.stateVersion = "23.05"; + system.stateVersion = "24.05"; }