configuration.nix

@@ -11,69 +11,6 @@
       # <home-manager/nixos>
     ];
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
-    bitwarden-cli
-    bitwarden-desktop
-    bitwarden-menu
-    brave
-    btop
-    calibre
-    curl
-    ddev
-    diffr
-    docker
-    fish
-    fishPlugins.done
-    firefoxpwa
-    fsearch
-    gimp-with-plugins
-    git
-    git-open
-    gnucash
-    kdePackages.filelight
-    kdePackages.isoimagewriter
-    kdePackages.kdenetwork-filesharing
-    kdePackages.konqueror
-    kdePackages.partitionmanager
-    kdePackages.sierra-breeze-enhanced
-    keepassxc
-    libreoffice-qt6-fresh
-    magic-wormhole
-    meld
-    mkcert
-    neovim
-    nextcloud-client
-    # nfs-utils
-    nix-search-cli
-    php # does PHP 8.2 currently and there's php81, php83, and php84 alternatives
-    python3
-    recoll
-    samba
-    signal-desktop
-    strawberry-qt6
-    thunderbird
-    transmission_noSystemd
-    trashy
-    vimPlugins.vim-wayland-clipboard
-    wget
-    whois
-    vscodium
-    wl-clipboard-rs
-    zoxide
-    zulip
-    zulip-term
-  ];
-  environment.pathsToLink = [ "/share/fish" ];
-
-  # Make it possible for ddev to modify the /etc/hosts file.
-  # Otherwise you'll have to manually change the
-  # hosts configuration after creating a new ddev project.
-  environment.etc.hosts.mode = "0644";
-
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -170,6 +107,9 @@
     packages = with pkgs; [
       kdePackages.kate
       logseq
+      ddev
+      docker
+    #  thunderbird
     ];
     # Per Chris for SSHing from the old machine to here
     openssh.authorizedKeys.keys = [ "ssh-ed25519 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIc/pc2oL80XjIeeazzT5YOCrEaPW7uohA/qlmGr5cM6 mlncn@d64" ];
@@ -212,6 +152,61 @@
     "electron-27.3.11"
   ];
 
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  wget
+    bitwarden-cli
+    bitwarden-desktop
+    bitwarden-menu
+    brave
+    curl
+    ddev
+    docker
+    fish
+    fishPlugins.done
+    firefoxpwa
+    gimp-with-plugins
+    git
+    git-open    
+    gnucash
+    kdePackages.filelight
+    kdePackages.isoimagewriter
+    kdePackages.kdenetwork-filesharing
+    kdePackages.konqueror
+    kdePackages.partitionmanager
+    kdePackages.sierra-breeze-enhanced
+    keepassxc
+    libreoffice-qt6-fresh
+    magic-wormhole
+    meld
+    neovim
+    nextcloud-client
+    # nfs-utils    
+    nix-search-cli
+    python3
+    samba
+    signal-desktop
+    strawberry-qt6
+    thunderbird
+    trashy
+    vimPlugins.vim-wayland-clipboard
+    wget
+    whois
+    vscodium
+    wl-clipboard-rs
+    zoxide
+    zulip
+    zulip-term
+  ];
+  environment.pathsToLink = [ "/share/fish" ];
+
+  # Make it possible for ddev to modify the /etc/hosts file.
+  # Otherwise you'll have to manually change the
+  # hosts configuration after creating a new ddev project.
+  environment.etc.hosts.mode = "0644";
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;