From d35120da8bf4981266608ed67c864d2e6e141cb2 Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Sat, 11 Nov 2023 09:06:28 +0100 Subject: [PATCH] feat: use NetworkManager on desktop --- hosts/configuration.nix | 7 ++++--- hosts/desktop-clotho/hardware-configuration.nix | 7 ------- hosts/laptop-iapetus/default.nix | 1 - 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 3ea3f1d..3fcb67b 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -33,12 +33,13 @@ programs.zsh.enable = true; # has to be here to set shell to zsh # zsh is configured at home-manager level afterwards - security.sudo.wheelNeedsPassword = true; - - programs.dconf.enable = true; + networking.networkmanager.enable = true; + programs.nm-applet.enable = true; programs.command-not-found.enable = false; + security.sudo.wheelNeedsPassword = true; + programs.dconf.enable = true; services.udisks2.enable = true; time.timeZone = "Europe/Prague"; # Time zone and internationalisation diff --git a/hosts/desktop-clotho/hardware-configuration.nix b/hosts/desktop-clotho/hardware-configuration.nix index 1aa5e3c..274d5a3 100644 --- a/hosts/desktop-clotho/hardware-configuration.nix +++ b/hosts/desktop-clotho/hardware-configuration.nix @@ -39,14 +39,7 @@ [ { device = "/dev/disk/by-label/swap"; } ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp24s0.useDHCP = lib.mkDefault true; - # networking.interfaces.enp3s0f0u1u3u1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/laptop-iapetus/default.nix b/hosts/laptop-iapetus/default.nix index 8e76488..b887e36 100644 --- a/hosts/laptop-iapetus/default.nix +++ b/hosts/laptop-iapetus/default.nix @@ -61,7 +61,6 @@ ]; }; - networking.networkmanager.enable = true; hardware = { # No xbacklight, this is the alterantive brillo.enable = true; -- 2.48.1