From 01a48ac9563e7ccc1a08885fb50d013f77882bd7 Mon Sep 17 00:00:00 2001
From: Haak Saxberg <haak.erling@gmail.com>
Date: Mon, 4 Oct 2021 21:35:35 -0700
Subject: [PATCH] Update for framework laptop

---
 nix/configuration.nix | 65 ++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 35 deletions(-)

diff --git a/nix/configuration.nix b/nix/configuration.nix
index 34212ee..165cff3 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -8,17 +8,20 @@
   imports =
     [ # Include the results of the hardware scan.
       /etc/nixos/hardware-configuration.nix
-      /etc/nixos/glibc-locale-paths.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
+  # do not fill the bootloader space with generations until it pops; only keep
+  # a reasonable number around.
   boot.loader.systemd-boot.configurationLimit = 42;
+  # WiFi support requires kernel 5.13
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.loader.efi.canTouchEfiVariables = true;
 
   hardware.bluetooth.enable = true;
+  networking.hostName = "framework"; # Define your hostname.
   networking.networkmanager.enable = true;
-  networking.hostName = "athena"; # Define your hostname.
   # Create entries for /etc/wpa_supplicant.conf by running `wpa_passphrase SSID PASSWORD`
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
@@ -26,24 +29,21 @@
   # Per-interface useDHCP will be mandatory in the future, so this generated config
   # replicates the default behaviour.
   networking.useDHCP = false;
-  networking.interfaces.wlp58s0.useDHCP = true;
+  networking.interfaces.wlp170s0.useDHCP = true;
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-  console = {
-    font = "Fira Code";
-    keyMap = "us";
-  };
-
   # Select internationalisation properties.
   i18n = {
     defaultLocale = "en_US.UTF-8";
   };
-  # run the following command to swap escape and caps-lock keys, like a
-  # civilized person:
-  # setxkbmap -option caps:swapescape
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "us";
+  };
+
 
   # Set your time zone.
   time.timeZone = "America/Los_Angeles";
@@ -56,32 +56,27 @@
     firefox
     inkscape
     p7zip
-    plasma-browser-integration
     slack
-    vim
+    neovim
     vlc
     wget
     xclip
     zathura
     zsh
+
+    gnome.gnome-tweaks
+    gnomeExtensions.paperwm
   ];
 
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
-
-  fonts.fonts = with pkgs; [ fira-code ];
 
   # Open ports in the firewall.
   networking.firewall = {
     allowedTCPPorts = [
       631 # CUPs port for printing
-      6881 # port for torrenting
-      8010 # port for VLC to chromecast
     ];
     allowedUDPPorts = [
       631
-      6881
-      8010
     ];
   };
   # Or disable the firewall altogether.
@@ -95,16 +90,12 @@
 
   # List services that you want to enable:
 
+  # Enable fingerprint reading
+  services.fprintd.enable = true;
+
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
 
-  # Torrenting!
-  services.deluge = {
-    enable = true;
-    declarative = true;
-    authFile = /home/haak/dotfiles/secrets/deluge_auth;
-    openFirewall = true;
-  };
   # Enable CUPS to print documents.
   services.printing = {
     enable = true;
@@ -124,18 +115,22 @@
     package = pkgs.pulseaudioFull;
   };
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-  services.xserver.layout = "us";
-  services.xserver.xkbOptions = "caps:swapescape";
 
   # Enable touchpad support.
   services.xserver.libinput.enable = true;
 
-  # Enable the KDE Desktop Environment.
   services.xserver = {
-    displayManager.sddm.enable = true;
-    desktopManager.plasma5.enable = true;
+    # Enable the X11 windowing system.
+    enable = true;
+
+    # Enable the GNOME Desktop Environment.
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+
+    layout = "us";
+    # run the following command to swap escape and caps-lock keys, like a
+    # civilized person:
+    xkbOptions = "caps:swapescape";
   };
 
   services.syncthing = {
@@ -166,7 +161,7 @@
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you
   # should.
-  system.stateVersion = "20.03"; # Did you read the comment?
+  system.stateVersion = "21.05"; # Did you read the comment?
   system.autoUpgrade.enable = true;
 }