From 58ed91681c7db0a5242f5f9e6783b82e14748b6d Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Fri, 10 Jun 2022 17:25:46 +0200
Subject: [PATCH] Clean more files

---
 baseconfiguration.nix | 153 ------------------------------------------
 options.nix           |  39 -----------
 2 files changed, 192 deletions(-)
 delete mode 100644 baseconfiguration.nix
 delete mode 100644 options.nix

diff --git a/baseconfiguration.nix b/baseconfiguration.nix
deleted file mode 100644
index 57f41e5..0000000
--- a/baseconfiguration.nix
+++ /dev/null
@@ -1,153 +0,0 @@
-{ pkgs, extraOverlays, name, flakes, flakeOutputs, ...}:
-{ config, pkgs, lib, ...}:
-{    
-  imports =
-    [ # hardware-configuration result
-      ((./machine + "/${name}") + /hardware-configuration.nix)
-      # machine-specific configuration
-      (./machine + "/${name}")
-      # additional programs
-      ./programs
-      # home-manager entry-point
-      ./users
-      # layers
-      ./layer
-      # options
-      ./options.nix
-    ];
-  
-
-  time.timeZone = "Europe/Berlin";
-  i18n.defaultLocale = "en_GB.UTF-8";
-
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-    kernelPackages = pkgs.linuxPackages_latest;
-  };
-
-  networking = {
-    useDHCP = false;
-    hostName = config.variables.hostName;
-  };
-
-  nix = {
-    autoOptimiseStore = true;
-    # Enable flakes
-    # Free up to 50GiB whenever there is less than 10GiB left.
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      min-free = ${toString (10* 1024 * 1024 * 1024)}
-      max-free = ${toString (1024 * 1024 * 1024)}
-    '';
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 30d";
-    };
-  };
-  nixpkgs = {
-    overlays = [ flakes.emacs-overlay.overlay flakeOutputs.overlay ] ++ extraOverlays;
-    config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-      "skypeforlinux"
-      "teams"
-      "zoom"
-    ];
-  };
-
-  services = {
-    dbus = {
-      enable = true;
-      packages = with pkgs; [gnome3.dconf];
-    };
-
-    lorri.enable = true;
-  };
-
-  environment = {
-    shells = [ pkgs.zsh ];
-    pathsToLink = [ "/share/zsh/" ];
-    systemPackages = with pkgs; [
-      emacs-all-the-icons-fonts
-      wget
-      git
-      clang
-      rnix-lsp
-      procs
-      comma.comma
-    ];
-    sessionVariables = rec {
-      XDG_CACHE_HOME  = "\${HOME}/.cache";
-      XDG_CONFIG_HOME = "\${HOME}/.config";
-      XDG_BIN_HOME    = "\${HOME}/.local/bin";
-      XDG_DATA_HOME   = "\${HOME}/.local/share";
-
-      PATH = [ 
-        "\${XDG_BIN_HOME}"
-      ];
-    };
-  };
-
-  programs = {
-    zsh = {
-      enable = true;
-      enableCompletion = true;
-      enableGlobalCompInit = true;
-      autosuggestions.enable = true;
-      syntaxHighlighting = {
-        enable = true;
-        highlighters = [ "main" "brackets" "root" "line" ];
-        #styles = { cursor = "standout,underline"; };
-      };
-      setOptions = [ "auto_pushd" "correct" "nocaseglob" "rcexpandparam" "numericglobsort" "nobeep" "appendhistory" ];
-    };
-
-    mtr.enable = true;
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-
-    dconf.enable = true;
-  };
-
-  fonts = {
-    enableDefaultFonts = true;
-    fonts = with pkgs; [
-      hasklig
-      # corefonts # not free
-      liberation_ttf
-      comic-relief
-      dejavu_fonts
-      gyre-fonts
-      open-sans
-      noto-fonts
-      noto-fonts-emoji
-      noto-fonts-extra
-      roboto
-      roboto-mono
-      (nerdfonts.override { fonts = [ "Hasklig" ]; })
-      material-icons
-      weather-icons
-    ];
-
-    fontconfig = {
-      enable = true;
-      # defaultFonts = {
-      #   serif = [ "TeX Gyre Heros" ];
-      #   emoji = [ "Noto Color Emoji" ];
-      #   sansSerif = [ "TeX Gyre Pagella" ];
-      #   monospace = [ "Hasklug Nerd Font Mono" ];
-      # };
-    };
-  };
-  # 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 = "21.05"; # Did you read the comment?
-}
diff --git a/options.nix b/options.nix
deleted file mode 100644
index 1534502..0000000
--- a/options.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ config, pkgs, lib, ...}:
-{
-  options.variables = with lib; {
-    hostName = mkOption {
-      type = types.str;
-      example = "nucturne";
-      description = "Hostname of the system";
-      default = "hostnamenotset";
-    };
-    graphical = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Whether to enable the graphical environment";
-    };
-    server = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Whether this system is a server";
-    };
-    git = {
-      key = mkOption {
-        type = types.str;
-        example = "0xBEEE1234";
-        default = "C804A9C1B7AF8256";
-        description = "Signkey for git commits";
-      };
-      gpgsm = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether to use gpgsm for commit signatures";
-      };
-      signDefault = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether to force signing commits or not";
-      };
-    };
-  };
-}