Move home configs inside home directory, add some more integrations, add chat apps and steam

nixos/H0615-elitherl.nix

@@ -80,7 +80,7 @@ in
   nixpkgs.config.allowUnfree = true;
 
   # Set up home manager for user
-  home-manager.users.elitherl = import ./H0615-elitherl-home.nix;
+  home-manager.users.elitherl = import ./home/H0615-elitherl.nix;
   home-manager.useUserPackages = false;
   home-manager.useGlobalPkgs = false;
 

nixos/home/H0615-elitherl.nix

@@ -1,17 +1,15 @@
 { pkgs, ... }: {
   imports = [
-    ./home/common.nix
-    ./home/dev.nix
-    ./home/nomachine.nix
-    ./home/python310.nix
+    ./common.nix
+    ./dev.nix
+    ./nomachine.nix
+    ./python310.nix
   ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = "elitherl";
   home.homeDirectory = "/home/elitherl";
 
-  nixpkgs.config.allowUnfree = true;
-
   home.packages = with pkgs; [
     microsoft-edge
     bitwarden

nixos/home/common.nix

@@ -1,6 +1,8 @@
 { config, pkgs, ... }:
 
 {
+  nixpkgs.config.allowUnfree = true;
+
   programs.home-manager.enable = true;
   programs.ssh = {
     enable = true;
@@ -14,12 +16,18 @@
   programs.git = {
     enable = true;
     userName = "Evie Litherland-Smith";
-    userEmail = "evie.litherland-smith@ukaea.uk";
+  };
+  programs.bash.enable = true;
+  programs.zsh.enable = true;
+  programs.fish.enable = true;
+  programs.starship = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableFishIntegration = true;
   };
 
   home.packages = with pkgs; [
     wezterm
-    zsh
-    starship
   ];
 }

nixos/home/dev.nix

@@ -18,18 +18,18 @@
     settings = {
       gui = {
         showFileTree = true;
-	showCommandLog = false;
-	showIcons = true;
-	theme = {
-	  lightTheme = false;
-          activeBorderColor = ["#a6da95" "bold"];
-          inactiveBorderColor = ["#cad3f5"];
-          optionsTextColor = ["#8aadf4"];
-          selectedLineBgColor = ["#363a4f"];
-          selectedRangeBgColor = ["#363a4f"];
-          cherryPickedCommitBgColor = ["#8bd5ca"];
-          cherryPickedCommitFgColor = ["#8aadf4"];
-          unstagedChangesColor = ["red"];
+        showCommandLog = false;
+        showIcons = true;
+        theme = {
+          lightTheme = false;
+          activeBorderColor = [ "#a6da95" "bold" ];
+          inactiveBorderColor = [ "#cad3f5" ];
+          optionsTextColor = [ "#8aadf4" ];
+          selectedLineBgColor = [ "#363a4f" ];
+          selectedRangeBgColor = [ "#363a4f" ];
+          cherryPickedCommitBgColor = [ "#8bd5ca" ];
+          cherryPickedCommitFgColor = [ "#8aadf4" ];
+          unstagedChangesColor = [ "red" ];
         };
       };
       update.method = "never";

nixos/home/gaming.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    steam
+  ];
+}

nixos/home/messaging.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    signal-desktop
+    element-desktop
+    discord
+  ];
+}

nixos/home/neovim.nix

@@ -1,13 +1,14 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-    home.packages = with pkgs; [
-        neovim
-        gnumake
-        gcc
-        python310Packages.pynvim
-        fzf
-        ripgrep
-        cargo
-    ];
+  home.packages = with pkgs; [
+    neovim
+    gnumake
+    gcc
+    python310Packages.pynvim
+    fzf
+    ripgrep
+    cargo
+    rustc
+  ];
 }

nixos/home/vanguard-xenia.nix

@@ -0,0 +1,27 @@
+{ pkgs, ... }: {
+  imports = [
+    ./common.nix
+    ./gaming.nix
+    ./messaging.nix
+    ./dev.nix
+    ./nomachine.nix
+    ./python310.nix
+  ];
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "xenia";
+  home.homeDirectory = "/home/xenia";
+
+  nixpkgs.config.allowUnfree = true;
+
+  home.packages = with pkgs; [
+    firefox
+    bitwarden
+  ];
+
+  programs.git = {
+    userEmail = "evie@xenia.me.uk";
+  };
+
+  home.stateVersion = "22.11";
+}

nixos/vanguard-xenia-home.nix

@@ -1,38 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-in
-
-{
-  imports = [
-    (import "${home-manager}/nixos")
-  ];
-
-  home-manager.users.xenia = { pkgs, ... }: {
-    imports = [
-      ./home/common.nix
-      ./home/dev.nix
-      ./home/python310.nix
-    ];
-    # Home Manager needs a bit of information about you and the
-    # paths it should manage.
-    home.username = "xenia";
-    home.homeDirectory = "/home/xenia";
-
-    home.packages = with pkgs; [
-      firefox
-      bitwarden
-    ];
-
-    programs.git = {
-      enable = true;
-      userName = "Evie Litherland-Smith";
-      userEmail = "evie@xenia.me.uk";
-    };
-    home.stateVersion = "22.11";
-
-  };
-  home-manager.useUserPackages = true;
-  home-manager.useGlobalPkgs = true;
-}

nixos/vanguard-xenia.nix

@@ -1,11 +1,15 @@
 { config, pkgs, ... }:
 
+let
+  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
+in
+
 {
   imports = [
-      ./common.nix
-      ./packages.nix
-      ./vanguard-xenia-home.nix
-    ];
+    ./common.nix
+    ./packages.nix
+    (import "${home-manager}/nixos")
+  ];
 
   networking.hostName = "Vanguard"; # Define your hostname.
 
@@ -75,6 +79,11 @@
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
+  # Set up home manager for user
+  home-manager.users.xenia = import ./home/vanguard-xenia.nix;
+  home-manager.useUserPackages = false;
+  home-manager.useGlobalPkgs = false;
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -89,8 +98,8 @@
   services.openssh.enable = true;
 
   # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 22 ];
-  networking.firewall.allowedUDPPorts = [ 22 ];
+  # networking.firewall.allowedTCPPorts = [ 22 ];
+  # networking.firewall.allowedUDPPorts = [ 22 ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;