Merge branch 'master' of git.urmel.duckdns.org:Kyattsukuro/dotfiles,

added shared config files

eggs/misc/mimeapps.list

@@ -0,0 +1,23 @@
+[Default Applications]
+inode/directory=thunar.desktop
+image/jpeg=qimgv.desktop
+image/webp=qimgv.desktop
+application/pdf=librewolf.desktop
+image/png=qimgv.desktop
+application/x-zerosize=impress.desktop
+text/x.gcode=OrcaSlicer.desktop
+text/markdown=code.desktop
+model/3mf=org.freecad.FreeCAD.desktop
+text/plain=code.desktop
+
+[Added Associations]
+image/jpeg=gimp.desktop;rawtherapee.desktop;qimgv.desktop;
+image/webp=qimgv.desktop;
+application/pdf=librewolf.desktop;
+text/plain=writer.desktop;code.desktop;
+image/png=rawtherapee.desktop;gimp.desktop;qimgv.desktop;
+application/x-zerosize=impress.desktop;
+inode/directory=code.desktop;
+image/gif=qimgv.desktop;
+text/markdown=code.desktop;
+model/3mf=OrcaSlicer.desktop;org.freecad.FreeCAD.desktop;

eggs/misc/mine/mimeapps.list

@@ -1,11 +0,0 @@
-[Default Applications]
-inode/directory=thunar.desktop
-image/jpeg=qimgv.desktop
-image/webp=qimgv.desktop
-application/pdf=librewolf.desktop
-
-[Added Associations]
-image/jpeg=qimgv.desktop;
-image/webp=qimgv.desktop;
-application/pdf=librewolf.desktop;
-text/plain=writer.desktop;

eggs/thunar/thunar/accels.scm

@@ -1,4 +1,4 @@
-; Thunar GtkAccelMap rc-file         -*- scheme -*-
+; thunar GtkAccelMap rc-file         -*- scheme -*-
 ; this file is an automated accelerator map dump
 ;
 ; (gtk_accel_path "<Actions>/ThunarDetailsView/expandable-folders" "")

eggs/thunar/xfce/xfconf/xfce-perchannel-xml/thunar.xml

@@ -6,7 +6,7 @@
   <property name="last-window-maximized" type="bool" value="true"/>
   <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_38_PERCENT"/>
   <property name="last-details-view-visible-columns" type="string" value="THUNAR_COLUMN_DATE_MODIFIED,THUNAR_COLUMN_GROUP,THUNAR_COLUMN_MIME_TYPE,THUNAR_COLUMN_NAME,THUNAR_COLUMN_OWNER,THUNAR_COLUMN_PERMISSIONS,THUNAR_COLUMN_SIZE"/>
-  <property name="last-details-view-column-widths" type="string" value="159,159,159,127,92,1329,74,188,891,214,118,81,126,156"/>
+  <property name="last-details-view-column-widths" type="string" value="159,159,159,127,92,408,74,580,592,79,118,81,126,156"/>
   <property name="last-separator-position" type="int" value="147"/>
   <property name="last-show-hidden" type="bool" value="true"/>
   <property name="misc-single-click" type="bool" value="false"/>
@@ -32,12 +32,12 @@
   <property name="misc-folder-item-count" type="string" value="THUNAR_FOLDER_ITEM_COUNT_ALWAYS"/>
   <property name="last-details-view-column-order" type="string" value="THUNAR_COLUMN_NAME,THUNAR_COLUMN_DATE_MODIFIED,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_SIZE_IN_BYTES,THUNAR_COLUMN_TYPE,THUNAR_COLUMN_LOCATION,THUNAR_COLUMN_MIME_TYPE,THUNAR_COLUMN_DATE_CREATED,THUNAR_COLUMN_PERMISSIONS,THUNAR_COLUMN_OWNER,THUNAR_COLUMN_GROUP,THUNAR_COLUMN_DATE_ACCESSED,THUNAR_COLUMN_RECENCY,THUNAR_COLUMN_DATE_DELETED"/>
   <property name="last-tabs-left" type="array">
-    <value type="string" value="file:///home/someone"/>
+    <value type="string" value="file:///home/someone/Nextcloud/Office/Schule/TiP/cisco2"/>
   </property>
   <property name="last-focused-tab-left" type="int" value="0"/>
   <property name="last-focused-tab-right" type="int" value="0"/>
   <property name="misc-confirm-close-multiple-tabs" type="bool" value="false"/>
