thelio76: network

config/hosts/nixos76/default.nix

@@ -9,24 +9,7 @@
       ./hardware-configuration.nix
     ];
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-25.9.0"
-  ];
-
-
-  hardware.system76.enableAll = true;
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   networking.hostName = "nixos76"; # Define your hostname.
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
 
   # What was this for? maybe wireguard?
   networking.firewall = {
@@ -71,21 +54,6 @@
     };
   };
 
-  # Set your time zone.
-  time.timeZone = "America/New_York";
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  #   useXkbConfig = true; # use xkbOptions in tty.
-  # };
-
   # Add LUKS external drive mount
   environment.etc.crypttab = {
     enable = true;
@@ -112,42 +80,42 @@
 
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
+  # services.xserver.enable = true;
   services.xserver.desktopManager.xfce.enable = true;
   services.displayManager.defaultSession = "xfce";
 
-  hardware.graphics.enable = true;
+  # hardware.graphics.enable = true;
-  hardware.graphics.extraPackages = [
+  # hardware.graphics.extraPackages = [
-    pkgs.intel-media-driver
+  #   pkgs.intel-media-driver
-  ];
+  # ];
-  hardware.graphics.extraPackages32 = [
+  # hardware.graphics.extraPackages32 = [
-    pkgs.intel-media-driver
+  #   pkgs.intel-media-driver
-    pkgs.pkgsi686Linux.libva
+  #   pkgs.pkgsi686Linux.libva
-  ];
+  # ];
 
   # Configure keymap in X11
   # services.xserver.layout = "us";
   # services.xserver.xkbOptions = "eurosign:e,caps:escape";
 
   # Enable blueooth
-  hardware.bluetooth.enable = true;
+  # hardware.bluetooth.enable = true;
 
   # Enable sound.
   # sound.enable = true;
-  hardware.pulseaudio = {
+  # hardware.pulseaudio = {
-    enable = true;
+  #   enable = true;
-    package = pkgs.pulseaudioFull;
+  #   package = pkgs.pulseaudioFull;
-    support32Bit = true;
+  #   support32Bit = true;
-  };
+  # };
 
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.alex = {
+  # users.users.alex = {
-    isNormalUser = true;
+  #   isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
+  #   extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
-  };
+  # };
 
   fileSystems."/home/alex/Documents" = {
     device = "/media/external/Documents";
@@ -235,38 +203,12 @@
 
   services.blueman.enable = true;
 
-  services.printing.enable = true;
-
   services.avahi = {
     enable = true;
     nssmdns4 = true;
     openFirewall = true;
   };
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It's perfectly fine and recommended to leave

config/hosts/nixos76/hardware-configuration.nix

@@ -33,7 +33,7 @@
   # (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.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
+  # networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp58s0f1.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp59s0.useDHCP = lib.mkDefault true;
 

config/modules/system76-pc.nix

@@ -54,10 +54,22 @@
     variant = "";
   };
 
+  # Hardware
+  hardware.graphics.enable = true;
+  hardware.graphics.extraPackages = [
+    pkgs.intel-media-driver
+  ];
+  hardware.graphics.extraPackages32 = [
+    pkgs.intel-media-driver
+    pkgs.pkgsi686Linux.libva
+  ];
+
+  hardware.pulseaudio.enable = false;
+  hardware.bluetooth.enable = true;
+
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
-  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;