home

commit db2e895dc535524bc7a92d195893cc66d19e8692
parent 50f7e9303477c7def336d4eaab3796191db7dce8
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed,  6 May 2020 07:04:11 +0200

Update overlays, add my pkgs and some config

- Remove duplicate overlays
- Use my for my pkgs (to be changed) and start migrating to using it
- Add machine.base.{debian,fedora,ubuntu} to act about it in configs

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

Diffstat:
M
machines/base.nix
 | 
2
+-
M
machines/fedora-base.nix
 | 
1
+
M
machines/naruhodo.nix
 | 
4
+---
M
machines/nixos-base.nix
 | 
3
+--
M
machines/sakhalin.nixos.nix
 | 
2
+-
M
machines/wakasu.nix
 | 
1
-
M
modules/machines.nix
 | 
5
+++++
M
modules/profiles/containerd.nixos.nix
 | 
2
+-
M
modules/profiles/kubernetes.nix
 | 
12
++++++------
M
modules/services/athens.nixos.nix
 | 
2
+-
M
modules/services/govanityurl.nixos.nix
 | 
2
+-
M
overlays/sbr.nix
 | 
8
++++++++
D
overlays/sbr.overlay.nix
 | 
8
--------

13 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/machines/base.nix b/machines/base.nix
@@ -34,6 +34,6 @@
       { cmd = "wakeonlan"; pkg = "python36Packages.wakeonlan"; }
       { cmd = "beet"; pkg = "beets"; }
     ];
-    onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr default";
+    onChange = "${pkgs.my.nr}/bin/nr default";
   };
 }
diff --git a/machines/fedora-base.nix b/machines/fedora-base.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [ ./base.nix ];
+  machine.base.fedora = true;
   programs = {
     man.enable = false;
   };
diff --git a/machines/naruhodo.nix b/machines/naruhodo.nix
@@ -5,10 +5,8 @@ with import ../assets/machines.nix;{
     ./fedora-base.nix
   ];
   home.packages = with pkgs; [
-    kubectx
-    kustomize
     golangci-lint
-    nur.repos.vdemeester.ram
+    my.ram
   ];
   profiles.containers.kubernetes = {
     enable = true;
diff --git a/machines/nixos-base.nix b/machines/nixos-base.nix
@@ -1,9 +1,8 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 
 {
   imports = [ ./base.nix ];
   home.packages = with pkgs; [
     envsubst
-    nur.repos.vdemeester.fhs-std
   ];
 }
diff --git a/machines/sakhalin.nixos.nix b/machines/sakhalin.nixos.nix
@@ -121,7 +121,7 @@ with import ../assets/machines.nix; {
 
     path = with pkgs; [ git ];
     script = ''
-      ${pkgs.nur.repos.vdemeester.ape}/bin/ape up /home/vincent/var/mirrors
+      ${pkgs.my.ape}/bin/ape up /home/vincent/var/mirrors
     '';
 
     startAt = "hourly";
diff --git a/machines/wakasu.nix b/machines/wakasu.nix
@@ -42,7 +42,6 @@
     krb5
     libosinfo
     virtmanager
-    nur.repos.vdemeester.tkn
     thunderbird
     asciinema
     gnome3.zenity # use rofi instead
diff --git a/modules/machines.nix b/modules/machines.nix
@@ -5,6 +5,11 @@ with lib; {
     machine = {
       home-manager = mkEnableOption "It is a home-manager configuration";
       nixos = mkEnableOption "It is a nixos configuration";
+      base = {
+        fedora = mkEnableOption "The base OS is Fedora";
+        debian = mkEnableOption "The base OS is Debian";
+        ubuntu = mkEnableOption "The base OS is Ubuntu";
+      };
     };
   };
 }
diff --git a/modules/profiles/containerd.nixos.nix b/modules/profiles/containerd.nixos.nix
@@ -13,7 +13,7 @@ in
         type = types.bool;
       };
       package = mkOption {
-        default = pkgs.nur.repos.vdemeester.containerd;
+        default = pkgs.my.containerd;
         description = "containerd package to be used";
         type = types.package;
       };
diff --git a/modules/profiles/kubernetes.nix b/modules/profiles/kubernetes.nix
@@ -37,12 +37,12 @@ in
           kustomize
           kube-prompt
           kubectx
-          nur.repos.vdemeester.oc
-          #nur.repos.vdemeester.openshift-install
-          nur.repos.vdemeester.operator-sdk
-          nur.repos.vdemeester.ko
-          nur.repos.vdemeester.kss
-          nur.repos.vdemeester.kubernix
+          my.oc
+          #my.openshift-install
+          my.operator-sdk
+          my.ko
+          my.kss
+          my.kubernix
         ];
       }
       (
diff --git a/modules/services/athens.nixos.nix b/modules/services/athens.nixos.nix
@@ -12,7 +12,7 @@ in
       '';
       package = mkOption {
         type = types.package;
-        default = pkgs.nur.repos.vdemeester.athens;
+        default = pkgs.my.athens;
         description = ''
           Athens package to use.
         '';
diff --git a/modules/services/govanityurl.nixos.nix b/modules/services/govanityurl.nixos.nix
@@ -12,7 +12,7 @@ in
       '';
       package = mkOption {
         type = types.package;
-        default = pkgs.nur.repos.vdemeester.govanityurl;
+        default = pkgs.my.govanityurl;
         description = ''
           govanityurl package to use.
         '';
diff --git a/overlays/sbr.nix b/overlays/sbr.nix
@@ -12,6 +12,14 @@ rec {
   vscodeliveshare = import ../pkgs/vscodeliveshare {
     inherit (self) stdenv vscode-utils autoPatchelfHook xorg gnome3 utillinux openssl icu zlib curl lttng-ust libsecret libkrb5 gcc libunwind binutils;
   };
+  vrsync = import ../pkgs/vrsync {
+    inherit (self) stdenv lib;
+  };
+  vde-thinkpad = import ../pkgs/vde-thinkpad {
+    inherit (self) stdenv lib;
+  };
+
+  my = import ../pkgs {};
 
   emacs27 = (self.emacs.override { srcRepo = true; }).overrideAttrs (
     old: {
diff --git a/overlays/sbr.overlay.nix b/overlays/sbr.overlay.nix
@@ -1,8 +0,0 @@
-self: super: {
-  vrsync = import ../pkgs/vrsync {
-    inherit (self) stdenv lib;
-  };
-  vde-thinkpad = import ../pkgs/vde-thinkpad {
-    inherit (self) stdenv lib;
-  };
-}