home

commit 2dec085abc1e8049b8cff96ce951ea3e4300d0b8
parent c3bc185201f4c8cb50ee5f3ce13a622e8433c5e0
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Sun, 30 Jun 2019 17:00:57 +0200

machines: add base.nixos.nix and a common base.nix

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

Diffstat:
M
machines/base.fedora.nix
 | 
16
+---------------
M
machines/base.nix
 | 
18
+++++++++++++++---
A
machines/base.nixos.nix
 | 
9
+++++++++

3 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/machines/base.fedora.nix b/machines/base.fedora.nix
@@ -1,24 +1,10 @@
 { pkgs, ...}:
 
 {
-  imports = [ ../modules/module-list.nix ];
+  imports = [ ./base.nix ];
   programs = {
-    home-manager = {
-      enable = true;
-    };
     man.enable = false;
   };
   profiles.bash.enable = false;
   home.extraOutputsToInstall = [ "man" ];
-  home.file.".nix-channels".source = ../assets/nix-channels;
-  home.packages = with pkgs; [
-    direnv
-    enchive
-    entr
-    exa
-    fd
-    htop
-    scripts
-    tree
-  ];
 }
diff --git a/machines/base.nix b/machines/base.nix
@@ -5,7 +5,6 @@
   programs = {
     home-manager = {
       enable = true;
-      path = https://github.com/rycee/home-manager/archive/master.tar.gz;
     };
   };
   home.file.".nix-channels".source = ../assets/nix-channels;
@@ -13,12 +12,25 @@
     direnv
     enchive
     entr
-    envsubst
     exa
     fd
     htop
-    nur.repos.vdemeester.fhs-std
     scripts
     tree
   ];
+  xdg.configFile."nr/default" = {
+    text = builtins.toJSON [
+      {cmd = "ncdu";} {cmd = "sshfs";} {cmd = "gotop";} {cmd = "pandoc";} { cmd = "nix-review"; }
+      {cmd = "lspci"; pkg = "pciutils";}
+      {cmd = "lsusb"; pkg = "usbutils";}
+      {cmd = "9"; pkg = "plan9port"; }
+      {cmd = "wakeonlan"; pkg = "python36Packages.wakeonlan";}
+      {cmd = "beet"; pkg = "beets";}
+      {cmd = "http"; pkg = "httpie"; }
+      {cmd = "nix-prefetch-git"; pkg = "nix-prefetch-scripts";}
+      {cmd = "nix-prefetch-hg"; pkg = "nix-prefetch-scripts";}
+      {cmd = "op"; pkg = "_1password"; chan = "unstable";}
+    ];
+    onChange = "${pkgs.nur.repos.vdemeester.nr}/bin/nr default";
+  };
 }
diff --git a/machines/base.nixos.nix b/machines/base.nixos.nix
@@ -0,0 +1,9 @@
+{ pkgs, ...}:
+
+{
+  imports = [ ./base.nix ];
+  home.packages = with pkgs; [
+    envsubst
+    nur.repos.vdemeester.fhs-std
+  ];
+}