From a6043713c9531c073b83411851fff73f598c9eea Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Wed, 12 Jun 2024 22:47:58 +0200
Subject: [PATCH] aspi: add more packages to make nixos installation work

---
 homes/x86_64-linux/julian@aspi/default.nix  |  10 +-
 homes/x86_64-linux/julian@aspi/fonts.nix    |  14 ++
 homes/x86_64-linux/julian@aspi/packages.nix | 170 ++++++++++++++++++++
 3 files changed, 191 insertions(+), 3 deletions(-)
 create mode 100644 homes/x86_64-linux/julian@aspi/fonts.nix
 create mode 100644 homes/x86_64-linux/julian@aspi/packages.nix

diff --git a/homes/x86_64-linux/julian@aspi/default.nix b/homes/x86_64-linux/julian@aspi/default.nix
index d5f574e..7a296e8 100644
--- a/homes/x86_64-linux/julian@aspi/default.nix
+++ b/homes/x86_64-linux/julian@aspi/default.nix
@@ -24,7 +24,7 @@
   home.homeDirectory = "/home/julian";
 
   modules = {
-    non-nixos.is-nixos = false;
+    non-nixos.is-nixos = true;
     shell = {
       # zsh.enable = true;
       fish.enable = true;
@@ -60,6 +60,7 @@
 
     (lib.frajul.my-helper-function lazygit)
     languagetool
+    wireguard-tools
 
     # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
 
@@ -70,8 +71,11 @@
     ## My scripts
     pkgs.frajul.deploy-to-pianopi
     pkgs.frajul.edit-config
-  ];
-
+  ] ++ lib.lists.concatMap (packages-list-file: import packages-list-file { inherit pkgs; })
+      [
+        ./fonts.nix
+        ./packages.nix
+      ];
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
diff --git a/homes/x86_64-linux/julian@aspi/fonts.nix b/homes/x86_64-linux/julian@aspi/fonts.nix
new file mode 100644
index 0000000..e95d6d9
--- /dev/null
+++ b/homes/x86_64-linux/julian@aspi/fonts.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+with pkgs; [
+  (nerdfonts.override { fonts = [ "FiraCode" ]; })
+  font-awesome
+  dejavu_fonts
+  noto-fonts
+  noto-fonts-cjk
+  noto-fonts-emoji
+  liberation_ttf
+  fira-code
+  fira-code-symbols
+  source-code-pro
+]
diff --git a/homes/x86_64-linux/julian@aspi/packages.nix b/homes/x86_64-linux/julian@aspi/packages.nix
new file mode 100644
index 0000000..27a3ae4
--- /dev/null
+++ b/homes/x86_64-linux/julian@aspi/packages.nix
@@ -0,0 +1,170 @@
+{ pkgs, ... }:
+
+with pkgs;
+[
+
+  shellcheck
+
+  # Rust setup
+  rustc
+  rustfmt
+  cargo
+  clippy
+  rust-analyzer
+
+  # Further tools
+  lazygit
+  languagetool
+
+  # makemkv
+  audacity
+  gnome.cheese
+  zoom-us
+  qutebrowser
+
+  unetbootin
+
+  # For SSS exercises
+  pwndbg
+  gcc
+  hexedit
+
+  # rfid reader tests
+  openct
+  opensc
+  pcsclite
+  pcsctools
+  ccid
+  libnfc
+
+  xournalpp
+  path-of-building
+
+  xfce.thunar-archive-plugin
+  zip
+  p7zip # unzip 7zip archives
+  imagemagick
+  firefox
+  thunderbird
+  nextcloud-client
+  qalculate-gtk
+  libqalculate
+
+  # schildichat-desktop # not updated regularly
+  element-desktop
+  tdesktop # telegram
+
+  tealdeer
+  gcolor2 # gcolor3 does not work
+  # cups
+  wget
+  gparted
+  nodejs
+  git
+  dotter
+  mc
+  broot
+  rnr # renaming tool in rust
+  doublecmd
+  mucommander
+  tree
+  wezterm
+  kitty
+  bat
+  ripgrep
+  fd
+  fzf
+  topgrade
+
+  arandr
+  wireguard-tools
+  htop
+  texlive.combined.scheme-full
+  texlab
+  usbutils # lsusb
+  pciutils # lspci
+
+  gnome.gnome-keyring
+  gnome.seahorse
+  polkit_gnome
+  nix-index
+  python3
+  libnotify
+  libclang
+  libreoffice
+  killall
+  findutils
+  xorg.xkill
+  unzip
+  vlc
+  handbrake
+  nmap
+  jq
+  jdk
+  # emacsPackages.clang-format # formatting for java
+  gradle
+  maven
+  android-tools
+  scrcpy
+  # dvdisaster
+  mate.engrampa
+  # toybox
+  unixtools.procps
+  qpdfview
+  ffmpeg
+  links2
+  julia-bin
+  xdg-desktop-portal-gtk
+  discord
+  lnav # log analyzing tool
+  fdupes # find and delete duplicate files
+  digikam
+  dbeaver-bin
+  pavucontrol
+  sqlite
+
+  nomacs
+  rocketchat-desktop
+  # zotero
+  inkscape
+  pulseaudio
+  gcolor3
+  geogebra
+
+  languagetool
+  xclip
+  okular # Pdf reader with many features, good for commenting documents
+  evince # Simple pdf reader, good for focusing on document content
+  pdfsam-basic # Split, merge, etc for pdfs
+
+  poppler_utils # Pdf utils including pdfimages
+  matlab # Using nix-matlab overlay defined in flake
+  # sage
+
+  gimp
+
+  devbox
+  parted
+  drawio
+  du-dust # Like du tree but better
+  gnupg
+  rpi-imager
+
+  wine
+  winetricks
+
+  # lf
+  rustdesk
+  # realvnc-vnc-viewer
+  calibre
+
+  audible-cli
+
+  # cudaPackages.cudatoolkit
+  # openmvg
+  # colmapWithCuda
+  path-of-building
+
+  ## My scripts
+  frajul.edit-config
+]