-  <property name="last-sort-column" type="string" value="THUNAR_COLUMN_NAME"/>
+  <property name="last-sort-column" type="string" value="THUNAR_COLUMN_DATE_MODIFIED"/>
   <property name="last-sort-order" type="string" value="GTK_SORT_ASCENDING"/>
   <property name="misc-file-size-binary" type="bool" value="true"/>
   <property name="last-toolbar-items" type="string" value="menu:0,back:1,open-parent:1,forward:1,reload:1,open-home:1,undo:0,redo:0,zoom-in:0,zoom-out:0,zoom-reset:0,view-as-icons:0,view-as-detailed-list:0,view-as-compact-list:0,toggle-split-view:0,location-bar:1,search:1,uca-action-1742057602097788-1:0,uca-action-1742077667062723-1:0,new-tab:0,new-window:0,view-switcher:0"/>

eggs/vlc/vlc-qt-interface.conf

@@ -1,6 +1,6 @@
 [General]
 filedialog-path=@Variant(\0\0\0\x11\0\0\0\r/home/someone)
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0&\0\0\a\x7f\0\0\x4\x38\0\0\0\0\0\0\0&\0\0\a\x7f\0\0\x3O\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0&\0\0\a\x7f\0\0\x4\x38)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x14\xdb\0\0\x3\xc7\0\0\x1a\xd3\0\0\x5\x93\0\0\x14\xdb\0\0\x3\xc7\0\0\x1a\xd3\0\0\x5\x93\0\0\0\x1\0\0\0\0\rp\0\0\x14\xdb\0\0\x3\xc7\0\0\x1a\xd3\0\0\x5\x93)
 
 [FullScreen]
 pos=@Point(0 0)
@@ -9,12 +9,12 @@ wide=false
 
 [MainWindow]
 adv-controls=0
-bgSize=@Size(1920 997)
+bgSize=@Size(1831 1344)
 pl-dock-status=true
 playlist-visible=false
 playlistSize=@Size(-1 -1)
 status-bar-visible=false
 
 [RecentsMRL]
-list=file:///home/someone/responcive_review_h264.mp4, file:///home/someone/Downloads/Legefilm-Auswirkung-von-Synonymen-und-Umschreibungen.mp4, file:///home/someone/Videos/Screencasts/Screencast_20241010_182543.webm, file:///home/someone/Nextcloud/Office/Schule/Kun/Vom%20Anfang%20bis%20heute%20-%20Die%20Geschichte%20der%20Fotografie%20Videos%20by%20Arne.mp4
+list=file:///home/someone/Downloads/4.19%20Wichtige%20Anwendungsprotokolle.mp4, file:///home/someone/responcive_review_h264.mp4, file:///home/someone/Downloads/Legefilm-Auswirkung-von-Synonymen-und-Umschreibungen.mp4, file:///home/someone/Videos/Screencasts/Screencast_20241010_182543.webm, file:///home/someone/Nextcloud/Office/Schule/Kun/Vom%20Anfang%20bis%20heute%20-%20Die%20Geschichte%20der%20Fotografie%20Videos%20by%20Arne.mp4
-times=0, 168570, 0, 0
+times=146400, 0, 168570, 0, 0

eggs/wireshark/recent

@@ -95,11 +95,11 @@ gui.show_bytes_show: ASCII
 
 # Main window upper (or leftmost) pane size.
 # Decimal number.
-gui.geometry_main_upper_pane: 482
+gui.geometry_main_upper_pane: 256
 
 # Main window middle pane size.
 # Decimal number.
-gui.geometry_main_lower_pane: 345
+gui.geometry_main_lower_pane: 183
 
 # Main window master splitter state.
 # Hex byte string.

eggs/wireshark/recent_common

@@ -10,12 +10,17 @@ recent.capture_file: /home/someone/Downloads/debug.pcap
 
 ######## Recent capture filters (latest first), cannot be altered through command line ########
 
-recent.capture_filter: dst host 172.24.5.6
+recent.capture_filter: tcp
-recent.capture_filter.wlp0s20f3: dst host 172.24.5.6
+recent.capture_filter.enp6s0: tcp
 
 ######## Recent display filters (latest last), cannot be altered through command line ########
 
+recent.display_filter: ip.addr == 87.150.98.46
+recent.display_filter: ip.addr == 172.24.4.112
+recent.display_filter: ip
 recent.display_filter: udp.stream eq 1
