diff --git a/system/default.nix b/system/default.nix index b4efe41f..6e109117 100644 --- a/system/default.nix +++ b/system/default.nix @@ -93,7 +93,6 @@ }; networking = { inherit hostName; - networkmanager.enable = true; firewall.enable = true; nameservers = [ "9.9.9.9" ]; }; diff --git a/system/desktop.nix b/system/desktop.nix index f6643d8b..702a4fb8 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -2,6 +2,16 @@ { nixpkgs.config.chromium.commandLineArgs = "--password-store='gnome-libsecret' --enable-features=UseOzonePlatform --ozone-platform=wayland"; hardware.bluetooth.enable = true; + networking = { + networkmanager = { + enable = true; + wifi.backend = "iwd"; + }; + wireless.iwd = { + enable = true; + settings.Settings.AutoConnect = true; + }; + }; environment = { sessionVariables = { NIXOS_OZONE_WL = "1"; @@ -18,9 +28,11 @@ libsecret libnotify xdg-utils - wl-clipboard hunspell hunspellDicts.en_GB-large + wl-clipboard + iwgtk + overskride grim slurp swappy @@ -28,6 +40,7 @@ libreoffice evince image-roll + imagemagick clapper g4music ffmpeg diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix index 6fff5a6a..4d27a201 100644 --- a/system/home/hyprland.nix +++ b/system/home/hyprland.nix @@ -231,9 +231,9 @@ "dimaround, org.kde.polkit-kde-authentication-agent-1|Pinentry|pinentry-qt|gcr-prompter" "stayfocused, org.kde.polkit-kde-authentication-agent-1|Pinentry|pinentry-qt|gcr-prompter" # Network and Bluetooth control panels - "float, pavucontrol|.blueman-manager-wrapped|nm-connection-editor" - "size 800 600, pavucontrol|.blueman-manager-wrapped|nm-connection-editor" - "move onscreen 100%-820 50,pavucontrol|.blueman-manager-wrapped|nm-connection-editor" + "float, pavucontrol|org.twosheds.iwgtk|overskride|io.github.kaii_lb.Overskride" + "size 800 600, pavucontrol|org.twosheds.iwgtk|overskride|io.github.kaii_lb.Overskride" + "move onscreen 100%-820 50,pavucontrol|org.twosheds.iwgtk|overskride|io.github.kaii_lb.Overskride" # File browser and picker dialog "float, org.gnome.Nautilus|xdg-desktop-portal-gtk" "size 1200 900, org.gnome.Nautilus|xdg-desktop-portal-gtk" diff --git a/system/home/waybar.nix b/system/home/waybar.nix index 075464ba..4b1aacd0 100644 --- a/system/home/waybar.nix +++ b/system/home/waybar.nix @@ -164,7 +164,7 @@ format-linked = "󰈂 "; format-disconnected = "󰈂 "; tooltip-format = "{essid} ({signalStrength}%)"; - on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; + on-click = "${pkgs.iwgtk}/bin/iwgtk"; }; bluetooth = { format = "󰂯"; @@ -173,7 +173,7 @@ format-on = "󰂯"; format-connected = "󰂱"; tooltip-format = "{status} | {device_alias}"; - on-click = "${pkgs.blueman}/bin/blueman-manager"; + on-click = "${pkgs.overskride}/bin/overskride"; }; "clock#calendar" = let diff --git a/system/laptop.nix b/system/laptop.nix index c216102b..3e5f5c50 100644 --- a/system/laptop.nix +++ b/system/laptop.nix @@ -3,6 +3,7 @@ imports = [ ./desktop.nix ]; environment.systemPackages = [ pkgs.acpi ]; powerManagement.enable = true; + networking.networkmanager.wifi.powersave = true; services.auto-cpufreq = { enable = true; settings = {