diff --git a/common/hardware/amd-gpu.nix b/common/hardware/amd-gpu.nix index 3fc58b1..f40facb 100644 --- a/common/hardware/amd-gpu.nix +++ b/common/hardware/amd-gpu.nix @@ -6,17 +6,19 @@ kernelParams = ["radeon.cik_support=0" "amdgpu.cik_support=1"]; }; - hardware.opengl = { - enable = true; + hardware.graphics.enable = true; + hardware.opengl = { ## radv: an open-source Vulkan driver from freedesktop # driSupport = true; - driSupport32Bit = true; + # driSupport32Bit = true; ## amdvlk: an open-source Vulkan driver from AMD extraPackages = [pkgs.amdvlk]; extraPackages32 = [pkgs.driversi686Linux.amdvlk]; }; + hardware.graphics.enable32Bit = true; + services.xserver.videoDrivers = ["amdgpu"]; } diff --git a/common/hardware/nvidia-gpu.nix b/common/hardware/nvidia-gpu.nix index 41da71c..2f0bc17 100644 --- a/common/hardware/nvidia-gpu.nix +++ b/common/hardware/nvidia-gpu.nix @@ -4,11 +4,8 @@ ... }: { # Enable OpenGL - hardware.opengl = { - enable = true; - # driSupport = true; - driSupport32Bit = true; - }; + hardware.graphics.enable = true; + hardware.graphics.enable32Bit = true; # Load nvidia driver for Xorg and Wayland services.xserver.videoDrivers = ["nvidia"]; diff --git a/common/services/usbguard.nix b/common/services/usbguard.nix index 1a2eece..3852b57 100644 --- a/common/services/usbguard.nix +++ b/common/services/usbguard.nix @@ -40,6 +40,7 @@ allow id 067b:2303 serial "" name "USB-Serial Controller D" allow id 1050:0407 serial "" name "YubiKey OTP+FIDO+CCID" + allow id 0bda:2838 serial "00000001" name "Blog V4" ''; }; } diff --git a/flake.nix b/flake.nix index ef0edc3..0007c27 100644 --- a/flake.nix +++ b/flake.nix @@ -132,13 +132,13 @@ ]; }; - vulpecula = stable.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = [ - ./hosts/vulpecula/configuration.nix - ]; - }; + # vulpecula = stable.lib.nixosSystem { + # system = "x86_64-linux"; + # specialArgs = {inherit inputs outputs;}; + # modules = [ + # ./hosts/vulpecula/configuration.nix + # ]; + # }; vulpecula-vps = stable.lib.nixosSystem { system = "x86_64-linux"; diff --git a/home/tasia-but-old-username/home.nix b/home/tasia-but-old-username/home.nix index acaa02d..65f7867 100644 --- a/home/tasia-but-old-username/home.nix +++ b/home/tasia-but-old-username/home.nix @@ -50,7 +50,7 @@ #swig picard kleopatra - qbittorrent + # qbittorrent tor-browser protonvpn-gui # radicle-cli diff --git a/home/tasia/home.nix b/home/tasia/home.nix index 2628247..e943510 100644 --- a/home/tasia/home.nix +++ b/home/tasia/home.nix @@ -64,7 +64,7 @@ simplex-chat-desktop picard kleopatra - qbittorrent + # qbittorrent # tor-browser ssb-patchwork pixelorama diff --git a/hosts/yaseen/configuration.nix b/hosts/yaseen/configuration.nix index b9401d5..702eda2 100644 --- a/hosts/yaseen/configuration.nix +++ b/hosts/yaseen/configuration.nix @@ -18,11 +18,11 @@ in { ../../common/locales/fr-keymap.nix # Hardware - ../../common/hardware/intel-cpu.nix - ../../common/hardware/tpm2.nix + #../../common/hardware/intel-cpu.nix + # ../../common/hardware/tpm2.nix ../../common/hardware/wireless.nix - # ../../common/hardware/nvidia-gpu.nix - # ../../common/hardware/nvidia-gpu-offload.nix + # ../../common/hardware/nvidia-gpu.nix + #../../common/hardware/nvidia-gpu-offload.nix ../../common/hardware/ssd.nix ../../common/hardware/btrfs.nix @@ -36,7 +36,7 @@ in { # Services # ../../common/services/auditd.nix - ../../common/services/nix-gc.nix + # ../../common/services/nix-gc.nix ../../common/services/opensnitch.nix # ../../common/services/adguardhome.nix ../../common/services/syncthing.nix @@ -49,24 +49,24 @@ in { inputs.agenix.nixosModules.default ../../common/components/wifi-secrets.nix - inputs.thymis.nixosModules.thymis-controller + # inputs.thymis.nixosModules.thymis-controller # Personal modules # ../../modules/nixos/tildefriends.nix ./yubikey.nix ]; # RGB Keyboard backight - boot.extraModulePackages = with config.boot.kernelPackages; [hid-ite8291r3]; + #boot.extraModulePackages = with config.boot.kernelPackages; [hid-ite8291r3]; - services.udev.extraRules = '' - ACTION=="add", SUBSYSTEM=="leds", DEVPATH=="*:kbd_backlight", TEST=="color", ATTR{color}="fc4f05" - ''; + #services.udev.extraRules = '' + # ACTION=="add", SUBSYSTEM=="leds", DEVPATH=="*:kbd_backlight", TEST=="color", ATTR{color}="fc4f05" + #''; # Nvidia GPU - hardware.nvidia.prime = { - intelBusId = "PCI:1:0:0"; - nvidiaBusId = "PCI:0:2:0"; - }; + #hardware.nvidia.prime = { + # intelBusId = "PCI:1:0:0"; + # nvidiaBusId = "PCI:0:2:0"; + #}; networking = { hostName = "yaseen"; @@ -102,7 +102,7 @@ in { }; # Needed to build enry - boot.binfmt.emulatedSystems = ["aarch64-linux"]; + #boot.binfmt.emulatedSystems = ["aarch64-linux"]; environment.systemPackages = with pkgs; [ inputs.tildefriends.packages.${system}.default @@ -131,30 +131,38 @@ in { yubikey-manager inputs.agenix.packages.x86_64-linux.default + + sdrpp + gqrx + rtl-sdr + grim # screenshot functionality + slurp # screenshot functionality + wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout + mako # notification system developed by swaywm maintainer ]; + # Enable the gnome-keyring secrets vault. + # Will be exposed through DBus to programs willing to store secrets. + services.gnome.gnome-keyring.enable = true; + + # enable sway window manager + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; + }; + +hardware.rtl-sdr.enable = true; +users.users.tasia.extraGroups = [ "plugdev" ]; + + boot.kernelParams = [ "modprobe.blacklist=dvb_usb_rtl28xxu" ]; # blacklist this module + +services.udev.packages = [ pkgs.rtl-sdr ]; + fonts.packages = with pkgs; [ (nerdfonts.override {fonts = ["CascadiaCode"];}) ]; - programs.adb.enable = true; - - # services.ddclient = { - # enable = true; - # # usev6=if, if=wlp5s0 - # configFile = pkgs.writeText "ddclient-config" '' - # usev6=webv6, web=dns.glauca.digital/checkip - - # ipv6=yes - # ipv4=no - - # protocol=dyndns2 - # server=dns.glauca.digital - # login= - # password= - # hello.vulpecula.zone - # ''; - # }; + # programs.adb.enable = true; # services.nginx.enable = true; # services.nginx.virtualHosts."test.vulpecula.zone" = { @@ -207,13 +215,11 @@ in { # config.adminpassFile = "/etc/nextcloud-admin-pass"; # }; - services.rustdesk-server = { - enable = true; - openFirewall = true; - relayIP = "100.91.88.2"; - }; - - # virtualisation.waydroid.enable = true; +# services.rustdesk-server = { +# enable = true; +# openFirewall = true; + # relayIP = "100.91.88.2"; + # }; # users.users.lol = { # isNormalUser = true;