diff --git a/base/absolution/configuration.nix b/base/absolution/configuration.nix index 4ec1ece..17bc661 100644 --- a/base/absolution/configuration.nix +++ b/base/absolution/configuration.nix @@ -60,7 +60,7 @@ adb.enable = true; flashrom.enable = true; nix-ld.enable = true; - nix-ld.libraries = with pkgs; [xorg.libxcb libao xorg.libX11 libusb1 cargo rustc pkg-config cacert libpulseaudio libsecret file]; + nix-ld.libraries = with pkgs; [xorg.libxcb libao xorg.libX11 libusb1 cargo rustc pkg-config cacert]; }; services.journald.extraConfig = '' @@ -75,16 +75,9 @@ }; networking.firewall.checkReversePath = "loose"; - services.resolved.enable = true; - - systemd.network.enable = true; - - systemd.network.networks."enp0s25" = { - matchConfig.Name = "enp0s25"; - networkConfig.DHCP = "yes"; - }; - + networking.useNetworkd = true; + networking.interfaces.enp0s31f6.useDHCP = true; networking.useDHCP = false; services.networkd-dispatcher = { @@ -92,7 +85,7 @@ rules."50-tailscale" = { onState = ["routable"]; script = '' - "${pkgs.ethtool} NETDEV=$(ip -o route get 8.8.8.8 | cut -f 5 -d " ") | -K enp0s25 rx-udp-gro-forwarding on rx-gro-list off" + "${pkgs.ethtool} NETDEV=$(ip -o route get 8.8.8.8 | cut -f 5 -d " ") | -K enp0s31f6 rx-udp-gro-forwarding on rx-gro-list off" ''; }; }; @@ -153,10 +146,10 @@ hardware.bluetooth.enable = true; services.blueman.enable = true; - #networking.networkmanager = { - # enable = true; - # wifi.backend = "iwd"; - #}; + networking.networkmanager = { + enable = true; + wifi.backend = "iwd"; + }; # Set your time zone. time.timeZone = "Europe/London"; @@ -278,8 +271,6 @@ environment.systemPackages = with pkgs; [ hyprlock - file - libsecret wget jmtpfs nautilus diff --git a/home/default.nix b/home/default.nix index 8e1ce54..5871abc 100644 --- a/home/default.nix +++ b/home/default.nix @@ -30,7 +30,6 @@ settings.main.font = (if vars.user == "alyx" then "monospace:size=14" else "monospace:size=10"); settings.colors.alpha = "0.9"; }; - programs.ncmpcpp = { enable = (vars.class != "handheld"); settings = { diff --git a/home/packages.nix b/home/packages.nix index 2b0ad55..357ce89 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -1,13 +1,10 @@ {pkgs, vars, ...}:{ home.packages = with pkgs; [ - abaddon blender-hip brightnessctl bs-manager clonehero comma - discordo - dissent emacs fastfetch librewolf @@ -40,7 +37,12 @@ transmission_4-qt udiskie v4l-utils + (discord-canary.override { + withVencord = true; + withOpenASAR = true; + }) vesktop + legcord vlc wl-clipboard wlr-randr