move configurations and modules around

Sorry, this is a mess, hopefully the last one.

10 files changed, 0 insertions, 190 deletions

diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
deleted file mode 100644
index f150066..0000000
--- a/modules/desktop/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{lib, config, pkgs, ...}:
-{
-  imports = [
-    ./fonts.nix
-    ./sound.nix
-    ./xserver.nix
-  ];
-}
diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix
deleted file mode 100644
index a840582..0000000
--- a/modules/desktop/fonts.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-{
-  fonts = {
-    fontconfig.enable = true;
-    fonts = with pkgs; [
-      noto-fonts-emoji
-      dejavu_fonts
-      source-code-pro
-      source-sans-pro
-      source-serif-pro
-    ];
-
-    fontconfig.defaultFonts = {
-      monospace = [ "Source Code Pro" ];
-    };
-  };
-}
diff --git a/modules/desktop/sound.nix b/modules/desktop/sound.nix
deleted file mode 100644
index 95c7c75..0000000
--- a/modules/desktop/sound.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{pkgs, config, lib, ...}:
-
-{
-  sound.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    # We install it to get access to pactl. It isn't enabled or run as a service.
-    pulseaudio
-  ];
-
-  services.pipewire = {
-    enable = true;
-    # Compatibility shims, adjust according to your needs
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
-  hardware.pulseaudio.enable = false;
-}
diff --git a/modules/desktop/xserver.nix b/modules/desktop/xserver.nix
deleted file mode 100644
index 1b96d03..0000000
--- a/modules/desktop/xserver.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  services.xserver = {
-    enable = true;
-    layout = "us";
-    xkbOptions = "eurosign:e,ctrl:swapcaps";
-    libinput.enable = true;
-
-    desktopManager = {
-      xterm.enable = false;
-    };
-
-    displayManager = {
-      lightdm.enable = true;
-      defaultSession = "none+i3";
-    };
-
-    windowManager = {
-      i3.enable = true;
-    };
-  };
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  environment.sessionVariables.TERMINAL = [ "alacritty" ];
-  environment.sessionVariables.TERM = [ "xterm-256color" ];
-
-  services.gnome.gnome-keyring.enable = true;
-  services.gvfs.enable = true;
-}
diff --git a/modules/systems/default.nix b/modules/systems/default.nix
deleted file mode 100644
index 27fb53b..0000000
--- a/modules/systems/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{pkgs, ... }:
-
-{
-  imports = [
-    ./motd.nix
-    ./nix.nix
-    ./software.nix
-    ./ssh.nix
-    ./users.nix
-  ];
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.tmpOnTmpfs = true;
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-  };
-}
diff --git a/modules/systems/motd.nix b/modules/systems/motd.nix
deleted file mode 100644
index 898d03f..0000000
--- a/modules/systems/motd.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{config, ...}:
-{
-  users.motd = ''
-    Welcome
-    - This machine is managed with nix
-
-    Hostname: ${config.networking.hostName}
-    OS:       NixOS ${config.system.nixos.release} (${config.system.nixos.codeName})
-    Version:  ${config.system.nixos.version}
-    Kernel:   ${config.boot.kernelPackages.kernel.version}
-  '';
-}
diff --git a/modules/systems/nix.nix b/modules/systems/nix.nix
deleted file mode 100644
index 48379a4..0000000
--- a/modules/systems/nix.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, pkgs, ... }:
-
-{
-  # Enable flakes and new 'nix' command
-  nix = {
-    package = pkgs.nixFlakes;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-    autoOptimiseStore = true;
-    trustedUsers = [ "root" "@wheel" ];
-
-    gc = {
-      automatic = true;
-      options = "--delete-older-than 14d";
-    };
-  };
-}
diff --git a/modules/systems/software.nix b/modules/systems/software.nix
deleted file mode 100644
index fa919ae..0000000
--- a/modules/systems/software.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{pkgs, config, lib, ...}:
-
-{
-  environment.systemPackages = with pkgs; [
-    curl
-    dmidecode
-    git
-    htop
-    hwdata
-    iftop
-    iptraf-ng
-    lm_sensors
-    lsb-release
-    mg
-    mtr
-    openssl
-    parted
-    pciutils
-    rsync
-    strace
-    tcpdump
-    tmux
-    traceroute
-    unzip
-    usbutils
-    vim
-    wget
-  ];
-}
diff --git a/modules/systems/ssh.nix b/modules/systems/ssh.nix
deleted file mode 100644
index 0ecca80..0000000
--- a/modules/systems/ssh.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-  services.openssh.permitRootLogin = "yes";
-}
diff --git a/modules/systems/users.nix b/modules/systems/users.nix
deleted file mode 100644
index 2b769c4..0000000
--- a/modules/systems/users.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, pkgs, ... }:
-
-rec {
-  users.mutableUsers = false;
-
-  users.groups.fcuny = { gid = 1000; };
-  users.users.fcuny = {
-    isNormalUser = true;
-    uid = 1000;
-    group = "fcuny";
-    home = "/home/fcuny";
-    shell = pkgs.zsh;
-    extraGroups = [ "users" "wheel" ];
-    hashedPassword = "$6$i.z1brxtb44JAEco$fDD2Izl.zRR9vBCB2VBKPScChGw38EEl7QEiBTJ/EwgP3oSL0X3ZHq0PJ.RtqzBsWTPUjl4F3MKOBMhnaAPr6.";
-    openssh.authorizedKeys.keys = [
-      # aptops (laptop)
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1rWKrdSHxlAZnRv1F5jUsHgXSNmr1KzllWEn+JqA7p3zxmSEPBbfIUGxSzkFIQrSbKizJLdH6hGA8DcIm+e+ldQ2RYOdiYBxIkPm+aHB6dw7QGNbnSSdkr9gKThy65j0YOOcmuDExjqxfq6O/8AVstmPH36sUXEIks5F/+WiF+5ehzoJVFqClB1di6w1lml86d0ShrUacgM/ieFPe1vKrzW8ZOM+LaUoGWBTLla1y6UkIqnb7OinmgPu6QAzF6GA7tYJMoHkyV7Axzc2j1/VxVIrUrfY4b0k8lGAzi2GfByq+fXEHzePbaqi8Cy8Trn9eN/ls1WBMUQfSChQi3tM2Vx2BuiOpx/QkXsdgqwe7bTCijcQS7GoREL1qd8tR9sWWd4WMPUiC9kmzvyja5F39xHPgm0A5MtYY7GvQaUPbtBc6g8YuFLLnkqFVEKHSLFiGYP5jIDNvMd5rSSsBUrepCIzWdpprwnKxAjebw5Cyl5p/0MY2zppQRW7AZXehQa7Bv+OClbutEjBa+ioeUxBhezu2rB61XSenTbbUVB5DncD8ceD5AbL9aFz/Bcw6q0kAOGmR1G1MOLgxVHlqcnI5x0E1K2WMKWgQb+1BMek1p5+l3xWNDF4URhLqLupnP5CMrK9ifBOe/76zqyMVrA/mc6tNC58KHhME1IynC1zaLw== franck@fcuny.net"
-    ];
-  };
-
-  users.users.root = {
-    hashedPassword = null;
-    openssh.authorizedKeys.keys = users.users.fcuny.openssh.authorizedKeys.keys;
-  };
-}