From c4ddbd56e11caaa7df862deb7eacba0840d6e678 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Thu, 31 Aug 2023 14:24:24 +0200
Subject: [PATCH] refactor programs

---
 yodaTab/configuration.nix | 47 +---------------------------------
 yodaTab/programs.nix      | 53 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 46 deletions(-)
 create mode 100644 yodaTab/programs.nix

diff --git a/yodaTab/configuration.nix b/yodaTab/configuration.nix
index 46e7ac2..d0e3094 100644
--- a/yodaTab/configuration.nix
+++ b/yodaTab/configuration.nix
@@ -12,6 +12,7 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ./home-manager.nix
+      ./programs.nix
       ./print-and-scan.nix
       ./nitrokey-ssh-gpg.nix
       ./ssh-unlock.nix
@@ -111,39 +112,6 @@
     packages = with pkgs; [
       # Nix dependency management
       niv
-
-      # CLI apps
-      git
-      gnumake # make
-      wget
-      htop
-
-      # CCC Weather Workshop
-      #
-      # TODO: rdwd from Git, the packaged version is too old
-      #
-      # TODO: move to nix shell of weather Git repository
-      #       (think of it as a docker container for the weather project: I don't need this elsewhere)
-      # https://github.com/nix-community/nix-direnv
-      #
-      unzip
-      (rWrapper.override{ packages = with rPackages; [ lubridate rdwd zoo ]; })
-
-      # Graphical Apps
-      firefox
-      tor-browser-bundle-bin
-      thunderbird # email
-      keepassxc # Password manager
-      freetube # YouTube client
-      veracrypt # Encrypted filesystem
-      joplin-desktop # Markdown notes
-      rnote # Handwritten notes
-      xournalpp # Handwritte notes
-      anki-bin # Flashcards
-      signal-desktop # Signal client
-      element-desktop # Matrix client
-      jetbrains.idea-ultimate # IDE
-      libsForQt5.ghostwriter # Markdown editor
     ];
   };
 
@@ -152,19 +120,6 @@
   environment.systemPackages = with pkgs; [
   ];
 
-  # Don't install all programs of the GNOME desktop.
-  environment.gnome.excludePackages = (with pkgs; [
-    gnome-photos
-    gnome-tour
-  ]) ++ (with pkgs.gnome; [
-    cheese # Webcam viewer
-    gnome-music # Music player
-    epiphany # Web browser
-    geary # Email
-    gnome-characters
-    #gnome-contacts
-  ]);
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/yodaTab/programs.nix b/yodaTab/programs.nix
new file mode 100644
index 0000000..5bb29be
--- /dev/null
+++ b/yodaTab/programs.nix
@@ -0,0 +1,53 @@
+{ config, pkgs, ... }:
+
+{
+  # Don't install all programs of the GNOME desktop.
+  environment.gnome.excludePackages = (with pkgs; [
+    gnome-photos
+    gnome-tour
+  ]) ++ (with pkgs.gnome; [
+    cheese # Webcam viewer
+    gnome-music # Music player
+    epiphany # Web browser
+    geary # Email
+    gnome-characters
+    #gnome-contacts
+  ]);
+
+  users.users.yoda = {
+      packages = with pkgs; [
+        # CLI apps
+        git
+        gnumake # make
+        wget
+        htop
+
+        # CCC Weather Workshop
+        #
+        # TODO: rdwd from Git, the packaged version is too old
+        #
+        # TODO: move to nix shell of weather Git repository
+        #       (think of it as a docker container for the weather project: I don't need this elsewhere)
+        # https://github.com/nix-community/nix-direnv
+        #
+        unzip
+        (rWrapper.override{ packages = with rPackages; [ lubridate rdwd zoo ]; })
+
+        # Graphical Apps
+        firefox
+        tor-browser-bundle-bin
+        thunderbird # email
+        keepassxc # Password manager
+        freetube # YouTube client
+        veracrypt # Encrypted filesystem
+        joplin-desktop # Markdown notes
+        rnote # Handwritten notes
+        xournalpp # Handwritte notes
+        anki-bin # Flashcards
+        signal-desktop # Signal client
+        element-desktop # Matrix client
+        jetbrains.idea-ultimate # IDE
+        libsForQt5.ghostwriter # Markdown editor
+      ];
+  };
+}