diff --git a/base/apollo/configuration.nix b/base/apollo/configuration.nix index 0215b17..7e7732e 100644 --- a/base/apollo/configuration.nix +++ b/base/apollo/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = @@ -15,6 +15,8 @@ enable = true; useRoutingFeatures = "both"; }; + programs.adb.enable = true; + programs.envision.enable = true; powerManagement.cpuFreqGovernor = "performance"; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -36,6 +38,10 @@ systemd.packages = with pkgs; [lact]; systemd.services.lactd.wantedBy = ["multi-user.target"]; networking.hostName = "apollo"; # Define your hostname. + services.udev.extraRules = '' + # Qualcomm EDL +SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666", GROUP="plugdev" +''; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Configure network proxy if necessary @@ -83,6 +89,14 @@ user = "greeter"; }; }; + xdg.portal.config.common.default = "*"; + xdg.portal.wlr.enable = true; + xdg.portal.wlr.settings.screencast = { + chooser_type = "simple"; + chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or"; + exec_before = "${lib.getExe' pkgs.swaynotificationcenter "swaync-client"} --dnd-on --skip-wait"; + exec_after = "${lib.getExe' pkgs.swaynotificationcenter "swaync-client"} --dnd-off --skip-wait"; + }; systemd.services.greetd.serviceConfig = { Type = "idle"; StandardInput = "tty"; @@ -114,6 +128,8 @@ }; }; }) + + ]; # Enable sound with pipewire. services.pulseaudio.enable = false; @@ -138,7 +154,7 @@ users.users.maya = { isNormalUser = true; description = "Maya"; - extraGroups = [ "networkmanager" "wheel" "libvirtd" "camera" "input"]; + extraGroups = [ "networkmanager" "wheel" "libvirtd" "camera" "input" "adbusers"]; packages = with pkgs; [ # thunderbird ]; diff --git a/base/apollo/hardware-configuration.nix b/base/apollo/hardware-configuration.nix index 3ec289a..075f0c7 100644 --- a/base/apollo/hardware-configuration.nix +++ b/base/apollo/hardware-configuration.nix @@ -24,7 +24,7 @@ boot.kernelModules = [ "kvm-intel" "vfio_virqfd" "vhost-net" "v4l2loopback" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; boot.extraModprobeConfig = '' - options vfio-pci ids=10de:2184,10de:1aeb,10de:1aec,10de:1aed,1b21:1242 + options vfio-pci ids=1002:6fdf,1002:aaf0,1b21:1242 options v4l2loopback devices=2 video_nr=1,2 card_label="OBS Cam, Virt Cam" exclusive_caps=1 ''; boot.blacklistedKernelModules = ["nouveau"]; diff --git a/base/overrides.nix b/base/overrides.nix index 6184bee..a14891e 100644 --- a/base/overrides.nix +++ b/base/overrides.nix @@ -1,6 +1,8 @@ {pkgs, ...}:{ environment.systemPackages = with pkgs; [ - + (envision.overrideAttrs { + buildInputs = [pkgs.mesa]; + }) (lutris.override { extraPkgs = pkgs: [ wine diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 82890ab..f6316f9 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -22,7 +22,11 @@ }; lsp = { enable = true; - + servers.cssls.enable = true; + servers.pylsp.enable = true; + servers.html = { + enable = true; + }; servers.nixd = { enable = true; extraOptions.offset_encoding = "utf-8"; diff --git a/home/packages.nix b/home/packages.nix index 22267ad..c22531e 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -2,8 +2,11 @@ home.packages = with pkgs; [ prismlauncher libgpod + ark + qv4l2 nextcloud-client blender-hip + cinny-desktop libimobiledevice mpc strawberry diff --git a/home/sway.nix b/home/sway.nix index 720ac7a..3fc5835 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -7,6 +7,10 @@ config = { modifier = "Mod4"; terminal = "foot"; + output = { + "Dell Inc. DELL P2411H MGMHG1681VAU".pos = "0 1050"; + "Samsung Electric Company SyncMaster HMDQ202016".pos = "75 0"; + }; #output = { #eDP-1.pos = "0 1362"; # "Hewlett Packard HP W2371d 6CM2220CSQ".pos = "1366 1050";