home

commit 27095048ae5fd232d221f0ad7b3747df6a0a2a6d
parent cb0469b98f88dc2db097def6114d052123d07bde
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Thu, 30 Apr 2020 02:07:20 +0200

machines: fix imports and clean some machines

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
R
machines/base.fedora.nix -> machines/fedora-base.nix
 | 
0

D
machines/hokkaido.nix
 | 
15
---------------
D
machines/honshu.nix
 | 
7
-------
M
machines/kerkouane.nix
 | 
2
+-
D
machines/kobe.nix
 | 
5
-----
D
machines/massimo.nix
 | 
5
-----
M
machines/naruhodo.nix
 | 
2
+-
R
machines/base.nixos.nix -> machines/nixos-base.nix
 | 
0

M
machines/okinawa.nix
 | 
2
+-
M
machines/okinawa.nixos.nix
 | 
2
+-
D
machines/phantom.nix
 | 
18
------------------
M
machines/sakhalin.nix
 | 
2
+-
M
machines/sakhalin.nixos.nix
 | 
2
+-
D
machines/shikoku.nix
 | 
25
-------------------------
M
machines/wakasu.nix
 | 
2
+-
M
machines/wakasu.nixos.nix
 | 
2
+-

16 files changed, 8 insertions(+), 83 deletions(-)
diff --git a/machines/base.fedora.nix b/machines/fedora-base.nix
diff --git a/machines/hokkaido.nix b/machines/hokkaido.nix
@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ./base.nixos.nix
-  ];
-  profiles.zsh = {
-    enable = true;
-  };
-  profiles.emacs = {
-    enable = true;
-    texlive = false;
-  };
-  xdg.configFile."ape.conf".source = ../assets/ape.conf;
-}
diff --git a/machines/honshu.nix b/machines/honshu.nix
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./base.nixos.nix
-  ];
-  profiles.git.enable = true;
-  xdg.configFile."ape.conf".source = ../assets/ape.conf;
-}
diff --git a/machines/kerkouane.nix b/machines/kerkouane.nix
@@ -1,3 +1,3 @@
 {
-  imports = [ ./base.nixos.nix ];
+  imports = [ ./nixos-base.nix ];
 }
diff --git a/machines/kobe.nix b/machines/kobe.nix
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./base.nix
-  ];
-}
diff --git a/machines/massimo.nix b/machines/massimo.nix
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./base.nix
-  ];
-}
diff --git a/machines/naruhodo.nix b/machines/naruhodo.nix
@@ -2,7 +2,7 @@
 
 with import ../assets/machines.nix;{
   imports = [
-    ./base.fedora.nix
+    ./fedora-base.nix
   ];
   home.packages = with pkgs; [
     kubectx
diff --git a/machines/base.nixos.nix b/machines/nixos-base.nix
diff --git a/machines/okinawa.nix b/machines/okinawa.nix
@@ -2,7 +2,7 @@
 
 with import ../assets/machines.nix; {
   imports = [
-    ./base.nix
+    ./nixos-base.nix
   ];
   home.packages = with pkgs; [
     ripgrep
diff --git a/machines/okinawa.nixos.nix b/machines/okinawa.nixos.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 with import ../assets/machines.nix; {
-  imports = [ ./home.nix ];
+  imports = [ ./home.nixos.nix ];
   boot = {
     cleanTmpDir = true;
   };
diff --git a/machines/phantom.nix b/machines/phantom.nix
@@ -1,18 +0,0 @@
-{
-  imports = [
-    ./base.nix
-  ];
-  profiles = {
-    dev = {
-      go.enable = true;
-      js.enable = true;
-    };
-    emacs = {
-      enable = true;
-      daemonService = false;
-    };
-  };
-  programs = {
-    vscode.enable = true;
-  };
-}
diff --git a/machines/sakhalin.nix b/machines/sakhalin.nix
@@ -2,7 +2,7 @@
 
 with import ../assets/machines.nix; {
   imports = [
-    ./base.nix
+    ./nixos-base.nix
   ];
   home.packages = with pkgs; [
     ripgrep
diff --git a/machines/sakhalin.nixos.nix b/machines/sakhalin.nixos.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 with import ../assets/machines.nix; {
-  imports = [ ./home.nix ];
+  imports = [ ./home.nixos.nix ];
   boot = {
     cleanTmpDir = true;
   };
diff --git a/machines/shikoku.nix b/machines/shikoku.nix
@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ./base.nix
-  ];
-  profiles.cloud.google.enable = true;
-  profiles.containers = {
-    enable = true;
-    podman = true;
-    kubernetes = { enable = true; minikube.enable = true; };
-    openshift = { enable = true; minishift.enable = true; };
-  };
-  profiles.desktop.enable = true;
-  profiles.dev = {
-    go.enable = true;
-    haskell.enable = true;
-    python.enable = true;
-    rust.enable = true;
-    vscode.enable = true;
-  };
-  profiles.gaming.enable = true;
-  profiles.media.enable = true;
-  services.shairport-sync.enable = true;
-}
diff --git a/machines/wakasu.nix b/machines/wakasu.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./base.nix
+    ./nixos-base.nix
   ];
   profiles.zsh = {
     enable = true;
diff --git a/machines/wakasu.nixos.nix b/machines/wakasu.nixos.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 with import ../assets/machines.nix; {
-  imports = [ ../hardware/lenovo-p50.nix ./home.nix ];
+  imports = [ ../hardware/lenovo-p50.nix ./home.nixos.nix ];
   boot = {
     kernelModules = [ "kvm_intel" ];
     kernelParams = [ "kvm_intel.nested=1" ];