+recent.display_filter: frame.marked == 1
+recent.display_filter: rtcp
 recent.display_filter: arp
 recent.display_filter: icmp or icmpv6
 recent.display_filter: tcp.stream eq 4
@@ -25,8 +30,8 @@ recent.display_filter: tcp.stream eq 0
 # Decimal numbers.
 gui.geometry_main_x: 0
 gui.geometry_main_y: 0
-gui.geometry_main_width: 1707
+gui.geometry_main_width: 2022
-gui.geometry_main_height: 1031
+gui.geometry_main_height: 1416
 
 # Main window maximized.
 # true or false (case-insensitive).
@@ -34,7 +39,7 @@ gui.geometry_main_maximized: true
 
 # Main window geometry state.
 # Hex byte string.
-gui.geometry_main: 01d9d0cb000300000000000000000000000006aa000004060000000000000000000003bf000002ff000000000200000006ab0000000000000000000006aa00000406
+gui.geometry_main: 01d9d0cb000300000000000000000000000007e5000005870000000000000000000007e50000058700000000020000000d700000000000000000000007e500000587
 
 # Leftalign Action Buttons.
 # true or false (case-insensitive).
@@ -92,14 +97,14 @@ gui.geom.ProfileDialog.qt_geometry: 01d9d0cb0003000000000582000001e000000ca80000
 
 # Geometry and maximized state of PacketDialog window.
 # Decimal integers.
-gui.geom.PacketDialog.x: 375
+gui.geom.PacketDialog.x: 0
-gui.geom.PacketDialog.y: 114
+gui.geom.PacketDialog.y: 0
 gui.geom.PacketDialog.width: 1831
 gui.geom.PacketDialog.height: 1416
 # true or false (case-insensitive).
 gui.geom.PacketDialog.maximized: false
 # Qt Geometry State (hex byte string).
-gui.geom.PacketDialog.qt_geometry: 01d9d0cb0003000000000177000000720000089d000005f900000177000000720000089d000005f900000000020000000d7000000177000000720000089d000005f9
+gui.geom.PacketDialog.qt_geometry: 01d9d0cb00030000000000000000000000000726000005870000000000000000000007260000058700000000020000000d7000000000000000000000072600000587
 
 # Geometry and maximized state of PreferencesDialog window.
 # Decimal integers.

nixMain/base.rhai

@@ -20,7 +20,7 @@ export let base_config = #{
     yazi: #{ targets: "~/.config/yazi", enabled: true},
 
     misc: #{ targets: #{
-            "mine": "~/.config/mineapps.list"
+            "mimeapps.list": "~/.config/mineapps.list"
         },
         enabled: true},
     

root-conf/nixos/homemanager/shared-conf.nix

@@ -0,0 +1,18 @@
+  { config, pkgs, lib, ... }:
+
+  {
+    xdg = {
+      desktopEntries = {
+        packettracer8_workaround = {
+          name = "Cisco Packet Tracer 8; Opening Exams Workaround";
+          exec = "${pkgs.ciscoPacketTracer8}/bin/packettracer8 %u";
+          type = "Application";
+          mimeType = [ "x-scheme-handler/pttp" ];
+          noDisplay = true;
+        };
+      };
+      mimeApps.defaultApplications = {
+        "x-scheme-handler/pttp" = [ "packettracer8_workaround.desktop" ];
+      };
+    };
+  }

root-conf/nixos/nixLap/configuration.nix

@@ -9,8 +9,9 @@ let
 in
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [ 
       ./hardware-configuration.nix
+      ./shared-conf.nix
     ];
 
   # Bootloader.
@@ -28,8 +29,6 @@ in
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-  # Enable networking
-  networking.networkmanager.enable = true;
 
   boot.resumeDevice = "/dev/disk/by-uuid/3cdc496b-6116-4f3a-a73e-3afd3cf742ff";
   powerManagement.enable = true;
@@ -61,25 +60,8 @@ in
   services.fprintd.enable = true;
 
   hardware.bluetooth.enable = true; # enables support for Bluetooth
-  #hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
 
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
 
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_GB.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "de_DE.UTF-8";
-    LC_IDENTIFICATION = "de_DE.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
-    LC_TIME = "de_DE.UTF-8";
-  };
   
   virtualisation.containers.enable = true;
   virtualisation = {
@@ -93,11 +75,6 @@ in
       defaultNetwork.settings.dns_enabled = true;
     };
   };
