home

commit 173690f36831772c0ce06c58d84bba46d9b9e36e
parent 59c2a0052cbe08e1d1faee209e7ff9f235fa0922
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue, 22 Feb 2022 07:52:41 +0100

users/vincent: remove nr usage

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

Diffstat:
M
users/vincent/core/default.nix
 | 
13
++-----------
M
users/vincent/core/git.nix
 | 
11
++---------
M
users/vincent/desktop/gnome.nix
 | 
18
+++---------------
M
users/vincent/dev/default.nix
 | 
11
-----------
M
users/vincent/dev/go.nix
 | 
9
---------
M
users/vincent/dev/nix.nix
 | 
12
+++---------

6 files changed, 10 insertions(+), 64 deletions(-)
diff --git a/users/vincent/core/default.nix b/users/vincent/core/default.nix
@@ -27,9 +27,11 @@ in
       htop
       mosh
       ncurses
+      pciutils
       ripgrep
       scripts
       tree
+      usbutils
     ];
   };
 
@@ -48,15 +50,4 @@ in
       };
     }
   '';
-  xdg.configFile."nr/default" = {
-    text = builtins.toJSON [
-      { cmd = "ncdu"; }
-      { cmd = "sshfs"; }
-      { cmd = "lspci"; pkg = "pciutils"; }
-      { cmd = "lsusb"; pkg = "usbutils"; }
-      { cmd = "9"; pkg = "plan9port"; }
-      { cmd = "wakeonlan"; pkg = "python36Packages.wakeonlan"; }
-    ];
-    onChange = "${pkgs.my.nr}/bin/nr default";
-  };
 }
diff --git a/users/vincent/core/git.nix b/users/vincent/core/git.nix
@@ -30,7 +30,8 @@ in
     gitAndTools.git-annex
     gitAndTools.hub
     gitAndTools.gh
-    # git-review
+    gitAndTools.git-appraise
+    gitAndTools.grv
     mr
     my.prm
     my.ape
@@ -157,12 +158,4 @@ in
     ];
   };
   xdg.configFile."git/config.d/redhat.gitconfig".source = ./git/redhat.gitconfig;
-  xdg.configFile."nr/git" = {
-    text = builtins.toJSON [
-      { cmd = "tig"; }
-      { cmd = "grv"; pkg = "gitAndTools.grv"; }
-      { cmd = "git-appraise"; pkg = "gitAndTools.git-appraise"; chan = "unstable"; }
-    ];
-    onChange = "${pkgs.my.nr}/bin/nr git";
-  };
 }
diff --git a/users/vincent/desktop/gnome.nix b/users/vincent/desktop/gnome.nix
@@ -46,6 +46,9 @@
     keybase
     pass
     profile-sync-daemon
+    desktop-file-utils
+    gimp
+    xev
   ];
 
   home.file.".XCompose".source = ./xorg/XCompose;
@@ -54,19 +57,4 @@
   xdg.configFile."xorg/parens.compose".source = ./xorg/parens.compose;
   xdg.configFile."xorg/modletters.compose".source = ./xorg/modletters.compose;
 
-  xdg.configFile."nr/desktop" = {
-    text = builtins.toJSON [
-      { cmd = "peek"; }
-      { cmd = "shutter"; }
-      { cmd = "station"; }
-      { cmd = "dmenu"; }
-      { cmd = "sxiv"; }
-      { cmd = "screenkey"; }
-      { cmd = "gimp"; }
-      { cmd = "update-desktop-database"; pkg = "desktop-file-utils"; chan = "unstable"; }
-      { cmd = "lgogdownloader"; chan = "unstable"; }
-      { cmd = "xev"; pkg = "xorg.xev"; }
-    ];
-    onChange = "${pkgs.my.nr}/bin/nr desktop";
-  };
 }
diff --git a/users/vincent/dev/default.nix b/users/vincent/dev/default.nix
@@ -39,17 +39,6 @@
     '';
   };
 
-  xdg.configFile."nr/dev" = {
-    text = builtins.toJSON [
-      { cmd = "lnav"; }
-      { cmd = "miniserve"; }
-      { cmd = "licensor"; }
-      { cmd = "yamllint"; pkg = "python37Packages.yamllint"; }
-      { cmd = "http"; pkg = "httpie"; }
-    ];
-    onChange = "${pkgs.my.nr}/bin/nr dev";
-  };
-
   # Upstream Tekton
   home.file."src/tektoncd/.envrc".source = ./src/tektoncd.envrc;
   home.file."src/tektoncd/shell.nix".source = ./src/tektoncd.shell.nix;
diff --git a/users/vincent/dev/go.nix b/users/vincent/dev/go.nix
@@ -22,13 +22,4 @@
     my.esc
     my.yaspell
   ];
-  xdg.configFile."nr/dev.go" = {
-    text = builtins.toJSON [
-      { cmd = "pprof"; chan = "unstable"; }
-      { cmd = "vndr"; chan = "unstable"; }
-      { cmd = "go2nix"; }
-      { cmd = "dep2nix"; }
-    ];
-    onChange = "${pkgs.my.nr}/bin/nr dev.go";
-  };
 }
diff --git a/users/vincent/dev/nix.nix b/users/vincent/dev/nix.nix
@@ -4,14 +4,8 @@
   home.packages = with pkgs; [
     niv
     nixpkgs-fmt
-    # nix-update #FIXME only available on unstable for now
+    nix-update
+    nix-review
+    nix-prefetch-scripts
   ];
-  xdg.configFile."nr/dev.nix" = {
-    text = builtins.toJSON [
-      { cmd = "nix-review"; }
-      { cmd = "nix-prefetch-git"; pkg = "nix-prefetch-scripts"; }
-      { cmd = "nix-prefetch-hg"; pkg = "nix-prefetch-scripts"; }
-    ];
-    onChange = "${pkgs.my.nr}/bin/nr dev.nix";
-  };
 }