configurations/host/Old-materusPC/configuration.nix

@@ -3,7 +3,78 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { config, pkgs, materusArg, ... }:
+let
+  nvidia-unpatched = pkgs.stdenv.mkDerivation (f: {
+    pname = config.hardware.nvidia.package.name;
+    version = config.hardware.nvidia.package.version + "-unpatched";
 
+    src = config.hardware.nvidia.package.src;
+    nativeBuildInputs = [
+    ];
+    sourceRoot = ".";
+    buildInputs = [
+    ];
+
+    unpackPhase = ''
+      VER=${config.hardware.nvidia.package.version}
+      PKGNAME=NVIDIA-Linux-x86_64-''${VER}
+      cp $src ''${PKGNAME}.run
+      chmod +x ./''${PKGNAME}.run
+      ./''${PKGNAME}.run --extract-only
+      mv ./''${PKGNAME} ./nvidia
+    '';
+
+    installPhase = ''
+      mkdir -p $out/bin
+      mkdir -p $out/lib
+      mkdir -p $out/lib32
+
+      mv nvidia $out/nvidia
+
+    '';
+
+  });
+
+
+
+
+
+  steam = pkgs.steam.override {
+    extraPkgs = pkgs: [
+      pkgs.nss_latest
+      pkgs.libstrangle
+      pkgs.libkrb5
+      pkgs.keyutils
+      pkgs.libGL
+      pkgs.libglvnd
+      pkgs.gamescope
+      pkgs.steamPackages.steam
+      pkgs.wqy_zenhei
+
+      pkgs.xorg.libXcursor
+      pkgs.xorg.libXi
+      pkgs.xorg.libXinerama
+      pkgs.xorg.libXScrnSaver
+    ];
+
+    extraLibraries = pkgs: [
+      pkgs.libkrb5
+      pkgs.keyutils
+      pkgs.ncurses6
+      pkgs.fontconfig
+    ];
+
+  };
+
+
+  grml-config = pkgs.fetchFromGitHub {
+    owner = "grml";
+    repo = "grml-etc-core";
+    rev = "a2cda85d3d56fd5f5a7b954a444fd151318c4680";
+    sha256 = "0ap8lmqi45yjyjazdm1v64fz1rfqhkhfpdp2z17ag6hs5wi6i67y";
+  };
+
+in
 {
   imports =
     [
@@ -20,6 +91,19 @@
   nix.settings.trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
   nixpkgs.config.allowUnfree = true;
 
+  services.xserver.displayManager.startx.enable = true;
+
+  security.sudo.extraRules = [
+    { users = [ "materus" ]; commands = [{ command = "${pkgs.podman}/bin/podman"; options = [ "NOPASSWD" ]; }]; }
+
+  ];
+  /*security.wrappers.gamescope = {
+    owner = "root";
+    group = "root";
+    capabilities = "cap_sys_nice=eip";
+    source = "${pkgs.gamescope.out}/bin/gamescope";
+    };*/
+
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.grub = {
@@ -33,6 +117,8 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
   boot.kernelPackages = pkgs.linuxPackages_zen;
+  boot.kernelParams = [ "ibt=off" "intel_iommu=on" "iommu=pt" "pcie_acs_override=downstream,multifunction" ];
+  boot.kernelModules = [ "kvm-intel" "vfio-pci" ];
   boot.tmpOnTmpfs = true;
 
   services.flatpak.enable = true;
@@ -63,18 +149,82 @@
     useXkbConfig = true; # use xkbOptions in tty.
   };
 
+
+  networking.extraHosts =
+    ''
+
+  '';
+
   hardware.bluetooth.enable = true;
   # Enable the X11 windowing system.
   services.xserver.enable = true;
-
+  services.xserver.videoDrivers = [ "nvidia" ];
 
   hardware.opengl.enable = true;
   hardware.opengl.driSupport32Bit = true;
+  /* hardware.opengl.extraPackages = with pkgs; [
+    vaapiVdpau
+    nvidia-vaapi-driver
+    libvdpau-va-gl
+    ];
+    hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [
+    vaapiVdpau
+    nvidia-vaapi-driver
+    libvdpau-va-gl
+  ];*/
+  # Optionally, you may need to select the appropriate driver version for your specific GPU.
+  #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
 
-  materus.profile.steam.enable = true;
+  /*
+    #GNOME
+    services.xserver.displayManager.gdm.wayland = false;
+    services.xserver.displayManager.gdm.enable = true;
+    services.xserver.desktopManager.gnome.enable = true;
+    security.pam.services.gdm.enableGnomeKeyring = true;
+
+
+    services.gnome.rygel.enable = true;
+    services.gnome.sushi.enable = true;
+    services.gnome.tracker.enable = true;
+    services.gnome.gnome-online-accounts.enable = true;
+    services.gnome.gnome-browser-connector.enable = true;
+    services.gnome.gnome-settings-daemon.enable = true;
+    services.gnome.core-utilities.enable = true;
+    services.gnome.core-shell.enable = true;
+    services.gnome.core-os-services.enable = true;
+
+    programs.gnome-terminal.enable = true;
+    services.gnome.gnome-keyring.enable = true;
+    services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon gnome2.GConf ];
+  */
+
+
+  #security.pam.services.login.enableKwallet = true;
 
 
 
+  #services.xserver.displayManager.lightdm.enable = true;
+  #services.xserver.displayManager.lightdm.greeters.enso.enable = true;
+  #services.xserver.displayManager.lightdm.greeters.enso.blur = true;
+
+  #services.xserver.desktopManager.xfce.enable = true;
+  #xdg.portal.enable = true;
+  #xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+
+
+  # Enable the Plasma 5 Desktop Environment.
+
+
+
+  security.pam.services.sddm.enableKwallet = true;
+
+  services.xserver.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
+  #services.xserver.desktopManager.plasma5.supportDDC = true;
+  services.xserver.desktopManager.plasma5.phononBackend = "gstreamer";
+  services.xserver.desktopManager.plasma5.useQtScaling = true;
+  services.xserver.desktopManager.plasma5.runUsingSystemd = true;
+  #services.xserver.desktopManager.plasma5.excludePackages = with pkgs.libsForQt5; [ kwallet ];
 
 
 
@@ -104,21 +254,263 @@
   };
   hardware.pulseaudio.enable = false;
 
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
 
 
   virtualisation.podman = {
     enable = true;
+    enableNvidia = true;
     dockerCompat = true;
     dockerSocket.enable = true;
   };
 
 
+  virtualisation.libvirtd = {
+    enable = true;
+    onBoot = "ignore";
+    onShutdown = "shutdown";
+    qemu.ovmf.enable = true;
+    qemu.ovmf.packages = [ pkgs.OVMFFull.fd ];
+    qemu.runAsRoot = true;
+    qemu.swtpm.enable = true;
+  };
+
+  systemd.services.libvirtd = {
+    path =
+      let
+        env = pkgs.buildEnv {
+          name = "qemu-hook-env";
+          paths = with pkgs; [
+            bash
+            libvirt
+            kmod
+            systemd
+            ripgrep
+            sd
+            coreutils
+            sudo
+            su
+            killall
+          ];
+        };
+      in
+      [ env ];
+  };
+
+  system.activationScripts.libvirt-hooks.text =
+    ''
+      ln -Tfs /etc/libvirt/hooks /var/lib/libvirt/hooks
+    '';
+
+
+
+  environment.etc = {
+    "libvirt/hooks/qemu" = {
+      text =
+        ''
+          #!/usr/bin/env bash
+                            #
+                            # Author: Sebastiaan Meijer (sebastiaan@passthroughpo.st)
+                            #
+                            # Copy this file to /etc/libvirt/hooks, make sure it's called "qemu".
+                            # After this file is installed, restart libvirt.
+                            # From now on, you can easily add per-guest qemu hooks.
+                            # Add your hooks in /etc/libvirt/hooks/qemu.d/vm_name/hook_name/state_name.
+                            # For a list of available hooks, please refer to https://www.libvirt.org/hooks.html
+                            #
+
+                            GUEST_NAME="$1"
+                            HOOK_NAME="$2"
+                            STATE_NAME="$3"
+                            MISC="''${@:4}"
+
+                            BASEDIR="$(dirname $0)"
+
+                            HOOKPATH="$BASEDIR/qemu.d/$GUEST_NAME/$HOOK_NAME/$STATE_NAME"
+
+                            set -e # If a script exits with an error, we should as well.
+
+                            # check if it's a non-empty executable file
+                            if [ -f "$HOOKPATH" ] && [ -s "$HOOKPATH"] && [ -x "$HOOKPATH" ]; then
+                                eval \"$HOOKPATH\" "$@"
+                            elif [ -d "$HOOKPATH" ]; then
+                                while read file; do
+                                    # check for null string
+                                    if [ ! -z "$file" ]; then
+                                      eval \"$file\" "$@"
+                                    fi
+                                done <<< "$(find -L "$HOOKPATH" -maxdepth 1 -type f -executable -print;)"
+                            fi
+        '';
+      mode = "0755";
+    };
+
+    "libvirt/hooks/kvm.conf" = {
+      text =
+        ''
+          VIRSH_GPU_VIDEO=pci_0000_01_00_0
+          VIRSH_GPU_AUDIO=pci_0000_01_00_1
+          VIRSH_GPU_USB=pci_0000_01_00_2
+          VIRSH_GPU_SERIAL_BUS=pci_0000_01_00_3
+        '';
+      mode = "0755";
+    };
+
+    "libvirt/hooks/qemu.d/win11/prepare/begin/start.sh" = {
+      text =
+        ''
+          #!/usr/bin/env bash
+                            # Debugging
+                             exec 19>/home/materus/startlogfile
+                             BASH_XTRACEFD=19
+                             set -x
+
+                             exec 3>&1 4>&2
+                             trap 'exec 2>&4 1>&3' 0 1 2 3
+                             exec 1>/home/materus/startlogfile.out 2>&1
+
+
+
+                            # Stop display manager
+                            killall -u materus
+                            systemctl stop display-manager.service
+                            killall gdm-x-session
+                            #systemctl isolate multi-user.target
+                            sleep 1
+
+
+                            # Load variables we defined
+                            source "/etc/libvirt/hooks/kvm.conf"
+
+                            # Isolate host to core 0
+                            systemctl set-property --runtime -- user.slice AllowedCPUs=0
+                            systemctl set-property --runtime -- system.slice AllowedCPUs=0
+                            systemctl set-property --runtime -- init.scope AllowedCPUs=0
+
+
+
+                            # Unbind VTconsoles
+                            for (( i = 0; i < 16; i++))
+                            do
+                              if test -x /sys/class/vtconsole/vtcon"''${i}"; then
+                                  if [ "$(grep -c "frame buffer" /sys/class/vtconsole/vtcon"''${i}"/name)" = 1 ]; then
+                                    echo 0 > /sys/class/vtconsole/vtcon"''${i}"/bind
+                                      echo "$DATE Unbinding Console ''${i}"
+                                  fi
+                              fi
+                            done
+
+                            # Unbind EFI Framebuffer
+                            echo "efi-framebuffer.0" > /sys/bus/platform/drivers/efi-framebuffer/unbind
+
+                            # Avoid race condition
+                             sleep 1
+
+                            # Unload NVIDIA kernel modules
+                            modprobe -r nvidia_uvm
+                            modprobe -r nvidia_drm
+                            modprobe -r nvidia_modeset
+                            modprobe -r nvidia
+                            modprobe -r i2c_nvidia_gpu
+                            modprobe -r drm_kms_helper
+                            modprobe -r drm
+
+                            # Detach GPU devices from host
+                            #virsh nodedev-detach $VIRSH_GPU_VIDEO
+                            #virsh nodedev-detach $VIRSH_GPU_AUDIO
+                            #virsh nodedev-detach $VIRSH_GPU_USB
+                            #virsh nodedev-detach $VIRSH_GPU_SERIAL_BUS
+
+                            # Load vfio module
+                            modprobe vfio
+                            modprobe vfio_pci
+                            modprobe vfio_iommu_type1
+        '';
+      mode = "0755";
+    };
+
+    "libvirt/hooks/qemu.d/win11/release/end/stop.sh" = {
+      text =
+        ''
+          #!/usr/bin/env bash 
+          # Debugging
+          exec 19>/home/materus/stoplogfile
+          BASH_XTRACEFD=19
+          set -x
+
+          exec 3>&1 4>&2
+          trap 'exec 2>&4 1>&3' 0 1 2 3
+          exec 1>/home/materus/stoplogfile.out 2>&1
+
+          # Load variables we defined
+          source "/etc/libvirt/hooks/kvm.conf"
+
+          # Unload vfio module
+          modprobe -r vfio-pci
+          modprobe -r vfio_iommu_type1
+          modprobe -r vfio
+
+        
+
+          modprobe drm
+          modprobe drm_kms_helper
+          modprobe i2c_nvidia_gpu
+          modprobe nvidia
+          modprobe nvidia_modeset
+          modprobe nvidia_drm
+          modprobe nvidia_uvm
+
+          # Attach GPU devices from host
+          #virsh nodedev-reattach $VIRSH_GPU_VIDEO
+          #virsh nodedev-reattach $VIRSH_GPU_AUDIO
+          #virsh nodedev-reattach $VIRSH_GPU_USB
+          #virsh nodedev-reattach $VIRSH_GPU_SERIAL_BUS
+
+          #echo "0000:01:00.0" > /sys/bus/pci/drivers/nvidia/bind
+          # Bind EFI Framebuffer
+          echo "efi-framebuffer.0" > /sys/bus/platform/drivers/efi-framebuffer/bind
+
+          # Bind VTconsoles
+          echo 1 > /sys/class/vtconsole/vtcon0/bind
+          #echo 1 > /sys/class/vtconsole/vtcon1/bind
+
+
+          # Start display manager
+          sleep 1
+          systemctl start display-manager.service
+
+          # Return host to all cores
+          systemctl set-property --runtime -- user.slice AllowedCPUs=0-3
+          systemctl set-property --runtime -- system.slice AllowedCPUs=0-3
+          systemctl set-property --runtime -- init.scope AllowedCPUs=0-3
+        '';
+      /*text = ''
+        #!/usr/bin/env bash
+        reboot
+        '';*/
+      mode = "0755";
+    };
+    "libvirt/vgabios/patched.rom".source = ./vbios.rom;
+  };
+
+
+
+
+
+
+
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.materus = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" "kvm" "input" "libvirt" "libvirtd" "podman" ];
+    extraGroups = [ "wheel" "networkmanager" "kvm" "input" "libvirt" "libvirtd" "podman" ]; # Enable ‘sudo’ for the user.
     shell = pkgs.zsh;
     description = "Mateusz Słodkowicz";
-
+    #   packages = with pkgs; [
+    #     firefox
+    #     thunderbird
+    #   ];
   };
   environment.sessionVariables = rec {
     XDG_CACHE_HOME = "\${HOME}/.cache";
@@ -149,11 +541,17 @@
   i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-configtool pkgs.fcitx5-lua pkgs.fcitx5-mozc pkgs.libsForQt5.fcitx5-qt ];
 
   environment.systemPackages = with pkgs; [
-    brave
+    config.materus.profile.packages.firefox
+
+    steam
+    steam.run
+    gamescope
+    (pkgs.lutris.override { extraLibraries = pkgs: with pkgs;  [ pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
 
     glibc
+    appimage-run
     patchelf
-    vim
+    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     wget
     killall
     xorg.xkill
@@ -186,25 +584,37 @@
     iftop
     iptraf-ng
     mprocs
+    tldr
+    bat
 
 
+    pgcli
+    litecli
+
+    #zenmonitor
 
     nix-du
     git-crypt
-
+    ark
+    kate
+    kwalletcli
+    krusader
 
     wineWowPackages.stagingFull
     winetricks
     protontricks
     openal
     gnupg
+    pinentry
+    pinentry-gnome3
+    pinentry-curses
     ncurses
     monkeysphere
     gparted
 
     inkscape
     gimp
-
+    (materusArg.pkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm-ce ]; })
 
 
 
@@ -217,6 +627,22 @@
     pulseaudio
 
     binutils
+    /*
+      gnome3.adwaita-icon-theme
+      gnome3.gnome-tweaks
+      gnome3.gnome-color-manager
+      gnome3.gnome-shell-extensions
+
+      gnomeExtensions.appindicator
+      gnomeExtensions.desktop-clock
+      gnomeExtensions.gtk4-desktop-icons-ng-ding
+      gnomeExtensions.compiz-windows-effect
+      gnomeExtensions.burn-my-windows
+      gnomeExtensions.user-themes
+      gnomeExtensions.gsconnect
+      gnomeExtensions.dash-to-panel
+      gnomeExtensions.dash-to-dock
+    */
 
 
   ];
@@ -258,7 +684,7 @@
       enable = true;
       interactiveShellInit = ''
         if [[ ''${__MATERUS_HM_ZSH:-0} == 0 ]]; then
-          source ${pkgs.grml-zsh-config}/etc/zsh/zshrc
+          source ${grml-config}/etc/zsh/zshrc
         fi
       '';
       promptInit = ''
@@ -295,6 +721,36 @@
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
+  services.samba-wsdd.enable = true;
+  services.samba = {
+    enable = true;
+    securityType = "user";
+    extraConfig = ''
+      workgroup = WORKGROUP
+      server string = smbnix
+      netbios name = smbnix
+      security = user 
+      #use sendfile = yes
+      #max protocol = smb2
+      # note: localhost is the ipv6 localhost ::1
+      hosts allow = 192.168.100. 192.168.122. 127.0.0.1 localhost
+      hosts deny = 0.0.0.0/0
+      guest account = nobody
+      map to guest = bad user
+    '';
+    shares = {
+      share = {
+        path = "/materus/data/share";
+        browseable = "yes";
+        "read only" = "no";
+        "guest ok" = "no";
+        "create mask" = "0644";
+        "directory mask" = "0755";
+        "force user" = "materus";
+        "force group" = "users";
+      };
+    };
+  };
 
   # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [ 24800 5900 5357 4656 ];
@@ -313,7 +769,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "22.11"; # Did you read the comment?
 
 }
 

