diff --git a/systems/i686-linux/Rubtrm/default.nix b/systems/i686-linux/Rubtrm/default.nix index 20695ca..05515b4 100644 --- a/systems/i686-linux/Rubtrm/default.nix +++ b/systems/i686-linux/Rubtrm/default.nix @@ -20,7 +20,8 @@ "cache.game01.kb-one.de:XcqI+uobV7EoTKuRmnzYup/+oSfn8uLwnsiQFp8dk/g=" ]; }; - nixpkgs.config.allowUnsupportedSystem = true; + # nixpkgs.config.allowUnsupportedSystem = true; + nixpkgs.config.allowUnfree = true; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; @@ -43,10 +44,15 @@ # Enable the X11 windowing system. services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. + services.xserver.videoDrivers = [ "intel" "modesetting" "fbdev" "vesa" "intel_drv" "intel-media-sdk" ]; + # Enable Desktop Environment. services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; + # services.displayManager.sddm.wayland.enable = true; + # services.xserver.displayManager.lightdm.enable = true; + # services.desktopManager.plasma6.enable = true; + # services.xserver.desktopManager.plasma5.enable = true; + services.xserver.desktopManager.xfce.enable = true; + # services.xserver.desktopManager.lxqt.enable = true; # Configure keymap in X11 services.xserver.xkb = { @@ -65,15 +71,16 @@ }; # Enable touchpad support (enabled default in most desktopManager). - services.xserver.libinput.enable = true; + services.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.kb = { isNormalUser = true; description = "kB"; - extraGroups = [ "wheel" "networkmanager" ]; + extraGroups = [ "wheel" "networkmanager" "input" ]; packages = with pkgs; [ tree + internal.numen ]; }; @@ -95,8 +102,6 @@ # enableSSHSupport = true; # }; - # List services that you want to enable: - # Enable the OpenSSH daemon. # services.openssh.enable = true; @@ -104,9 +109,13 @@ # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; + # Needed for dotool to act on numen voice commands + services.udev.extraRules = '' + KERNEL=="uinput", GROUP="input", MODE="0660", OPTIONS+="static_node=uinput" + ''; + + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/systems/i686-linux/Rubtrm/hardware.nix b/systems/i686-linux/Rubtrm/hardware.nix index 0330d4d..23d04fb 100644 --- a/systems/i686-linux/Rubtrm/hardware.nix +++ b/systems/i686-linux/Rubtrm/hardware.nix @@ -13,6 +13,7 @@ boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/NIXOS_LUKS"; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; + boot.kernelParams = [ "i915.force_probe=27ae" ]; fileSystems."/" = { device = "/dev/disk/by-label/NIXOS_ROOT"; @@ -35,7 +36,9 @@ # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "i686-linux"; - networking.enableIntel3945ABGFirmware = true; + # networking.enableIntel3945ABGFirmware = true; + hardware.graphics.extraPackages = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk pkgs.xorg.xf86videointel ]; + hardware.graphics.extraPackages32 = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk pkgs.xorg.xf86videointel ]; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # hardware.enableAllFirmware = true; + hardware.enableAllFirmware = true; }