home

commit d9e6a67f4c39d7f41181b90fdc774fc2b5cab3fc
parent c22d6082d1fa5f55a5019cf7f4623f9ce576a3de
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Sun, 27 Jan 2019 13:26:38 +0100

Update nr configuration 🌃

… and move it from shikoku to actual profiles.

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

Diffstat:
M
machines/shikoku.nix
 | 
11
-----------
M
modules/profiles/dev.go.nix
 | 
6
++++++
M
modules/profiles/fish.nix
 | 
16
++++++++++++++++
M
modules/profiles/git.nix
 | 
11
++++++++++-

4 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/machines/shikoku.nix b/machines/shikoku.nix
@@ -36,15 +36,4 @@
     obs-studio
     virtmanager
   ];
-
-  xdg.configFile."nr" = {
-    text = builtins.toJSON [
-      {cmd = "mr";}
-      {cmd = "sshfs";}
-      {cmd = "lspci"; pkg = "pciutils";}
-      {cmd = "lsusb"; pkg = "usbutils";}
-      {cmd = "wakeonlan"; pkg = "python36Packages.wakeonlan";}
-    ];
-    onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr";
-  };
 }
diff --git a/modules/profiles/dev.go.nix b/modules/profiles/dev.go.nix
@@ -45,6 +45,12 @@ in
         nur.repos.vdemeester.esc
         nur.repos.vdemeester.yaspell
       ];
+      xdg.configFile."nr/go" = {
+        text = builtins.toJSON [
+          {cmd = "pprof"; chan = "unstable";}
+        ];
+        onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr go";
+      };
     }
     (mkIf config.profiles.fish.enable {
       xdg.configFile."fish/conf.d/go.fish".source = ./assets/fish/go.fish;
diff --git a/modules/profiles/fish.nix b/modules/profiles/fish.nix
@@ -37,5 +37,21 @@ in
     xdg.configFile."fish/functions/sudope.fish".source = ./assets/fish/sudope.function.fish;
     xdg.configFile."fish/functions/fish_prompt.fish".source = ./assets/fish/fish_prompt.fish;
     xdg.configFile."fish/functions/fish_right_prompt.fish".source = ./assets/fish/fish_right_prompt.fish;
+    xdg.configFile."nr/default" = {
+      text = builtins.toJSON [
+        {cmd = "ncdu";} {cmd = "sshfs";} {cmd = "gotop";} {cmd = "pandoc";}
+        {cmd = "lspci"; pkg = "pciutils";}
+        {cmd = "lsusb"; pkg = "usbutils";}
+        {cmd = "wakeonlan"; pkg = "python36Packages.wakeonlan";}
+        {cmd = "beet"; pkg = "beets";}
+        {cmd = "virt-manager"; pkg = "virtmanager";}
+        {cmd = "nix-prefetch-git"; pkg = "nix-prefetch-scripts";}
+        {cmd = "nix-prefetch-hg"; pkg = "nix-prefetch-scripts";}
+        {cmd = "op"; pkg = "_1password"; chan = "unstable";}
+        {cmd = "update-desktop-database"; pkg = "desktop-file-utils"; chan = "unstable";}
+        {cmd = "lgogdownloader"; chan = "unstable";}
+      ];
+      onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr default";
+    };
   };
 }
diff --git a/modules/profiles/git.nix b/modules/profiles/git.nix
@@ -152,7 +152,16 @@ in
           "*~" "#*#" ".makefile" ".clean"
         ];
       };
-      xdg.configFile."git/config.d/redhat.gitconfig".source = ./assets/git/redhat.gitconfig;    
+      xdg.configFile."git/config.d/redhat.gitconfig".source = ./assets/git/redhat.gitconfig;
+      xdg.configFile."nr/git" = {
+        text = builtins.toJSON [
+          {cmd = "mr";}
+          {cmd = "grv"; pkg = "gitAndTools.grv";}
+          {cmd = "git-annex"; pkg = "gitAndTools.git-annex";}
+          {cmd = "git-appraise"; pkg = "gitAndTools.git-appraise"; chan = "unstable";}
+        ];
+        onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr git";
+      };
     }
     (mkIf config.profiles.fish.enable{
       xdg.configFile."fish/conf.d/git.fish".source = ./assets/fish/git.fish;