summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2018-09-28 13:44:53 +0200
committerAdrian Kummerlaender2018-09-28 13:44:53 +0200
commitc9a69def55f6e13ce13e60713b5369007fe4d7d0 (patch)
treebc565e8803af2e55b1ca6b833d9f000d4978d11e
parent7931784b3a77e46542d7692a914b89fd294247b2 (diff)
downloadnixos_system-c9a69def55f6e13ce13e60713b5369007fe4d7d0.tar
nixos_system-c9a69def55f6e13ce13e60713b5369007fe4d7d0.tar.gz
nixos_system-c9a69def55f6e13ce13e60713b5369007fe4d7d0.tar.bz2
nixos_system-c9a69def55f6e13ce13e60713b5369007fe4d7d0.tar.xz
nixos_system-c9a69def55f6e13ce13e60713b5369007fe4d7d0.zip
Separate desktop and server software
-rw-r--r--asset/dir_colors (renamed from host/software/asset/dir_colors)0
-rw-r--r--configuration.nix2
-rw-r--r--fish.nix (renamed from host/software/fish.nix)0
-rw-r--r--host/asterix.nix2
-rw-r--r--host/obelix.nix2
-rw-r--r--host/software/desktop/asset/T-TeleSec_GlobalRoot_Class_2.pem (renamed from host/software/asset/T-TeleSec_GlobalRoot_Class_2.pem)0
-rw-r--r--host/software/desktop/default.nix (renamed from host/software/desktop.nix)0
-rw-r--r--host/software/desktop/kit.vpn.nix (renamed from host/software/kit.vpn.nix)0
8 files changed, 3 insertions, 3 deletions
diff --git a/host/software/asset/dir_colors b/asset/dir_colors
index bbe79d9..bbe79d9 100644
--- a/host/software/asset/dir_colors
+++ b/asset/dir_colors
diff --git a/configuration.nix b/configuration.nix
index 39e604d..f46da35 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -4,8 +4,8 @@
system.stateVersion = "18.03";
imports = [
+ ./fish.nix
./host/current.nix
- ./host/software/fish.nix
./user/common.nix
];
diff --git a/host/software/fish.nix b/fish.nix
index d1e46c9..d1e46c9 100644
--- a/host/software/fish.nix
+++ b/fish.nix
diff --git a/host/asterix.nix b/host/asterix.nix
index 0d078e9..0c29feb 100644
--- a/host/asterix.nix
+++ b/host/asterix.nix
@@ -1,7 +1,7 @@
{
imports = [
./hardware/asterix.nix
- ./software/desktop.nix
+ ./software/desktop
];
boot = {
diff --git a/host/obelix.nix b/host/obelix.nix
index 8eea35e..8c06132 100644
--- a/host/obelix.nix
+++ b/host/obelix.nix
@@ -3,7 +3,7 @@
{
imports = [
./hardware/obelix.nix
- ./software/desktop.nix
+ ./software/desktop
];
boot = {
diff --git a/host/software/asset/T-TeleSec_GlobalRoot_Class_2.pem b/host/software/desktop/asset/T-TeleSec_GlobalRoot_Class_2.pem
index 374b050..374b050 100644
--- a/host/software/asset/T-TeleSec_GlobalRoot_Class_2.pem
+++ b/host/software/desktop/asset/T-TeleSec_GlobalRoot_Class_2.pem
diff --git a/host/software/desktop.nix b/host/software/desktop/default.nix
index 501a561..501a561 100644
--- a/host/software/desktop.nix
+++ b/host/software/desktop/default.nix
diff --git a/host/software/kit.vpn.nix b/host/software/desktop/kit.vpn.nix
index 726356d..726356d 100644
--- a/host/software/kit.vpn.nix
+++ b/host/software/desktop/kit.vpn.nix