home

commit ebe8f2c3d90ffe2c48a41c76c02fd4c979f57b68
parent 323b30ba28917b81505223620c22b131ac02ca0f
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed,  6 May 2020 07:52:13 +0200

nix: use my.* instead of nur.repos.vdemeester

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

Diffstat:
M
modules/profiles/base.nixos.nix
 | 
2
+-
M
modules/profiles/buildkit.nixos.nix
 | 
4
++--
M
modules/profiles/containers.nix
 | 
6
+++---
M
modules/profiles/desktop.nix
 | 
2
+-
M
modules/profiles/dev.go.nix
 | 
16
++++++++--------
M
modules/profiles/dev.nix
 | 
2
+-
M
modules/profiles/fish.nix
 | 
2
+-
M
modules/profiles/git.nix
 | 
6
+++---
M
modules/profiles/kubernetes.nix
 | 
4
++--
M
modules/profiles/openshift.nix
 | 
2
+-

10 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/modules/profiles/base.nixos.nix b/modules/profiles/base.nixos.nix
@@ -49,7 +49,7 @@ in
       serviceConfig = {
         Type = "oneshot";
         ExecStart = ''
-          ${pkgs.nur.repos.vdemeester.systemd-email}/bin/systemd-email vincent@demeester.fr %i
+          ${pkgs.my.systemd-email}/bin/systemd-email vincent@demeester.fr %i
         '';
         User = "root";
         Environment = "PATH=/run/current-system/sw/bin";
diff --git a/modules/profiles/buildkit.nixos.nix b/modules/profiles/buildkit.nixos.nix
@@ -13,12 +13,12 @@ in
         type = types.bool;
       };
       package = mkOption {
-        default = pkgs.nur.repos.vdemeester.buildkit;
+        default = pkgs.my.buildkit;
         description = "buildkit package to be used";
         type = types.package;
       };
       runcPackage = mkOption {
-        default = pkgs.nur.repos.vdemeester.runc;
+        default = pkgs.runc;
         description = "runc package to be used";
         type = types.package;
       };
diff --git a/modules/profiles/containers.nix b/modules/profiles/containers.nix
@@ -21,9 +21,9 @@ in
     programs.podman.enable = cfg.podman;
     home.packages = with pkgs; [
       nur.repos.mic92.cntr
-      nur.repos.vdemeester.ko
-      nur.repos.vdemeester.go-containerregistry
-      nur.repos.vdemeester.yak
+      my.ko
+      my.go-containerregistry
+      my.yak
       skopeo
     ];
     home.file."bin/kontain.me" = {
diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix
@@ -96,7 +96,7 @@ in
         { cmd = "lgogdownloader"; chan = "unstable"; }
         { cmd = "xev"; pkg = "xorg.xev"; }
       ];
-      onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr desktop";
+      onChange = "${pkgs.my.nr}/bin/nr desktop";
     };
     programs = {
       firefox.enable = true;
diff --git a/modules/profiles/dev.go.nix b/modules/profiles/dev.go.nix
@@ -30,15 +30,15 @@ in
           goimports
           # vendoring tools
           dep
-          nur.repos.vdemeester.dep-collector
+          m.dep-collector
           # misc
           protobuf
-          nur.repos.vdemeester.protobuild
-          nur.repos.vdemeester.ram
-          nur.repos.vdemeester.sec
-          nur.repos.vdemeester.goreturns
-          nur.repos.vdemeester.esc
-          nur.repos.vdemeester.yaspell
+          my.protobuild
+          my.ram
+          my.sec
+          my.goreturns
+          my.esc
+          my.yaspell
         ];
         xdg.configFile."nr/go" = {
           text = builtins.toJSON [
@@ -47,7 +47,7 @@ in
             { cmd = "go2nix"; }
             { cmd = "dep2nix"; }
           ];
-          onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr go";
+          onChange = "${pkgs.my.nr}/bin/nr go";
         };
       }
       (
diff --git a/modules/profiles/dev.nix b/modules/profiles/dev.nix
@@ -50,7 +50,7 @@ in
             { cmd = "nix-prefetch-hg"; pkg = "nix-prefetch-scripts"; }
             { cmd = "http"; pkg = "httpie"; }
           ];
-          onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr dev";
+          onChange = "${pkgs.my.nr}/bin/nr dev";
         };
         services.lorri.enable = true;
       }
diff --git a/modules/profiles/fish.nix b/modules/profiles/fish.nix
@@ -51,7 +51,7 @@ in
         { cmd = "nix-prefetch-hg"; pkg = "nix-prefetch-scripts"; }
         { cmd = "op"; pkg = "_1password"; chan = "unstable"; }
       ];
-      onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr default";
+      onChange = "${pkgs.my.nr}/bin/nr default";
     };
   };
 }
diff --git a/modules/profiles/git.nix b/modules/profiles/git.nix
@@ -20,8 +20,8 @@ in
           gitAndTools.git-annex
           gitAndTools.hub
           mr
-          nur.repos.vdemeester.prm
-          nur.repos.vdemeester.ape
+          my.prm
+          my.ape
         ];
         programs.git = {
           enable = true;
@@ -205,7 +205,7 @@ in
             { cmd = "grv"; pkg = "gitAndTools.grv"; }
             { cmd = "git-appraise"; pkg = "gitAndTools.git-appraise"; chan = "unstable"; }
           ];
-          onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr git";
+          onChange = "${pkgs.my.nr}/bin/nr git";
         };
       }
       (
diff --git a/modules/profiles/kubernetes.nix b/modules/profiles/kubernetes.nix
@@ -51,13 +51,13 @@ in
             text = builtins.toJSON [
               { cmd = "kubectl"; }
             ];
-            onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr -force kubernetes";
+            onChange = "${pkgs.my.nr}/bin/nr -force kubernetes";
           };
         }
       )
       (
         mkIf cfg.krew {
-          home.packages = with pkgs; [ nur.repos.vdemeester.krew ];
+          home.packages = with pkgs; [ nur.my.krew ];
         }
       )
       (
diff --git a/modules/profiles/openshift.nix b/modules/profiles/openshift.nix
@@ -28,7 +28,7 @@ in
       {
         profiles.containers.kubernetes.enable = true;
         home.packages = with pkgs; [
-          nur.repos.vdemeester.s2i
+          my..s2i
           cfg.package
         ];
       }