added disko config for laptop, added storage and memory modules

5 files changed, 6 insertions, 22 deletions

diff --git a/hm/conf/clip.nix b/hm/conf/clip.nix
index 82de671..4db661b 100644
--- a/hm/conf/clip.nix
+++ b/hm/conf/clip.nix
@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.szpont.hm.conf.clipboard;
+  cfg = config.hm.conf.clip;
 in
 {
-  options.szpont.hm.conf.clipboard = {
+  options.hm.conf.clip = {
     enable = lib.mkEnableOption "cliphist clipboard history";
     
     backend = lib.mkOption {
@@ -12,7 +12,6 @@ in
       description = "which clipboard backend tools to install";
     };
   };
-
   config = lib.mkIf cfg.enable {
     services.cliphist = {
       enable = true;
diff --git a/hm/conf/conf.nix b/hm/conf/conf.nix
index c05c5c3..6c54d8a 100644
--- a/hm/conf/conf.nix
+++ b/hm/conf/conf.nix
@@ -3,7 +3,6 @@
   imports = [
     ./clip.nix
     ./git.nix
-    ./ssh.nix
     ./xdg-dirs.nix
   ];
 }
diff --git a/hm/conf/git.nix b/hm/conf/git.nix
index f6a7267..8797a52 100644
--- a/hm/conf/git.nix
+++ b/hm/conf/git.nix
@@ -1,10 +1,9 @@
 { config, lib, ... }:
 let
-  cfg = config.szpont.hm.conf.git;
+  cfg = config.hm.conf.git;
 in
 {
-  options.szpont.hm.conf.git.enable = lib.mkEnableOption "enables git vcs";
-
+  options.hm.conf.git.enable = lib.mkEnableOption "enables git vcs";
   config = lib.mkIf cfg.enable {
     programs.git = {
       enable = true;
diff --git a/hm/conf/ssh.nix b/hm/conf/ssh.nix
deleted file mode 100644
index 4587751..0000000
--- a/hm/conf/ssh.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.szpont.hm.conf.ssh;
-in
-{
-  options.szpont.hm.conf.ssh.enable = lib.mkEnableOption "enables ssh support";
-
-  config = lib.mkIf cfg.enable {
-
-  };
-}
diff --git a/hm/conf/xdg-dirs.nix b/hm/conf/xdg-dirs.nix
index 2bd9e64..c6cf03b 100644
--- a/hm/conf/xdg-dirs.nix
+++ b/hm/conf/xdg-dirs.nix
@@ -1,9 +1,9 @@
 { config, lib, ... }:
 let
-  cfg = config.szpont.hm.conf.xdg-dirs;
+  cfg = config.hm.conf.xdg-dirs;
 in
 {
-  options.szpont.hm.conf.xdg-dirs = {
+  options.hm.conf.xdg-dirs = {
     enable = lib.mkEnableOption "enables xdg dirs";
 
     mediaPath = lib.mkOption {
@@ -12,7 +12,6 @@ in
       description = "base path for media";
     };
   };
-
   config = lib.mkIf cfg.enable {
     xdg.userDirs = {
       enable = true;
@@ -46,6 +45,5 @@ in
         XDG_CLIPS_DIR = "${toString cfg.mediaPath}/vids/clips";
         XDG_ARCHIVE_DIR = "${toString cfg.mediaPath}/archive";
       };
-
   };
 }