all repos — nixfiles @ 725ce0a79072b281045fe8c7c61fa244dd11a79b

System and user configuration, managed by nix and home-manager

Re-organise development configuration

Alan Pearce
commit

725ce0a79072b281045fe8c7c61fa244dd11a79b

parent

431fd28d2d60fcc5bc28ffbab5c7ccbd9cec2832

10 files changed, 6 insertions(+), 8 deletions(-)

jump to
M system/marvin.nix → system/marvin.nix
@@ -8,8 +8,6 @@ ./modules/configuration/berlin.nix
     ./modules/configuration/british-english.nix
     ./modules/configuration/nix.nix
     ./modules/configuration/user.nix
-    ./modules/development/base.nix
-    ./modules/development/lisp.nix
     ./modules/hardware/adb.nix
     ./modules/hardware/audio.nix
     ./modules/hardware/qwerty.nix
M system/modules/development/base.nix → user/modules/development/base.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-{ environment.systemPackages = with pkgs; [
+{ home.packages = with pkgs; [
     checkbashisms
     editorconfig-core-c
     go
M system/modules/development/lisp.nix → user/modules/development/lisp.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-{ environment.systemPackages = with pkgs; [
+{ home.packages = with pkgs; [
     ccl
     sbcl
     lispPackages.quicklisp
M system/prefect.nix → system/prefect.nix
@@ -9,8 +9,6 @@ ./modules/configuration/berlin.nix
     ./modules/configuration/british-english.nix
     ./modules/configuration/nixos.nix
     ./modules/configuration/user.nix
-    ./modules/development/base.nix
-    ./modules/development/lisp.nix
     ./modules/hardware/audio.nix
     ./modules/hardware/bare-metal.nix
     ./modules/hardware/mouse.nix
M system/satoshipad.nix → system/satoshipad.nix
@@ -10,7 +10,6 @@ ./modules/configuration/berlin.nix
     ./modules/configuration/british-english.nix
     ./modules/configuration/nix.nix
     ./modules/configuration/user.nix
-    ./modules/development/base.nix
     ./modules/hardware/audio.nix
     ./modules/hardware/systemd-boot.nix
     ./modules/hardware/keyboardio-model01.nix
M system/trillian.nix → system/trillian.nix
@@ -4,7 +4,6 @@ {
   imports = [
     ./private/default.nix
 
-    ./modules/development/base.nix
     ./modules/programs/accounting.nix
     ./modules/programs/shell.nix
   ];
M user/prefect.nix → user/prefect.nix
@@ -5,6 +5,8 @@ imports = [
     ./modules/base.nix
     ./modules/dunst.nix
     ./modules/emacs.nix
+    ./modules/development/base.nix
+    ./modules/development/lisp.nix
     ./modules/git.nix
     ./modules/gnupg.nix
     ./modules/i3.nix
M user/satoshipad.nix → user/satoshipad.nix
@@ -4,6 +4,7 @@ {
   imports = [
     ./modules/autorandr.nix
     ./modules/base.nix
+    ./modules/development/base.nix
     ./modules/dunst.nix
     ./modules/emacs.nix
     ./modules/git.nix
M user/trillian.nix → user/trillian.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./modules/base.nix
+    ./modules/development/base.nix
     ./modules/emacs.nix
     ./modules/git.nix
     ./modules/gnupg.nix