commit 100d9c6e60561b1d96cf79685b8408ce16b63fd8
parent b7b78b566d515ac6ecc8ecbdf48bcd95177b248f
Author: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 5 Jun 2020 18:33:19 +0200
machines: remove unused configurations
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
6 files changed, 0 insertions(+), 66 deletions(-)
diff --git a/configuration.nix b/configuration.nix
@@ -1,20 +0,0 @@
-# This configuration file simply determines the hostname and then import both
-# the default configuration (common for all machine) and specific machine
-# configuration.
-let
- hostName = "${builtins.readFile ./hostname}";
-in
-{
- imports = [
- # Generated hardware configuration
- ./hardware-configuration.nix
- # Default profile with default configuration
- ./modules/module-list.nixos.nix
- # Set the machine to nixos
- ./machines/is-nixos.nix
- # Machine specific configuration files
- (./machines + "/${hostName}.nixos.nix")
- ];
-
- networking.hostName = "${hostName}";
-}
diff --git a/home.nix b/home.nix
@@ -20,8 +20,6 @@ in
imports = [
# Default profile with default configuration
./modules/module-list.nix
- # Set the machine to home
- ./machines/is-hm.nix
# Machine specific configuration files
(./machines + "/${hostName}.nix")
];
diff --git a/machines/home.nixos.nix b/machines/home.nixos.nix
@@ -1,30 +0,0 @@
-{ config, pkgs, ... }:
-
-with import ../assets/machines.nix; {
- boot.kernelParams = [ "nfs.nfs4_disable_idmapping=0" "nfsd.nfs4_disable_idmapping=0" ];
- networking.domain = "home";
- time.timeZone = "Europe/Paris";
- # To mimic autofs on fedora
- fileSystems."/net/synodine.home/" = {
- device = "${home.ips.synodine}:/";
- fsType = "nfs";
- options = [ "x-systemd.automount" "noauto" ];
- };
- # FIXME(vdemeester): I think it acts like this because there is only one export
- fileSystems."/net/sakhalin.home/export/" = {
- device = "${home.ips.sakhalin}:/";
- fsType = "nfs";
- options = [ "x-systemd.automount" "noauto" ];
- };
- # Deprecated
- fileSystems."/mnt/synodine" = {
- device = "${home.ips.synodine}:/";
- fsType = "nfs";
- options = [ "x-systemd.automount" "noauto" ];
- };
- fileSystems."/mnt/sakhalin" = {
- device = "${home.ips.sakhalin}:/";
- fsType = "nfs";
- options = [ "x-systemd.automount" "noauto" ];
- };
-}
diff --git a/machines/is-hm.nix b/machines/is-hm.nix
@@ -1,3 +0,0 @@
-{
- machine.home-manager = true;
-}
diff --git a/machines/is-nixos.nix b/machines/is-nixos.nix
@@ -1,3 +0,0 @@
-{
- machine.nixos = true;
-}
diff --git a/machines/nixos-base.nix b/machines/nixos-base.nix
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
- imports = [ ./base.nix ];
- home.packages = with pkgs; [
- envsubst
- ];
-}