configurations/host/Old-materusPC/default.nix

@@ -2,10 +2,7 @@
 {
   imports =
     [
-      ./secrets
       ./configuration.nix
-      ./nvidia.nix
-      ./plasma.nix
     ];
 
 

configurations/host/Old-materusPC/hardware-configuration.nix

@@ -11,10 +11,15 @@
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" "vfio-pci" ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
   boot.kernel.sysctl = { "vm.swappiness" = 10; };
-  boot.kernelParams = [ "ibt=off" "intel_iommu=on" "iommu=pt" "pcie_acs_override=downstream,multifunction" ];
+  swapDevices = [
+    {
+      device = "/swapfile";
+      size = 32 * 1024;
+    }
+  ];
   fileSystems."/" =
     {
       device = "/dev/disk/by-label/NixOS_Root";
@@ -22,20 +27,6 @@
       options = [ "subvol=@" "noatime" "ssd" "space_cache=v2" ];
     };
 
-  fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-label/NixOS_Root";
-      fsType = "btrfs";
-      options = [ "subvol=@boot" "ssd" ];
-    };
-
-  fileSystems."/materus" =
-    {
-      device = "/dev/disk/by-label/NixOS_Root";
-      fsType = "btrfs";
-      options = [ "subvol=@materus" "noatime" "compress=zstd" "ssd" "space_cache=v2" ];
-    };
-
   fileSystems."/nix" =
     {
       device = "/dev/disk/by-label/NixOS_Root";
@@ -43,29 +34,13 @@
       options = [ "subvol=@nix" "noatime" "compress=zstd" "ssd" "space_cache=v2" ];
     };
 
