Refactor configs into modules

6 files changed, 0 insertions, 422 deletions

diff --git a/config/common.nix b/config/common.nix
deleted file mode 100644
index 09f04a7..0000000
--- a/config/common.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  imports = [ ./auto-upgrade.nix ];
-  programs.zsh.enable = true;
-  programs.tmux.enable = true;
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    libsignal-protocol-c = pkgs.callPackage ../pkgs/libsignal-c/default.nix { };
-    keycloak = pkgs.callPackage ../pkgs/keycloak/default.nix { };
-  };
-
-  environment.shellAliases = {
-    vim = "nvim";
-  };
-  environment.systemPackages = with pkgs; [
-    dnsutils
-    git
-    gnupg
-    haskellPackages.hledger
-    htop
-    mosh
-    neovim
-    # nox  # Broken as of 2017-06-12
-    pass
-    silver-searcher
-    whois
-    unzip
-    p7zip
-    unrar
-  ];
-  time.timeZone = "America/New_York";
-
-  system.stateVersion = "17.04";
-  services = {
-    postgresql = {
-      dataDir = "/var/db/postgresql";
-      package = pkgs.postgresql95;
-    };
-    openssh.passwordAuthentication = false;
-  };
-
-  nix = rec {
-    useSandbox = lib.mkDefault true;
-    maxJobs = lib.mkOverride 110 16;
-    buildCores = lib.mkDefault 0;  # auto configure
-    gc.automatic = lib.mkDefault true;
-    trustedBinaryCaches = [
-      "https://cache.nixos.org"
-    ];
-    binaryCaches = trustedBinaryCaches;
-    daemonNiceLevel = 10;
-    daemonIONiceLevel = 10;
-    package = pkgs.nixFlakes;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-  };
-
-  boot.cleanTmpDir = true;
-
-  nixpkgs.config.allowUnfree = true;
-}
diff --git a/config/desktop.nix b/config/desktop.nix
deleted file mode 100644
index 4380537..0000000
--- a/config/desktop.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  imports = [ ./common.nix ./users.nix ];
-
-  location.latitude = 40.0;
-  location.longitude = -74.0;
-
-  sound.enable = true;
-
-  hardware = {
-    opengl = {
-      enable = true;
-      driSupport32Bit = true;
-      extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
-    };
-
-    bluetooth.enable = true;
-    pulseaudio = {
-      enable = true;
-      support32Bit = true;
-      package = pkgs.pulseaudioFull;
-      zeroconf.discovery.enable = true;
-      zeroconf.publish.enable = true;
-      tcp.enable = true;
-      tcp.anonymousClients.allowAll = true;
-    };
-  };
-
-  fonts = {
-    enableDefaultFonts = true;
-    fonts = with pkgs; [ fira-code dejavu_fonts steamPackages.steam-fonts wqy_microhei ];
-    fontconfig = {
-      defaultFonts = {
-        sansSerif = [ "Noto Sans" "WenQuanYi Micro Hei" ];
-        serif = [ "Noto Serif" "WenQuanYi Micro Hei-14" ];
-        emoji = [ "Noto Color Emoji" ];
-        monospace = [ "DejaVu Sans Mono" "WenQuanYi Micro Hei Mono" ];
-      };
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    chromium
-    dmenu
-    emacs
-    firefox
-    haskellPackages.xmobar
-    pavucontrol
-    rxvt_unicode-with-plugins
-    sshfsFuse
-    trayer
-    (conky.override { pulseSupport = true; })
-    xbindkeys
-    xorg.xbacklight
-    xorg.xev
-    xscreensaver
-    xsel  # used by urxvt clipboard
-    xss-lock
-    networkmanagerapplet
-    imagemagick
-    dzen2 
-    rofi
-    autorandr
-  ];
-
-  i18n.inputMethod = {
-    enabled = "fcitx";
-    fcitx.engines = with pkgs.fcitx-engines; [cloudpinyin];
-  };
-
-  services = {
-    avahi.enable = true;
-
-    xserver = {
-      enable = true;
-      layout = "us";
-      # xkbVariant = "dvorak";
-      xkbOptions = "caps:ctrl_modifier";
-
-      # desktopManager.plasma5 = {
-      #   enable = true;
-      # };
-
-      windowManager.xmonad = {
-        enable = true;
-        enableContribAndExtras = true;
-        extraPackages = hpkgs: [ hpkgs.xmobar hpkgs.split ];
-      };
-
-      displayManager.lightdm = {
-        enable = true;
-      };
-
-      libinput.enable = true;
-    };
-
-    redshift = {
-      enable = true;
-      extraOptions = ["-r"];
-    };
-  };
-}
diff --git a/config/gaming.nix b/config/gaming.nix
deleted file mode 100644
index 2cc57dc..0000000
--- a/config/gaming.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  pkgs_unstable = pkgs.my-extras.nixpkgs-unstable.legacyPackages.${pkgs.system};
-  my_steam = self: super: {
-    steam = super.steam.override {
-    # steam = pkgs_unstable.steam.override {
-      # nativeOnly = true;
-      withJava = true;
-      extraPkgs = p: with pkgs;
-        let xorgdeps = with xorg; [
-              libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
-              libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
-            ];
-        in [
-          samba
-          tdb
-          glib-networking
-          libxkbcommon
-          fluidsynth hidapi mesa libdrm
-          perl which p7zip gnused gnugrep psmisc opencl-headers
-          cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap ocl-icd utillinux
-          fribidi
-          libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio
-          libao libusb libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
-          libjpeg libxkbcommon libass libcdio libsamplerate libzip libmad libaio
-          libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib
-          alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
-          readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
-          vulkan-loader xdg_utils sqlite gnutls libbsd
-          libnghttp2
-          openssl
-          openldap
-          xorg.xrandr
-          xorg.xinput
-          gnome3.gtk
-          zlib
-          dbus
-          freetype
-          glib
-          atk
-          cairo
-          gdk_pixbuf
-          pango
-          fontconfig
-          xorg.libxcb
-          libkrb5
-          nss
-          qt4
-          pkgs_unstable.qt514.full
-          libjack2 jack2 jack2Full jack_capture
-          libidn2
-          rtmpdump
-          libpsl
-        ] ++ xorgdeps;
-    };
-  };
-in
-{
-  nixpkgs.overlays = [ my_steam ];
-  # nixpkgs.config.allowBroken = true;
-  nixpkgs.config.allowUnfree = true;
-  # nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-  #   "steam"
-  # ];
-  
-  programs.steam.enable = true;
-  hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
-  
-  environment.systemPackages = with pkgs; [
-    wineWowPackages.staging
-    steam
-    steam.run
-    obs-studio
-  ];
-}
diff --git a/config/thinkpad.nix b/config/thinkpad.nix
deleted file mode 100644
index 5bd1707..0000000
--- a/config/thinkpad.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  services = {
-    tlp = {
-      enable = true;
-      settings = {
-        "SATA_LINKPWR_ON_BAT" = "max_performance";
-      };
-    };
-    xserver.xkbModel = "thinkpad60";
-  };
-
-  boot = {
-    kernelModules = [ "tp_smapi" "thinkpad_acpi" "fbcon" "i915" "acpi_call" ];
-    extraModulePackages = with config.boot.kernelPackages; [ tp_smapi acpi_call ];
-  };
-
-  systemd.services = {
-    battery_threshold = {
-      description = "Set battery charging thresholds.";
-      path = [ pkgs.tpacpi-bat ];
-      after = [ "basic.target" ];
-      wantedBy = [ "multi-user.target" ];
-      script = ''
-        tpacpi-bat -s ST 1 39
-        tpacpi-bat -s ST 2 39
-        tpacpi-bat -s SP 1 80
-        tpacpi-bat -s SP 2 80
-      '';
-    };
-  };
-}
diff --git a/config/users.nix b/config/users.nix
deleted file mode 100644
index b595754..0000000
--- a/config/users.nix
+++ /dev/null
@@ -1,100 +0,0 @@
-{ config, lib, pkgs, ... }:
-let aliases = import ../data/aliases.nix;
-in {
-  users = {
-    defaultUserShell = pkgs.zsh;
-    extraUsers = {
-      orbekk = {
-        isNormalUser = true;
-        home = "/home/orbekk";
-        uid = 1000;
-        description = "KJ";
-        extraGroups = ["wheel" "networkmanager" "dialout" "uucp" "audio" "plugdev" "lxd" "readonly" "input" "vboxusers" "video" "sound" "tty" ];
-        openssh.authorizedKeys.keyFiles = [
-          ../data/pincer_rsa.pub
-          ../data/yubikey_rsa.pub
-        ];
-      };
-      guest = {
-	    isNormalUser = true;
-	    home = "/home/guest";
-	    uid = 1500;
-	    description = "Guest";
-	    extraGroups = ["networkmanager" "audio" "input"];
-      };
-      fcgi = {
-        group = "fcgi";
-	      extraGroups = ["readonly"];
-	      uid = 500;
-      };
-      systemhttpd = {
-        name = "systemhttpd";
-        group = "systemhttpd";
-        createHome = true;
-        uid = 502;
-        home = "/var/lib/systemhttpd";
-      };
-      linoquotes = {
-        name = "linoquotes";
-        group = "linoquotes";
-        createHome = true;
-        uid = 503;
-        home = "/var/lib/linoquotes";
-      };
-      minecraft = {
-        name = "minecraft";
-        uid = config.ids.uids.minecraft;
-        extraGroups = ["readonly"];
-      };
-      stats = {
-        name = "stats";
-        group = "stats";
-        createHome = true;
-        uid = 504;
-        home = aliases.services.stats.home;
-      };
-      terraria = {
-        name = "terraria";
-	      group = "terraria";
-	      createHome = true;
-	      uid = 505;
-	      home = "/var/lib/terraria";
-      };
-      readonly = {
-        group = "readonly";
-	      createHome = false;
-	      uid = 506;
-	      useDefaultShell = true;
-	      home = "/storage";
-      };
-      pjournal = {
-        group = "pjournal";
-        createHome = false;
-        uid = 507;
-      };
-      pjournal_test = {
-        group = "pjournal_test";
-        createHome = false;
-        uid = 508;
-      };
-      mpd = lib.optionalAttrs config.services.mpd.enable {
-        extraGroups = ["readonly"];
-      };
-      nginx = lib.optionalAttrs config.services.nginx.enable {
-        extraGroups = ["readonly"]; 
-      };
-    };
-    extraGroups = {
-      fcgi = { name = "fcgi"; gid = 500; };
-      plugdev = { name = "plugdev"; gid = 501; };
-      systemhttpd = { name = "systemhttpd"; gid = 502; };
-      linoquotes = { name = "linoquotes"; gid = 503; };
-      stats = { name = "stats"; gid = 504; };
-      terraria = { name = "terraria"; gid = 505; };
-      readonly = { gid = 506; };
-      pjournal = { gid = 507; };
-      pjournal_test = { gid = 508; };
-    };
-  };
-}
-  
diff --git a/config/yubikey.nix b/config/yubikey.nix
deleted file mode 100644
index d10bb57..0000000
--- a/config/yubikey.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  yubikey-pkgs = with pkgs; [
-    ccid
-    libu2f-host
-    libusb
-    rng_tools
-    yubikey-manager
-    yubikey-personalization
-    gnupg
-    pinentry
-  ];
-in
-{
-  services.pcscd.enable = true;
-  services.udev.packages = with pkgs; [
-    libu2f-host
-    yubikey-personalization
-  ];
-  services.gnome3.gnome-keyring.enable = lib.mkForce false;
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-  # Use GPG agent instead.
-  programs.ssh.startAgent = lib.mkDefault false;
-
-  environment = {
-    systemPackages = yubikey-pkgs;
-  };
-
-  security.sudo.extraRules = [
-    {
-      groups = [ "wheel" ];
-      commands = [ { command = "${pkgs.systemd}/bin/systemctl restart pcscd"; options = [ "NOPASSWD" ]; } ];
-    }
-  ];
-
-  systemd.user.services.restart-pcscd = {
-    description = "Redshift colour temperature adjuster";
-    wantedBy = [ "graphical-session.target" ];
-    partOf = [ "graphical-session.target" ];
-    serviceConfig = {
-      ExecStart = ''
-        sudo systemctl restart pcscd
-      '';
-      Type = "oneshot";
-    };
-  };
-}