From 77a77ab51f51d15ff4674eb8cc9b0cfbceb6795b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20R=C3=B6ger?= <jonas.roeger@tu-dortmund.de>
Date: Sat, 19 Oct 2024 15:00:01 +0200
Subject: [PATCH] move packages to programs/tools

---
 home/jonas.nix                     | 33 ------------------------------
 modules/desktop/fonts/default.nix  |  5 +----
 modules/home/hyprland/hyprland.nix |  5 +----
 modules/home/kitty/config.nix      |  5 +----
 modules/home/kitty/kitty.nix       |  4 +---
 modules/home/ssh.nix               |  5 +----
 modules/home/zsh/default.nix       |  4 +---
 modules/home/zsh/tools.nix         |  4 +---
 modules/home/zsh/zsh.nix           |  5 +----
 modules/programs.nix               | 22 ++++++++++++++++----
 10 files changed, 26 insertions(+), 66 deletions(-)

diff --git a/home/jonas.nix b/home/jonas.nix
index bbcebe3..401ac13 100644
--- a/home/jonas.nix
+++ b/home/jonas.nix
@@ -61,39 +61,6 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = with pkgs; [
-    arduino
-    bat
-    chromium
-    drawio
-    ffmpeg
-    firefox
-    fzf
-    htop
-    insomnia
-    kicad
-    killall
-    mosquitto
-    mupdf
-    neofetch
-    nil
-    nix-search-cli
-    nixpkgs-fmt
-    obsidian
-    pass
-    poetry
-    python311Packages.radian
-    qalculate-qt
-    qtpass
-    rstudio
-    thefuck
-    vim
-    vscode
-    w3m
-    youtube-dl
-  ];
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-25.9.0" # required by obsidian
-    "python3.11-youtube-dl-2021.12.17"
   ];
 
   home.sessionVariables = {
diff --git a/modules/desktop/fonts/default.nix b/modules/desktop/fonts/default.nix
index ed70f66..6b96d27 100644
--- a/modules/desktop/fonts/default.nix
+++ b/modules/desktop/fonts/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     fira-code
   ];
diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix
index d3e3030..d806fe2 100644
--- a/modules/home/hyprland/hyprland.nix
+++ b/modules/home/hyprland/hyprland.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   wayland.windowManager.hyprland = {
     enable = true;
     systemd.variables = ["--all"];
diff --git a/modules/home/kitty/config.nix b/modules/home/kitty/config.nix
index 09d7ae1..1abb6df 100644
--- a/modules/home/kitty/config.nix
+++ b/modules/home/kitty/config.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.kitty = {
     shellIntegration.enableZshIntegration = true;
     font = {
diff --git a/modules/home/kitty/kitty.nix b/modules/home/kitty/kitty.nix
index 2a12133..bac7930 100644
--- a/modules/home/kitty/kitty.nix
+++ b/modules/home/kitty/kitty.nix
@@ -1,5 +1,3 @@
-{
-  ...
-}: {
+{...}: {
   programs.kitty.enable = true;
 }
diff --git a/modules/home/ssh.nix b/modules/home/ssh.nix
index 66dd692..f702c46 100644
--- a/modules/home/ssh.nix
+++ b/modules/home/ssh.nix
@@ -1,7 +1,4 @@
-{
-  config,
-  ...
-}: let
+{config, ...}: let
   sshKeys = name: {
     "ssh/id_rsa_${name}.pub" = {
       sopsFile = ../../secrets/jonas/ssh.yaml;
diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
index cf6d4b8..2075c9f 100644
--- a/modules/home/zsh/default.nix
+++ b/modules/home/zsh/default.nix
@@ -1,6 +1,4 @@
-{
-  ...
-}: {
+{...}: {
   imports = [
     ./tools.nix
     ./zsh.nix
diff --git a/modules/home/zsh/tools.nix b/modules/home/zsh/tools.nix
index bed253a..c51962e 100644
--- a/modules/home/zsh/tools.nix
+++ b/modules/home/zsh/tools.nix
@@ -1,6 +1,4 @@
-{
-  pkgs
-}: {
+{pkgs, ...}: {
   home.packages = with pkgs; [
     bat
     firefox
diff --git a/modules/home/zsh/zsh.nix b/modules/home/zsh/zsh.nix
index 66e407f..3a5563d 100644
--- a/modules/home/zsh/zsh.nix
+++ b/modules/home/zsh/zsh.nix
@@ -1,7 +1,4 @@
-{
-  config,
-  ...
-}: let
+{config, ...}: let
   omz_custom = "${config.home.homeDirectory}/.config/omz_custom";
 in {
   home.file."${omz_custom}" = {
diff --git a/modules/programs.nix b/modules/programs.nix
index 070629b..503a575 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -1,9 +1,20 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     age
+    arduino
+    chromium
+    drawio
+    insomnia
+    mosquitto
+    obsidian
+    qalculate-qt
+    qtpass
+    rstudio
+    mupdf
+    kicad
+    vscode
+    ffmpeg
+    firefox
     alejandra
     borgbackup
     borgmatic
@@ -23,6 +34,9 @@
     wget
     zoom
   ];
+  nixpkgs.config.permittedInsecurePackages = [
+    "electron-25.9.0" # required by obsidian
+  ];
   programs.steam.enable = true;
   services.udev.packages = [pkgs.openhantek6022];
   virtualisation.docker.enable = true;