-  fileSystems."/home" =
+  fileSystems."/materus" =
     {
-      device = "/dev/disk/by-label/NixOS_Home";
+      device = "/dev/disk/by-label/NixOS_Root";
       fsType = "btrfs";
-      options = [ "subvol=@home" "nossd" "noatime" "compress=zstd" "space_cache=v2" "autodefrag" ];
+      options = [ "subvol=@materus" "noatime" "compress=zstd" "ssd" "space_cache=v2" ];
     };
 
-  fileSystems."/materus/data" =
-    {
-      device = "/dev/disk/by-label/NixOS_Home";
-      fsType = "btrfs";
-      options = [ "subvol=@data" "nossd" "noatime" "compress=zstd" "space_cache=v2" "autodefrag" ];
-    };
-
-  fileSystems."/boot/efi" =
-    {
-      device = "/dev/disk/by-uuid/A5C2-31D1";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [{ device = "/dev/disk/by-label/NixOS_Swap"; }];
-
   fileSystems."/etc/nixos" =
     {
       device = "/materus/config/nixos-config";
@@ -73,6 +48,33 @@
       options = [ "bind" ];
     };
 
+  fileSystems."/home" =
+    {
+      device = "/dev/disk/by-label/NixOS_Home";
+      fsType = "btrfs";
+      options = [ "subvol=@home" "nossd" "noatime" "compress=zstd" "space_cache=v2" "autodefrag" ];
+    };
+  fileSystems."/materus/data" =
+    {
+      device = "/dev/disk/by-label/NixOS_Home";
+      fsType = "btrfs";
+      options = [ "subvol=@data" "nossd" "noatime" "compress=zstd" "space_cache=v2" "autodefrag" ];
+    };
+
+  fileSystems."/boot" =
+    {
+      device = "/dev/disk/by-label/NixOS_Root";
+      fsType = "btrfs";
+      options = [ "subvol=@boot" "ssd" ];
+    };
+
+
+
+  fileSystems."/boot/efi" =
+    {
+      device = "/dev/disk/by-label/NixOS_EFI";
+      fsType = "vfat";
+    };
 
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -84,5 +86,5 @@
   # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkForce true;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

configurations/host/Old-materusPC/nvidia.nix

@@ -1,32 +0,0 @@
-{ config, pkgs, ... }:
-{
-  services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.nvidia = {
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
-    modesetting.enable = true;
-    nvidiaSettings = true;
-    prime = {
-      offload = {
-        enable = true;
-        enableOffloadCmd = true;
-      };
-      intelBusId = "PCI:0:2:0";
-      nvidiaBusId = "PCI:1:0:0";
-    };
-
-  };
-  hardware.opengl.extraPackages = with pkgs; [
-    vaapiVdpau
-    nvidia-vaapi-driver
-    libvdpau-va-gl
-  ];
-
-  hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [
-    vaapiVdpau
-    nvidia-vaapi-driver
-    libvdpau-va-gl
-  ];
-  materus.profile.steam.extraEnv = {
-    VK_ICD_FILENAMES=''''$VK_ICD_FILENAMES:/run/opengl-driver/share/vulkan/icd.d/nvidia_icd.x86_64.json:/run/opengl-driver-32/share/vulkan/icd.d/nvidia_icd.i686.json'';
-  };
-}

configurations/host/Old-materusPC/plasma.nix

@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-{
-
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.displayManager.sddm.wayland.enable = true;
-  services.xserver.displayManager.sddm.settings = {
-    General = {
-      InputMethod = "";
-    };
-    Theme = {
-      CursorTheme = "breeze_cursors";
-      CursorSize = "24";
-    };
-  };
-  environment.variables = {
-    QT_PLUGIN_PATH = [ "${pkgs.qt6.qtimageformats}/${pkgs.qt6.qtbase.qtPluginPrefix}" ];
-  };
-  services.desktopManager.plasma6.enable = true;
-  services.desktopManager.plasma6.enableQt5Integration = true;
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
-  environment.systemPackages = with pkgs.kdePackages; [
-    ark
-    kate
-  ];
-  materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin ];
-}

configurations/host/Old-materusPC/secrets/default.nix

@@ -1,25 +0,0 @@
-{ config, pkgs, lib, materusCfg, ... }:
-{
-  imports =
-    [
-
-    ] ++ (if (materusCfg.materusFlake.decrypted) then [ ./private ] else [ ]);
-
-  sops.age.generateKey = false;
-  sops.gnupg.home = null;
-  sops.gnupg.sshKeyPaths = [ ];
-  sops.defaultSopsFile = materusCfg.hostPath + "/secrets/secrets.yaml";
-  sops.secrets."wg-key" = { };
-  services.openssh.hostKeys = [
-    {
-      bits = 4096;
-      path = "/materus/root/ssh_host_rsa_key";
-      type = "rsa";
-    }
-    {
-      path = "/materus/root/ssh_host_ed25519_key";
-      type = "ed25519";
-    }
-  ];
-
-}

configurations/host/Old-materusPC/secrets/secrets.yaml

@@ -1,33 +0,0 @@
-wg-key: ENC[AES256_GCM,data:+z+Xxq6A1h5ceCOZry9PSz871zVZpd9Y6vtqpfoAulHCN03DjzZ/PLmRvYQ=,iv:7hdjnUuaRk30hFJ8rv4zXxI8v42RWC1iQb64LMNgBnQ=,tag:eUSTVygR+u9ERPU9gfhYIw==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1el7zhjxkrlravpt7hw36fuac0xfgd42qkjjkvxzqmyl28u8csasqkd4a40
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsT2w4SCt2ZGdLYktHckMw
-            QVhza2tqU2M1Q3lsYnhld1dKcTdYUHcvSzFrCjMxT05yU01nUmFQK0FCUThUNDNN
-            V2EyTUhoVUNjNlNwTU9FeTlGRkxvVDgKLS0tIDBFYys1TmI0T0x0RnE2N3JCWWpq
-            VFVjMGUvRVBaY0JsR2lVcUFsdk4rYjQKEiiqEcTaQSVXSAm5c9uylaf2Tt/KJtPl
-            GDp+2YSBHHnVYjtYf7k9WqsIEe5/0AifDp3YA8jNhOXuZwZdvk+fLw==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-30T18:21:12Z"
-    mac: ENC[AES256_GCM,data:0DMB+ukujc6PMU45n1QJGryGie25Bj2hXmia69QgYZNk2vgfO+nYmWSpmqK4Z00xXNtbsgejfDto5mrzU/OJ4FF3eOfwWfdIwxQLEQKoPF5U3niON3YO8FEA+JIn+/fNGF3fY1AgBfhberST5ikKnmff1Nwe5GOwQHSB3LU+CZE=,iv:V89EFUby3bwsoZKpoJRmJS9E/UheMBkKDq7j40IzBTA=,tag:aOJnFFGIuzQ3T7YrIFiWtw==,type:str]
-    pgp:
-        - created_at: "2024-03-30T18:20:23Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4D5fSX77p80GYSAQdAnUVLGsgIKd3EtSAGTPyXqSlsz1T8RnDvAtBz/XaH0y0w
-            pkp84zTe85FRZDnTO8a44WkpNIrUih0CYQSPPCZqSi/qnIxPWgx67HTC1bPAO9Iw
-            1GgBCQIQNcrKr4YNKSP5XxJqMXOyZD7rZ4g02Xdw5XplZ/y34m9c83S44XRgHwg4
-            0obXI1UlsqyHf/ZnTM1pbXO/kdTdFomWvWbfbuKDgDvyiJJ18mJ48GOsv/SBBJjJ
-            3877O+Ia5I8Chg==
-            =q58P
-            -----END PGP MESSAGE-----
-          fp: 28D140BCA60B4FD1
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1

configurations/profile/home/browser.nix

@@ -1,25 +1,21 @@
 { config, lib, pkgs, materusArg, ... }:
 let
   cfg = config.materus.profile.browser;
-  osConfig = (if (builtins.hasAttr "osConfig" config._module.args) then config._module.args.osConfig else null);
 in
 {
 
   options = let mkBoolOpt = materusArg.pkgs.lib.mkBoolOpt; in {
-    materus.profile.browser.firefox.enable = mkBoolOpt false "Enable Firefox with materus cfg";
+    materus.profile.browser.firefox.enable = mkBoolOpt config.materus.profile.enableDesktop "Enable Firefox with materus cfg";
-    materus.profile.browser.vivaldi.enable = mkBoolOpt false "Enable Vivaldi with materus cfg";
+    materus.profile.browser.vivaldi.enable = mkBoolOpt config.materus.profile.enableDesktop "Enable Vivaldi with materus cfg";
     materus.profile.browser.brave.enable = mkBoolOpt false "Enable Brave with materus cfg";
 
   };
   #TODO: Make some config
-  config = lib.mkMerge [{
+  config.home.packages = [
-      home.packages = [
     (lib.mkIf cfg.firefox.enable config.materus.profile.packages.firefox)
     (lib.mkIf cfg.vivaldi.enable pkgs.vivaldi)
     (lib.mkIf cfg.brave.enable pkgs.brave)
   ];
-  }
-  ];
 
 
 }

configurations/profile/os/default.nix

@@ -6,6 +6,57 @@
 
     ./games
   ];
+  /*
+    users.users.nixos-rebuild = {
+    #isSystemUser = true;
+    isNormalUser = true;
+    group = "nixos-rebuild";
+    openssh.authorizedKeys.keys = [
+     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPEDY+H8Hc/RSLE064AAh8IojvqxPd8BE5gec2aOfYMh materus@podkos.pl"
+    ];
+    home = "/tmp/nixos-rebuild";
+    };
+    users.groups.nixos-rebuild = { };
+    security.sudo.extraRules = [
+    {
+      users = [ "nixos-rebuild" ];
+      commands = let path = "/run/current-system/sw/bin/"; in
+        [
+          {
+            command =
+              "${path}nixos-rebuild";
+            options = [ "NOPASSWD" ];
+          }
+          {
+            command =
+              "${path}nix-store";
+            options = [ "NOPASSWD" ];
+          }
+          {
+            command =
+              "${path}nix-env";
+            options = [ "NOPASSWD" ];
+          }
+          {
+            command =
+              "${path}nix-build";
+            options = [ "NOPASSWD" ];
+          }
+          {
+            command =
+              "${path}nix-instantiate";
+            options = [ "NOPASSWD" ];
+          }
+          {
+            command =
+              "${path}nix-channel";
+            options = [ "NOPASSWD" ];
+          }
+        ];
+
 
     }
+    ];
+  */
+}
  

configurations/profile/os/games/steam.nix

@@ -92,7 +92,10 @@ let
     then [ package ] ++ extraPackages
     else [ package32 ] ++ extraPackages32);
 
-    extraEnv = config.materus.profile.steam.extraEnv;
+    extraEnv = {
+      XDG_DATA_DIRS = "/usr/share:\${XDG_DATA_DIRS}";
+      OBS_VKCAPTURE = "1";
+    };
 
   };
 
@@ -109,18 +112,10 @@ in
     default = [ ];
     description = "Extra packages for steam";
   };
-  options.materus.profile.steam.extraEnv = lib.mkOption {
-    default = { };
-    description = "Extra Env for steam";
-  };
 
 
   config = lib.mkIf cfg.enable {
     hardware.steam-hardware.enable = lib.mkDefault true;
-    materus.profile.steam.extraEnv = {
-      XDG_DATA_DIRS = "/usr/share:\${XDG_DATA_DIRS}";
-      OBS_VKCAPTURE = "1";
-    };
     programs.steam = {
       enable = lib.mkDefault true;
       dedicatedServer.openFirewall = lib.mkDefault true;

configurations/shared/home/genHomes.nix

@@ -1,6 +1,6 @@
 { inputs, materusFlake, ... }:
 let
-  profiles = import (materusFlake.selfPath + "/configurations/profile");
+  profiles = import ../profile;
 
   hosts = builtins.attrNames materusFlake.nixosConfigurations;
   genHomes = username: