home

commit 32964fa7948776448efc12accf35b294b437f3ff
parent 018f631f435f3d8a11b1070467ae6dce76e19c52
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Thu,  1 Nov 2018 18:37:32 +0100

profiles: update desktop, add media and fix some stuff

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

Diffstat:
M
base.nix
 | 
5
++++-
D
desktop.nix
 | 
14
--------------
M
hokkaido.nix
 | 
3
++-
M
honshu.nix
 | 
4
+---
M
modules/module-list.nix
 | 
1
+
M
modules/profiles/desktop.nix
 | 
2
++
A
modules/profiles/media.nix
 | 
24
++++++++++++++++++++++++
A
projects/knative/default.nix
 | 
13
+++++++++++++
A
projects/nix.envrc
 | 
1
+
M
shikoku.nix
 | 
3
++-
M
wakasu.nix
 | 
3
++-

11 files changed, 52 insertions(+), 21 deletions(-)
diff --git a/base.nix b/base.nix
@@ -12,7 +12,9 @@ rec {
   };
   home.file.".nix-channels".source = ./nix-channels;
   home.packages = with pkgs; [
-    scripts
+    aspell
+    aspellDicts.en
+    aspellDicts.fr
     direnv
     enchive
     entr
@@ -21,6 +23,7 @@ rec {
     htop
     jq #dev
     pass
+    scripts
     tree
     yq #dev
   ];
diff --git a/desktop.nix b/desktop.nix
@@ -1,14 +0,0 @@
-{ pkgs, prefix, ... }:
-
-{
-  imports = [ ./base.nix ];
-  home.packages = with pkgs; [
-    aspell
-    aspellDicts.en
-    aspellDicts.fr
-    keybase
-    peco
-    spotify
-    youtube-dl
-  ];
-}
diff --git a/hokkaido.nix b/hokkaido.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./desktop.nix
+    ./base.nix
   ];
   profiles.laptop.enable = true;
   profiles.dev = {
@@ -13,6 +13,7 @@
     rust.enable = true;
   };
   profiles.containers.enable = true;
+  profiles.media.enable = true;
   programs.vscode.enable = true;
   home.packages = with pkgs; [
     google-chrome
diff --git a/honshu.nix b/honshu.nix
@@ -5,8 +5,6 @@
     ./base.nix
   ];
   profiles.dev.go.enable = true;
+  profiles.media.enable = true;
   xdg.configFile."ape.conf".source = ./assets/ape.conf;
-  home.packages = with pkgs; [
-    youtube-dl
-  ];
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
@@ -21,6 +21,7 @@
     ./profiles/i3.nix
     ./profiles/kubernetes.nix
     ./profiles/laptop.nix
+    ./profiles/media.nix
     ./profiles/openshift.nix
     ./profiles/ssh.nix
     ./profiles/tmux.nix
diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix
@@ -79,6 +79,8 @@ in
     };
     profiles.i3.enable = cfg.xsession.i3;
     home.packages = with pkgs; [
+      keybase
+      peco
       #etBook
       gnome3.defaultIconTheme
       gnome3.gnome_themes_standard
diff --git a/modules/profiles/media.nix b/modules/profiles/media.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.profiles.media;
+in
+{
+  options = {
+    profiles.media = {
+      enable = mkOption {
+        default = false;
+        description = "Enable media configuration";
+      };
+    };
+  };
+  config = mkIf cfg.enable (mkMerge [
+    {
+      home.packages = with pkgs; [ youtube-dl ];
+    }
+    (mkIf config.profiles.desktop.enable {
+      home.packages = with pkgs; [ spotify ];
+    })
+  ]);
+}
diff --git a/projects/knative/default.nix b/projects/knative/default.nix
@@ -0,0 +1,13 @@
+with import <nixpkgs> {};
+stdenv.mkDerivation rec {
+  name = "k8s-dev";
+  buildInputs = [
+    pkgs.minikube
+    pkgs.docker-machine-kvm2
+  ];
+  shellHook = ''
+  echo 'Entering Minikube project environment' 1>&2
+  set -v
+  minikube version 1>&2
+  '';
+}
diff --git a/projects/nix.envrc b/projects/nix.envrc
@@ -0,0 +1 @@
+use_nix
diff --git a/shikoku.nix b/shikoku.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./desktop.nix
+    ./base.nix
   ];
   profiles.desktop.enable = true;
   profiles.gaming.enable = true;
@@ -14,6 +14,7 @@
     python.enable = true;
     rust.enable = true;
   };
+  profiles.media.enable = true;
   profiles.cloud.google.enable = true;
   profiles.containers = {
     enable = true;
diff --git a/wakasu.nix b/wakasu.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./desktop.nix
+    ./base.nix
   ];
   profiles.laptop.enable = true;
   profiles.dev = {
@@ -20,6 +20,7 @@
     kubernetes = { enable = true; minikube.enable = true; };
     openshift = { enable = true; minishift.enable = true; };
   };
+  profiles.media.enable = true;
   programs = {
     vscode.enable = true;
     google-chrome.enable = true;