From 7cfdddb1b880113461514a9d4b97d974260c05c8 Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Wed, 27 Dec 2023 05:05:57 -0500
Subject: [PATCH] Migrate some configuration into roles

---
 configuration-migrate.nix | 81 +++++++++++++++++++++++++++++++++++++++
 flake.nix                 |  7 +++-
 roles/base.nix            | 53 +++++++++++++++++++++++++
 roles/desktop.nix         | 33 ++++++++++++++++
 roles/remote.nix          | 14 +++++++
 5 files changed, 187 insertions(+), 1 deletion(-)
 create mode 100644 configuration-migrate.nix
 create mode 100644 roles/base.nix
 create mode 100644 roles/desktop.nix
 create mode 100644 roles/remote.nix

diff --git a/configuration-migrate.nix b/configuration-migrate.nix
new file mode 100644
index 0000000..3f663e1
--- /dev/null
+++ b/configuration-migrate.nix
@@ -0,0 +1,81 @@
+# vim: set ts=2 sw=2 et: 
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+
+      # manually defined device specific configuration
+      ./host-configuration.nix
+    ];
+
+  # Use the systemd-boot EFI boot loader.
+  # boot.loader.systemd-boot.enable = true;
+  # boot.loader.efi.canTouchEfiVariables = true;
+  # see custom-hardware-configuration.nix
+
+
+  # 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 xkb.options in tty.
+  # };
+
+  # Configure keymap in X11
+  # services.xserver.xkb.layout = "us";
+  # services.xserver.xkb.options = "eurosign:e,caps:escape";
+
+
+  # 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.alice = {
+  #   isNormalUser = true;
+  #   extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+  #   packages = with pkgs; [
+  #     firefox
+  #     tree
+  #   ];
+  # };
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # List services that you want to enable:
+
+  # Open ports in the firewall.
+  networking.firewall.allowedTCPPorts = [ 22 ];
+  # 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
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "23.11"; # Did you read the comment?
+
+}
+
diff --git a/flake.nix b/flake.nix
index 1bf3d9b..8264c7c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,12 @@
     nixosConfigurations = {
       slab = lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [ ./configuration.nix ];
+        modules = [
+          ./configuration-migrate.nix
+          ./roles/base.nix
+          ./roles/desktop.nix
+          ./roles/remote.nix
+        ];
       };
     };
   };
diff --git a/roles/base.nix b/roles/base.nix
new file mode 100644
index 0000000..e07f239
--- /dev/null
+++ b/roles/base.nix
@@ -0,0 +1,53 @@
+{ config, lib, pkgs, ...}:
+{
+  # Enable flakes
+  nix.settings.experimental-features = ["nix-command" "flakes" ];
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # networking.hostName = "nixos"; # 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.
+
+  users.users.nullbite = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    packages = with pkgs; [
+      keychain
+    ];
+    initialPassword = "changeme";
+    shell = pkgs.zsh;
+  };
+
+  # shell config
+  programs.zsh.enable = true;
+  programs.fzf = {
+    keybindings = true;
+    fuzzyCompletion = true;
+  };
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+    neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    wget
+    curl
+    git
+    stow
+    zsh
+    ntfs3g
+
+    fd
+    ripgrep
+    sbctl # TODO move this elsewhere
+    comma
+  ];
+
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+}
diff --git a/roles/desktop.nix b/roles/desktop.nix
new file mode 100644
index 0000000..8150d81
--- /dev/null
+++ b/roles/desktop.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ...}:
+
+{
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  services.xserver.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
+
+  # Enable flatpak
+  services.flatpak.enable = true;
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound.
+  # sound.enable = true;
+  # hardware.pulseaudio.enable = true;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+  
+  users.users.nullbite = {
+    packages = with pkgs; [
+      firefox
+    ]
+  }
+}
diff --git a/roles/remote.nix b/roles/remote.nix
new file mode 100644
index 0000000..e8e21ac
--- /dev/null
+++ b/roles/remote.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+{
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+  services.openssh = {
+    enable = true;
+    openFirewall = true;
+    settings = {
+
+    };
+  };
+
+  services.tailscale.enable = true;
+}