From b12efe9a539ace55ffda23c49b8e41ae39c72d60 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sat, 10 Jul 2021 15:26:29 -0600
Subject: [PATCH] [NixOS] Use base.nix in raspberrypi

---
 nixos/machines/biskcomp.nix |  1 +
 nixos/raspberry-pi.nix      | 35 ++---------------------------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/nixos/machines/biskcomp.nix b/nixos/machines/biskcomp.nix
index 5489e5e5..5e175d58 100644
--- a/nixos/machines/biskcomp.nix
+++ b/nixos/machines/biskcomp.nix
@@ -4,4 +4,5 @@
   ];
 
   networking.hostName = "biskcomp";
+  hardware.video.hidpi.enable = true;
 }
diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix
index 41225d21..253948ab 100644
--- a/nixos/raspberry-pi.nix
+++ b/nixos/raspberry-pi.nix
@@ -3,13 +3,10 @@
 {
   imports = [
     <nixos-hardware/raspberry-pi/4>
+    ./base.nix
     ./essential-packages.nix
   ];
 
-  nixpkgs.overlays = [
-    (import ./overlays.nix)
-  ];
-
   hardware.raspberry-pi."4".fkms-3d.enable = true;
 
   boot = {
@@ -29,22 +26,12 @@
     };
   };
 
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
-
   hardware.enableRedistributableFirmware = true;
 
-  networking = {
-    networkmanager.enable = true;
-  };
-
-  # networking.hostName = "nixos"; # Define your hostname.
-
   networking.useDHCP = false;
   networking.interfaces.eth0.useDHCP = true;
   networking.interfaces.wlan0.useDHCP = true;
 
-
   # Enable the X11 windowing system.
   services.xserver = {
     exportConfiguration = true;
@@ -53,7 +40,7 @@
     desktopManager = {
       plasma5.enable = true;
     };
-    displayManager.lightdm.enable = true;
+    displayManager.sddm.enable = true;
   };
 
   powerManagement.cpuFreqGovernor = "ondemand";
@@ -64,11 +51,6 @@
     options = [ "noatime" ];
   };
 
-  hardware.video.hidpi.enable = true;
-
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.imalison = {
     isNormalUser = true;
@@ -79,14 +61,6 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     raspberrypi-eeprom
-    vlc
-    yubikey-manager
-    networkmanagerapplet
-    ncdu
-    jq
-    rcm
-    ic-keysmith
-    quill
   ];
 
   services.openssh.enable = true;
@@ -101,10 +75,6 @@
     };
   };
 
-  programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
-  services.pcscd.enable = true;
-  security.sudo.wheelNeedsPassword = false;
-
   nix = {
     autoOptimiseStore = true;
     gc = {
@@ -115,5 +85,4 @@
   };
 
   system.stateVersion = "21.05"; # Did you read the comment?
-  nix.trustedUsers = ["imalison" "kat"];
 }