diff --git a/.gitignore b/.gitignore index 0d3fe25..10ee45c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ result .direnv .pre-commit-config.yaml +.worktrees/ diff --git a/freya/configuration.nix b/freya/configuration.nix index 142f461..6d9451e 100644 --- a/freya/configuration.nix +++ b/freya/configuration.nix @@ -8,28 +8,17 @@ }; hardware = { - bluetooth = { - enable = true; - package = pkgs.bluezFull; - }; - opengl = { - enable = true; - driSupport = true; - }; + bluetooth = { enable = true; package = pkgs.bluezFull; }; + opengl = { enable = true; driSupport = true; }; raspberry-pi."4" = { audio.enable = true; - fkms-3d.enable = true; + fkms-3d.enable = true; # GPU }; }; i18n.defaultLocale = "it_IT.UTF-8"; - networking = { - hostName = "freya"; - # interfaces = { eno1.useDHCP = true; wlp7s0.useDHCP = true; }; - networkmanager.enable = true; - useDHCP = false; - }; + networking.hostName = "freya"; programs = { dconf.enable = true; @@ -61,10 +50,7 @@ openssh = { enable = true; openFirewall = true; }; xserver = { enable = true; - desktopManager.retroarch = { - enable = true; - package = pkgs.retroarchFull; - }; + desktopManager.retroarch = { enable = true; package = pkgs.retroarchFull; }; }; }; diff --git a/freya/hardware-configuration.nix b/freya/hardware-configuration.nix index 909421d..a8549f0 100644 --- a/freya/hardware-configuration.nix +++ b/freya/hardware-configuration.nix @@ -20,7 +20,8 @@ # (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.networkmanager.enable = lib.mkDefault true; + # networking.useDHCP = lib.mkDefault true; # networking.interfaces.eth0.useDHCP = lib.mkDefault true; # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; # networking.interfaces.ztmjfdwjkp.useDHCP = lib.mkDefault true;