Install a couple applications and do a bit of cleanup

jry-thinkpad/home_manager.nix

@@ -1,13 +1,21 @@
 { home-manager, config, lib, ... }:
 
 {
-  home-manager.users.${config.variables.username} = { ... }: {
+  # Home directory related stuff, that we don't need (or can't) use home-manager for
-	  imports = [
+  imports = [
-      ../shared/home_manager/plasma_manager.nix
+    ../shared/home_manager/package_dependencies/neovim.nix
-			../shared/variables.nix
+  ];
-		];
 
-	  variables = config.variables;
+  home-manager.users.${config.variables.username} = { ... }: {
+    imports = [
+      ../shared/variables.nix
+      ../shared/home_manager/plasma_manager.nix
+      ../shared/home_manager/neovim.nix
+      ../shared/home_manager/bash.nix
+      ../shared/home_manager/envvars_amd.nix
+    ];
+
+    variables = config.variables;
 
     # The state version is required and should stay at the version you
     # originally installed.

shared/cli_packages.nix

@@ -11,6 +11,16 @@
     wget
   ];
 
+  programs.git = {
+    enable = true;
+    prompt.enable = true;
+    config = {
+      init = {
+        defaultBranch = "main";
+      };
+    };
+  };
+
   programs.neovim = {
     enable = true;
     defaultEditor = true;

shared/desktop_environment/packages.nix

@@ -2,9 +2,15 @@
 
 {
   environment.systemPackages = with pkgs; [
+    dbeaver-bin
+    feh
     firefox
     keepassxc
     nextcloud-client
+    pavucontrol
+    thunderbird
+    zathura
+    qpwgraph
   ];
 }
 

shared/home_manager/bash.nix

@@ -0,0 +1,10 @@
+{ config, ... }:
+
+{
+  home.file.".bashrc".source = config.lib.file.mkOutOfStoreSymlink "${config.variables.homedir}/Nextcloud/configfiles/bash_configfiles/.bashrc";
+  home.file.".bash_profile".source = config.lib.file.mkOutOfStoreSymlink "${config.variables.homedir}/Nextcloud/configfiles/bash_configfiles/.bash_profile";
+  home.file.".profile".source = config.lib.file.mkOutOfStoreSymlink "${config.variables.homedir}/Nextcloud/configfiles/bash_configfiles/.profile";
+  home.file.".bash_aliases".source = config.lib.file.mkOutOfStoreSymlink "${config.variables.homedir}/Nextcloud/configfiles/bash_configfiles/bash_aliases/.bash_aliases";
+}
+
+# vim: tabstop=2 softtabstop=2

shared/home_manager/envvars_amd.nix

@@ -0,0 +1,7 @@
+{ config, ... }:
+
+{
+  xdg.configFile."environment.d/envvars.conf".source = config.lib.file.mkOutOfStoreSymlink "${config.variables.homedir}/Nextcloud/configfiles/environment_variables/envvars-amdgpu.conf";
+}
+
+# vim: tabstop=2 softtabstop=2

shared/home_manager/envvars_intel.nix

@@ -0,0 +1,7 @@
+{ config, ... }:
+
+{
+  xdg.configFile."environment.d/envvars.conf".source = config.lib.file.mkOutOfStoreSymlink "${config.variables.homedir}/Nextcloud/configfiles/environment_variables/envvars-intel/conf";
+}
+
+# vim: tabstop=2 softtabstop=2

shared/home_manager/neovim.nix

@@ -0,0 +1,9 @@
+{ config, ... }:
+
+{
+  xdg.configFile."nvim/init.vim".source = config.lib.file.mkOutOfStoreSymlink "${config.variables.homedir}/Nextcloud/configfiles/vim/vimrc/init.vim";
+  xdg.configFile."nvim/snippets".source = config.lib.file.mkOutOfStoreSymlink "${config.variables.homedir}/Nextcloud/configfiles/vim/snippets";
+  xdg.configFile."nvim/spell".source = config.lib.file.mkOutOfStoreSymlink "${config.variables.homedir}/Nextcloud/configfiles/vim/spell";
+}
+
+# vim: tabstop=2 softtabstop=2

shared/home_manager/package_dependencies/neovim.nix

@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    gcc
+    gnumake
+    nodejs
+    perl
+    ruby
+    shellcheck
+    yarn
+  ];
+}
+
+# vim: tabstop=2 softtabstop=2

shared/home_manager/plasma_manager/panel.nix

@@ -15,7 +15,9 @@
       {
         systemTray.items = {
         #  shown = [];
-        #  hidden = [];
+         hidden = [
+           "org.kde.yakuake"
+         ];
         };
       }
       {

shared/home_manager/plasma_manager/theme.nix

@@ -8,9 +8,7 @@
   };
 
   # Enable KritaDarkOrange
-  systemd.user.tmpfiles.rules = [
+  home.file.".local/share/color-schemes/KritaDarkOrange.colors".source = config.lib.file.mkOutOfStoreSymlink "${config.variables.flakedir}/shared/home_manager/assets/KritaDarkOrange.colors";
-    "L ${config.variables.homedir}/.local/share/color-schemes/KritaDarkOrange.colors - - - - ${config.variables.flakedir}/shared/home_manager/assets/KritaDarkOrange.colors"
-  ];
 
   programs.plasma.resetFilesExclude = [
     "plasmarc"
@@ -21,3 +19,4 @@
   # };
 }
 
+# vim: tabstop=2 softtabstop=2