-  programs.virt-manager.enable = true;
-  virtualisation.libvirtd.enable = true;
-  virtualisation.spiceUSBRedirection.enable = true;
-  # Ensuer same pathe for uefi files
-  systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
 
   # Enable the X11 windowing system.
   # You can disable this if you're only using the Wayland session.
@@ -134,11 +111,6 @@ in
   # Configure console keymap
   console.keyMap = "de";
 
-  # Enable CUPS to print documents.
-  services.printing = {
-    enable = true;
-    drivers = [ pkgs.cnijfilter2 ];
-  };
 
   # Enable sound with pipewire.
   services.pulseaudio.enable = false;
@@ -168,29 +140,6 @@ in
     shell = pkgs.zsh;
   };
 
-  # Add zsh
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    autosuggestions.enable = true;
-    syntaxHighlighting.enable = true;
-
-    shellAliases = {
-      ll = "ls -l";
-    };
-  };
-
-  programs.wireshark = {
-    enable = true;
-    usbmon.enable = true; # Allow USB monitoring
-    dumpcap.enable = true; # Allow network capture
-  };
-
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-  };
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
@@ -198,8 +147,6 @@ in
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    starship # zsh greeter
-    fzf # terminal fuzzy finder
     kdePackages.bluedevil
     (catppuccin-sddm.override {
       flavor = "frappe";
@@ -209,22 +156,8 @@ in
       #loginBackground = true;
     })
 
-    cnijfilter2 # Canon printer driver
-
-    jq
     imagemagick
-    bc
-    vim 
-    wget
-    git
     docker-compose
-    librewolf
-    rnote
-    gimp3
-    vscode
-    nextcloud-client
-    libreoffice
-    ciscoPacketTracer8
   ] ++ optionalPkgs;
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.

root-conf/nixos/nixLap/homemanager/someone.nix

@@ -7,6 +7,11 @@
   home.homeDirectory = "/home/someone";
   programs.home-manager.enable = true; 
 
+  imports =
+    [
+      ../../homemanager/shared-conf.nix
+    ];
+
   # wayland.windowManager.hyprland = {
   #  enable = true;
   #  plugins = [

root-conf/nixos/nixMain/configuration.nix

@@ -11,6 +11,7 @@ in
     [
       ./hardware-configuration.nix
       ./device-specific.nix
+      ../shared-conf.nix
     ];
 
   # Enable nix flakes
@@ -33,8 +34,6 @@ in
   boot.binfmt.emulatedSystems = [
   "aarch64-linux"
   ];
-  # Ensuer same pathe for uefi files
-  systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
 
   # Allow user to ttyACM0
   # Allow user to gpio
@@ -63,37 +62,16 @@ in
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"
 
