314 current 1970-01-01 01:00:00 23.11.20240514.9ddcaff 6.1.90 *

hosts/MaxNixosLaptop/home.nix

@@ -1,17 +1,14 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
+{...}: {
   imports = [
     ../../modules/home
   ];
 
-  sway.enable = true;
-  sway.laptop = true;
-
   shell.enable = true;
   git.enable = true;
+  music.enable = true;
+  sway.enable = true;
+  sway.laptop = true;
+  myPrograms.enable = true;
 
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
@@ -27,49 +24,8 @@
   # release notes.
   home.stateVersion = "23.11"; # Please read the comment before changing.
 
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
-  home.packages = with pkgs; [
-    unzip
-    nextcloud-client
-    firefox
-    thunderbird
-    xournalpp
-    prismlauncher
-    steam
-    blender
-    betaflight-configurator
-    loudgain
-    youtube-dl
-    dconf
-    distrobox
-    libqalculate
-    sops
-    pwvucontrol
-    qpwgraph
-    discord
-    libreoffice-fresh
-    mate.caja
-    libsForQt5.okular
-    mpv
-    gimp
-    freecad
-    flatpak
-    wine
-    unstable.gyroflow
-    prusa-slicer
-  ];
-
   xdg.enable = true;
 
-  services.nextcloud-client.enable = true;
-
-  services.udiskie = {
-    enable = true;
-    automount = true;
-    notify = true;
-  };
-
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 

modules/home/music/mpd.nix

@@ -17,7 +17,7 @@ in {
     ];
     services.mpd = {
       enable = true;
-      musicDirectory = "~/Music/";
+      musicDirectory = "${config.home.homeDirectory}/Music/";
       network.startWhenNeeded = true;
       extraConfig = ''
         restore_paused "yes"

modules/home/programs/default.nix

@@ -1,3 +1,50 @@
-{...}: {
-  imports = [./foot.nix ./thunderbird.nix];
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.myPrograms;
+in {
+  imports = [./foot.nix ./thunderbird.nix ./nextcloud.nix ./udiskie.nix];
+
+  options = {
+    myPrograms.enable = lib.mkEnableOption "programs for desktop use";
+  };
+
+  config = lib.mkIf cfg.enable {
+    myPrograms.foot.enable = lib.mkDefault true;
+    myPrograms.thunderbird.enable = lib.mkDefault true;
+    myPrograms.nextcloud.enable = lib.mkDefault true;
+    myPrograms.udiskie.enable = lib.mkDefault true;
+
+    home.packages = with pkgs; [
+      unzip
+      firefox
+      xournalpp
+      prismlauncher
+      steam
+      blender
+      betaflight-configurator
+      loudgain
+      youtube-dl
+      dconf
+      distrobox
+      libqalculate
+      sops
+      pwvucontrol
+      qpwgraph
+      discord
+      libreoffice-fresh
+      mate.caja
+      libsForQt5.okular
+      mpv
+      gimp
+      freecad
+      flatpak
+      wine
+      unstable.gyroflow
+      prusa-slicer
+    ];
+  };
 }

modules/home/programs/foot.nix

@@ -1,29 +1,41 @@
-{...}: {
-  programs.foot = {
-    enable = true;
-    settings = {
-      main = {
-        font = "FiraCode Nerd Font Mono:size=10";
-        dpi-aware = "yes";
-      };
-      colors = {
-        regular0 = "222222"; # black
-        regular1 = "cc9393"; # red
-        regular2 = "7f9f7f"; # green
-        regular3 = "d0bf8f"; # yellow
-        regular4 = "8cd0d3"; # blue
-        regular5 = "dc8cc3"; # magenta
-        regular6 = "93e0e3"; # cyan
-        regular7 = "dcdccc"; # white
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.myPrograms.foot;
+in {
+  options = {
+    myPrograms.foot.enable = lib.mkEnableOption "foot, a lightweight wayland terminal emulator";
+  };
 
-        bright0 = "666666"; # black
-        bright1 = "dca3a3"; # red
-        bright2 = "bfebbf"; # green
-        bright3 = "f0dfaf"; # yellow
-        bright4 = "8cd0d3"; # blue
-        bright5 = "fcace3"; # magenta
-        bright6 = "b3ffff"; # cyan
-        bright7 = "ffffff"; # white
+  config = lib.mkIf cfg.enable {
+    programs.foot = {
+      enable = true;
+      settings = {
+        main = {
+          font = "FiraCode Nerd Font Mono:size=10";
+          dpi-aware = "yes";
+        };
+        colors = {
+          regular0 = "222222"; # black
+          regular1 = "cc9393"; # red
+          regular2 = "7f9f7f"; # green
+          regular3 = "d0bf8f"; # yellow
+          regular4 = "8cd0d3"; # blue
+          regular5 = "dc8cc3"; # magenta
+          regular6 = "93e0e3"; # cyan
+          regular7 = "dcdccc"; # white
+
+          bright0 = "666666"; # black
+          bright1 = "dca3a3"; # red
+          bright2 = "bfebbf"; # green
+          bright3 = "f0dfaf"; # yellow
+          bright4 = "8cd0d3"; # blue
+          bright5 = "fcace3"; # magenta
+          bright6 = "b3ffff"; # cyan
+          bright7 = "ffffff"; # white
+        };
       };
     };
   };

modules/home/programs/nextcloud.nix

@@ -0,0 +1,15 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.myPrograms.nextcloud;
+in {
+  options = {
+    myPrograms.nextcloud.enable = lib.mkEnableOption "nextcloud client";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.nextcloud-client.enable = true;
+  };
+}

modules/home/programs/thunderbird.nix

@@ -1,104 +1,116 @@
-{...}: {
-  accounts.email.accounts = {
-    "google max" = {
-      address = "max.kaenner@gmail.com";
-      userName = "max.kaenner@gmail.com";
-      realName = "Max Känner";
-      flavor = "gmail.com";
-      thunderbird = {
-        enable = true;
-        settings = id: {
-          "mail.smtpserver.smtp_${id}.authMethod" = 10;
-          "mail.server.server_${id}.authMethod" = 10;
-        };
-      };
-      primary = true;
-    };
-    "google informatiker" = {
-      address = "kaenner9@gmail.com";
-      userName = "kaenner9@gmail.com";
-      realName = "Max Känner";
-      flavor = "gmail.com";
-      thunderbird = {
-        enable = true;
-        settings = id: {
-          "mail.smtpserver.smtp_${id}.authMethod" = 10;
-          "mail.server.server_${id}.authMethod" = 10;
-        };
-      };
-    };
-    "uni" = {
-      address = "max.kaenner@stud.uni-hannover.de";
-      userName = "max.kaenner@stud.uni-hannover.de";
-      realName = "Max Känner";
-      imap = {
-        host = "mail.stud.uni-hannover.de";
-        port = 993;
-        tls = {
-          enable = true;
-          useStartTls = false;
-        };
-      };
-      smtp = {
-        host = "smtp.uni-hannover.de";
-        port = 587;
-        tls = {
-          enable = true;
-          useStartTls = true;
-        };
-      };
-      thunderbird.enable = true;
-    };
-    "luhbots" = {
-      address = "max.kaenner@luhbots.de";
-      userName = "max.kaenner@luhbots.de";
-      realName = "Max Känner";
-      imap = {
-        host = "luhbots.de";
-        port = 993;
-        tls = {
-          enable = true;
-          useStartTls = false;
-        };
-      };
-      smtp = {
-        host = "luhbots.de";
-        port = 587;
-        tls = {
-          enable = true;
-          useStartTls = true;
-        };
-      };
-      thunderbird.enable = true;
-    };
-    "gymstolz" = {
-      address = "max.kaenner@gym-stolz.de";
-      userName = "max.kaenner";
-      realName = "Max Känner";
-      imap = {
-        host = "gym-stolz.de";
-        port = 143;
-        tls = {
-          enable = true;
-          useStartTls = true;
-        };
-      };
-      smtp = {
-        host = "gym-stolz.de";
-        port = 587;
-        tls = {
-          enable = true;
-          useStartTls = true;
-        };
-      };
-      thunderbird.enable = true;
-    };
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.myPrograms.thunderbird;
+in {
+  options = {
+    myPrograms.thunderbird.enable = lib.mkEnableOption "thunderbird, a email client";
   };
 
-  programs.thunderbird = {
-    enable = true;
-    profiles.default = {
-      isDefault = true;
+  config = lib.mkIf cfg.enable {
+    accounts.email.accounts = {
+      "google max" = {
+        address = "max.kaenner@gmail.com";
+        userName = "max.kaenner@gmail.com";
+        realName = "Max Känner";
+        flavor = "gmail.com";
+        thunderbird = {
+          enable = true;
+          settings = id: {
+            "mail.smtpserver.smtp_${id}.authMethod" = 10;
+            "mail.server.server_${id}.authMethod" = 10;
+          };
+        };
+        primary = true;
+      };
+      "google informatiker" = {
+        address = "kaenner9@gmail.com";
+        userName = "kaenner9@gmail.com";
+        realName = "Max Känner";
+        flavor = "gmail.com";
+        thunderbird = {
+          enable = true;
+          settings = id: {
+            "mail.smtpserver.smtp_${id}.authMethod" = 10;
+            "mail.server.server_${id}.authMethod" = 10;
+          };
+        };
+      };
+      "uni" = {
+        address = "max.kaenner@stud.uni-hannover.de";
+        userName = "max.kaenner@stud.uni-hannover.de";
+        realName = "Max Känner";
+        imap = {
+          host = "mail.stud.uni-hannover.de";
+          port = 993;
+          tls = {
+            enable = true;
+            useStartTls = false;
+          };
+        };
+        smtp = {
+          host = "smtp.uni-hannover.de";
+          port = 587;
+          tls = {
+            enable = true;
+            useStartTls = true;
+          };
+        };
+        thunderbird.enable = true;
+      };
+      "luhbots" = {
+        address = "max.kaenner@luhbots.de";
+        userName = "max.kaenner@luhbots.de";
+        realName = "Max Känner";
+        imap = {
+          host = "luhbots.de";
+          port = 993;
+          tls = {
+            enable = true;
+            useStartTls = false;
+          };
+        };
+        smtp = {
+          host = "luhbots.de";
+          port = 587;
+          tls = {
+            enable = true;
+            useStartTls = true;
+          };
+        };
+        thunderbird.enable = true;
+      };
+      "gymstolz" = {
+        address = "max.kaenner@gym-stolz.de";
+        userName = "max.kaenner";
+        realName = "Max Känner";
+        imap = {
+          host = "gym-stolz.de";
+          port = 143;
+          tls = {
+            enable = true;
+            useStartTls = true;
+          };
+        };
+        smtp = {
+          host = "gym-stolz.de";
+          port = 587;
+          tls = {
+            enable = true;
+            useStartTls = true;
+          };
+        };
+        thunderbird.enable = true;
+      };
+    };
+
+    programs.thunderbird = {
+      enable = true;
+      profiles.default = {
+        isDefault = true;
+      };
     };
   };
 }

modules/home/programs/udiskie.nix

@@ -0,0 +1,19 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.myPrograms.udiskie;
+in {
+  options = {
+    myPrograms.udiskie.enable = lib.mkEnableOption "auto media mounting";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.udiskie = {
+      enable = true;
+      automount = true;
+      notify = true;
+    };
+  };
+}