From b771e42ac7d16a0ce4b50c6db65e0415340c0686 Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felix@albrigtsen.it>
Date: Mon, 15 Jan 2024 10:06:10 +0100
Subject: [PATCH] edison: various changes

---
 base.nix                                |  8 +++++---
 hosts/edison/configuration.nix          | 10 ++++++++--
 hosts/edison/desktop.nix                |  3 +++
 hosts/edison/hardware-configuration.nix |  7 ++++++-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/base.nix b/base.nix
index 245406c..a25d5c6 100644
--- a/base.nix
+++ b/base.nix
@@ -42,13 +42,16 @@
   environment.systemPackages = with pkgs; [
     bat
     bottom
+    eza
     git
     gnugrep
     gnutar
+    neofetch
+    python3
     ripgrep
     rsync
-    tree
-    eza
+    screen
+    unzip
     wget
   ];
 
@@ -62,7 +65,6 @@
 
     extraConfig = ''
       AllowTcpForwarding yes
-      X11Forwarding no
       AllowAgentForwarding yes
       AuthenticationMethods publickey
     '';
diff --git a/hosts/edison/configuration.nix b/hosts/edison/configuration.nix
index 6d89efd..18be10e 100644
--- a/hosts/edison/configuration.nix
+++ b/hosts/edison/configuration.nix
@@ -15,8 +15,12 @@
     hostName = "edison";
     defaultGateway = "192.168.10.1";
 
-    # Networking / Wi-Fi is configured with NM for now. TODO
-    networkmanager.enable = true;
+    interfaces.enp4s0.useDHCP = false;
+    interfaces.enp4s0.ipv4.addresses = [
+      { address = "192.168.10.170"; prefixLength = 24; }
+    ];
+
+    hostId = "8e84b281";
   };
 
   console.keyMap = "us";
@@ -26,6 +30,8 @@
   environment.variables = { EDITOR = "vim"; };
   environment.systemPackages = with pkgs; [
     pavucontrol
+    gparted
+    unstable.hydrus
   ];
 
   programs.steam.enable = true;
diff --git a/hosts/edison/desktop.nix b/hosts/edison/desktop.nix
index cee034f..534eeeb 100644
--- a/hosts/edison/desktop.nix
+++ b/hosts/edison/desktop.nix
@@ -8,6 +8,8 @@
     xkbVariant = "intl";
   };
 
+  services.openssh.settings.X11Forwarding = true;
+
   environment.systemPackages = with pkgs; [
     xfce.xfce4-pulseaudio-plugin
   ];
@@ -46,6 +48,7 @@
     openFirewall = true;
   };
 
+  security.polkit.enable = true;
   services.flatpak.enable = true;
   users.users."felixalb".packages = [ pkgs.flatpak ];
   xdg.portal = {
diff --git a/hosts/edison/hardware-configuration.nix b/hosts/edison/hardware-configuration.nix
index 3302c68..f2fd0c5 100644
--- a/hosts/edison/hardware-configuration.nix
+++ b/hosts/edison/hardware-configuration.nix
@@ -23,6 +23,11 @@
       fsType = "vfat";
     };
 
+  fileSystems."/data" =
+    { device = "/dev/disk/by-uuid/ebbdf34e-adec-4df3-bbed-20d80455f3f7";
+      fsType = "ext4";
+    };
+
   swapDevices =
     [ { device = "/dev/disk/by-uuid/d56040a0-3009-4899-95fa-1b82e60e32e4"; }
     ];
@@ -31,7 +36,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 false;
   # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;