-  networking = {
+  
-    hostName = "nixMain";
-    networkmanager.enable = true;
-  };
-
   networking.firewall = {
-  enable = true;
+    enable = true;
-  allowedTCPPorts = [ 80 443 5000 5001 ];
+    allowedTCPPorts = [ 80 443 5000 5001 ];
-  allowedUDPPortRanges = [
+    allowedUDPPortRanges = [
-    { from = 4000; to = 4007; }
+      { from = 4000; to = 4007; }
-    { from = 8000; to = 8010; }
+      { from = 8000; to = 8010; }
-   ];
+    ];
-  };
+    };
 
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_GB.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "de_DE.UTF-8";
-    LC_IDENTIFICATION = "de_DE.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
-    LC_TIME = "de_DE.UTF-8";
-  };
 
   # Configure keymap in X11
   services.xserver.xkb = {
@@ -133,37 +111,7 @@ in
   virtualisation.docker.enable = true;
   virtualisation.docker.storageDriver = "btrfs";
   # Added docker group to user
-
-  # Libvirt
-  virtualisation.libvirtd = {
-  enable = true;
-  qemu = {
-    package = pkgs.qemu_kvm;
-    runAsRoot = true;
-    swtpm.enable = true;
-    ovmf = {
-      enable = true;
-      packages = [(pkgs.OVMF.override {
-        secureBoot = true;
-        tpmSupport = true;
-      }).fd];
-    };
-   };
-  };
-  virtualisation.spiceUSBRedirection.enable = true;  
-  # Added user to the libvirtd group 
   
-  # Add zsh
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    autosuggestions.enable = true;
-    syntaxHighlighting.enable = true;
-
-    shellAliases = {
-      ll = "ls -l";
-    };
-  };
 
   # Desktop enviorment
   programs.hyprland = {
@@ -192,11 +140,6 @@ in
   services.tumbler.enable = true; # Thumbnail support for images
 
 
-  programs.wireshark = {
-    enable = true;
-    usbmon.enable = true; # Allow USB monitoring
-    dumpcap.enable = true; # Allow network capture
-  };
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
@@ -204,8 +147,8 @@ in
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   nixpkgs.config.permittedInsecurePackages = [
-                "electron-33.4.11"
+    "electron-33.4.11"
-              ];
+  ];
 
   environment.systemPackages = with pkgs; [
   polkit
@@ -214,8 +157,6 @@ in
   xdg-utils
   shared-mime-info
   xwayland
-  wget
-  librewolf
   kitty
   copyq
   distrobox
@@ -232,8 +173,6 @@ in
   waybar
   dconf
   hyprpolkitagent
-  jq
-  bc
   tree
   unzip
   adwaita-icon-theme
@@ -246,37 +185,21 @@ in
   # Coms
   discord-ptb
   freecad
-  pkgs-unstable.gimp3
 
-  libreoffice-qt6-fresh
-  hunspell
-  hunspellDicts.en_US
-  hunspellDicts.de_DE
-
-  ciscoPacketTracer8
-
-  nextcloud-client
   qimgv
   vlc
   rawtherapee
-  vscode
-  git
   python3
-  vim
-  rnote
   spotify
   blender
   file-roller # GUI arciver, support for thunar-arcive
 
-  starship # zsh greeter
-  fzf # terminal fuzzy finder
 
   seahorse # Gnome keyring viewer
   yazi
   pkgs-unstable.orca-slicer
   pkgs-unstable.video-downloader
   
-  wireshark
   bind # nsutils
   grim # screenshot
   slurp # area selectionn

root-conf/nixos/nixMain/homemanager/someone.nix

@@ -7,6 +7,11 @@
   home.homeDirectory = "/home/someone";
   programs.home-manager.enable = true; 
 
+  imports =
+    [
+      ../../homemanager/shared-conf.nix
+    ];
+
   # wayland.windowManager.hyprland = {
   #  enable = true;
   #  plugins = [

root-conf/nixos/shared-conf.nix

@@ -0,0 +1,102 @@
+{ config, pkgs, ... }:
+
+{
+  # Set your time zone.
+  time.timeZone = "Europe/Berlin";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_GB.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "de_DE.UTF-8";
+    LC_IDENTIFICATION = "de_DE.UTF-8";
+    LC_MEASUREMENT = "de_DE.UTF-8";
+    LC_MONETARY = "de_DE.UTF-8";
+    LC_NAME = "de_DE.UTF-8";
+    LC_NUMERIC = "de_DE.UTF-8";
+    LC_PAPER = "de_DE.UTF-8";
+    LC_TELEPHONE = "de_DE.UTF-8";
+    LC_TIME = "de_DE.UTF-8";
+  };
+
+  networking = {
+    hostName = "nixMain";
+    networkmanager.enable = true;
+  };
+
+  programs.wireshark = {
+    enable = false;
+    usbmon.enable = true; # Allow USB monitoring
+    dumpcap.enable = true; # Allow network capture
+  };
+
+  # Add zsh
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestions.enable = true;
+    syntaxHighlighting.enable = true;
+
+    shellAliases = {
+      ll = "ls -l";
+    };
+  };
+
+  # Libvirt
+  programs.virt-manager.enable = true;
+
+  virtualisation.libvirtd = {
+    enable = true;
+    qemu = {
+      package = pkgs.qemu_kvm;
+      runAsRoot = true;
+      swtpm.enable = true;
+      ovmf = {
+        enable = true;
+        packages = [(pkgs.OVMF.override {
+          secureBoot = true;
+          tpmSupport = true;
+        }).fd];
+      };
+    };
+  };
+  virtualisation.spiceUSBRedirection.enable = true;  
+  systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
+
+  # printing
+  # Enable CUPS to print documents.
+  services.printing = {
+    enable = true;
+    drivers = [ pkgs.cnijfilter2 ];
+  };
+
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+
+  # base pkgs
+  environment.systemPackages = with pkgs; [
+    starship
+    fzf
+    jq
+    bc
+    vim
+    wget
+    git
+    librewolf
+    rnote
+    vscode
+    nextcloud-client
+    ciscoPacketTracer8
+    gimp3 
+
+    libreoffice
+    hunspell
+    hunspellDicts.en_US
+    hunspellDicts.de_DE
+
+    cnijfilter2 # Canon printer driver
+  ];
+}