Pxtest (#11)

* username@hostname * font size * username spacing * home-manager and colmena * starship tweaks * home-manager import * figurine banner tweak
ironicbadger · Oct 19, 2024 · 8ec3edd · 8ec3edd
1 parent 25b1cf5
commit 8ec3edd
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 76 deletions.
diff --git a/data/iterm2/com.googlecode.iterm2.plist b/data/iterm2/com.googlecode.iterm2.plist
@@ -1037,7 +1037,7 @@
 			<key>Non-ASCII Ligatures</key>
 			<true/>
 			<key>Normal Font</key>
-			<string>FiraCodeNFM-Reg 18</string>
+			<string>FiraCodeNFM-Reg 17</string>
 			<key>Only The Default BG Color Uses Transparency</key>
 			<false/>
 			<key>Option Key Sends</key>
@@ -1120,7 +1120,7 @@
 			<key>Use Non-ASCII Font</key>
 			<true/>
 			<key>Vertical Spacing</key>
-			<real>1.04</real>
+			<real>1</real>
 			<key>Visual Bell</key>
 			<true/>
 			<key>Window Type</key>

diff --git a/data/starship.toml b/data/starship.toml
@@ -3,7 +3,7 @@
 format = """
 [](color_orange)\
 $os\
-$username\
+$username$hostname\
 [](bg:color_yellow fg:color_orange)\
 $directory\
 [](fg:color_yellow bg:color_aqua)\
@@ -71,7 +71,13 @@ RedHatEnterprise = "󱄛"
 show_always = true
 style_user = "bg:color_orange fg:color_fg0"
 style_root = "bg:color_orange fg:color_fg0"
-format = '[ $user ]($style)'
+format = '[ $user]($style)'
+
+[hostname]
+ssh_only = false
+format = "[@$hostname ]($style)"
+style = "bg:color_orange fg:color_fg0"
+disabled = false
 
 [directory]
 style = "fg:color_fg0 bg:color_yellow"

diff --git a/flake.nix b/flake.nix
@@ -45,28 +45,22 @@
         magrathea = libx.mkDarwin { hostname = "magrathea"; };
       };
 
-      nixosConfigurations = {
-        # # servers
-        # morphnix = nixosSystem "x86_64-linux" "morphnix" "alex";
-        # nix-dev = nixosSystem "x86_64-linux" "nix-dev" "alex";
-        # nixApp = nixosSystem "x86_64-linux" "nixApp" "alex";
-
-
-
-        # # use this for a blank ISO + disko to work
-        # nixos = nixosSystem "x86_64-linux" "nixos" "alex";
-      };
-
       colmena = {
         meta = {
           nixpkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
           specialArgs = {
-            inherit inputs stateVersion;
+            inherit inputs outputs stateVersion self;
           };
         };
 
+        defaults = { lib, config, name, ... }: {
+          imports = [
+            inputs.home-manager.nixosModules.home-manager
+          ];
+        };
+
         # cloud
-        ktz-cloud = import ./hosts/nixos/ktz-cloud;
+        #ktz-cloud = import ./hosts/nixos/ktz-cloud;
 
         # wd
         morphnix = import ./hosts/nixos/morphnix;

diff --git a/home/alex.nix b/home/alex.nix
@@ -46,9 +46,19 @@
   programs.starship = {
     enable = true;
     enableZshIntegration = true;
+    enableBashIntegration = true;
     settings = pkgs.lib.importTOML ./../data/starship.toml;
   };
 
+  programs.bash.enable = true;
+
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    #initExtra = (builtins.readFile ../mac-dot-zshrc);
+  };
+
   programs.tmux = {
     enable = true;
     #keyMode = "vi";
@@ -63,13 +73,6 @@
     '';
   };
 
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    #initExtra = (builtins.readFile ../mac-dot-zshrc);
-  };
-
   programs.home-manager.enable = true;
   programs.nix-index.enable = true;
 

diff --git a/hosts/nixos/ktz-cloud/default.nix b/hosts/nixos/ktz-cloud/default.nix
@@ -31,7 +31,11 @@
 
   users.users.root.openssh.authorizedKeys.keys = [''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7aI+bMjxTx7L9FRzJlk4UFCyYPzHs9Xs+vAhvPEYtk'' ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILkK1tv8BNtQJFt+n5yOJf6TQ/Ms9WkRi56MpyZOlWIk'' ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA2bSgQvelWzGLh4v1nv+OYx8YNijAikvVq4E9qXDWYN'' ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII+F3XpAIh4l8GfPgwoTqWQj0OdZRnnG9Ak4Z0wu0Upj'' ];
   users.defaultUserShell = pkgs.bash;
-  programs.bash.interactiveShellInit = "figurine -f \"3d.flf\" ktz-cloud";
+  programs.bash.interactiveShellInit = ''
+    echo \"\"
+    figurine -f \"3d.flf\" ktz-cloud"
+    echo \"\"
+  '';
 
   environment.systemPackages = with pkgs; [
     ansible

diff --git a/hosts/nixos/nix-app/default.nix b/hosts/nixos/nix-app/default.nix
@@ -25,14 +25,20 @@
   '';
   time.timeZone = "America/New_York";
 
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.users.alex = { imports = [ ./../../../home/alex.nix ]; };
+
   users.users.alex = {
     isNormalUser = true;
     description = "alex";
     extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [];
+    packages = with pkgs; [
+      home-manager
+    ];
   };
   users.defaultUserShell = pkgs.bash;
-  programs.bash.interactiveShellInit = "figurine -f \"3d.flf\" nixApp";
+  programs.bash.interactiveShellInit = "echo \"\" \n figurine -f \"3d.flf\" nixApp";
 
   environment.systemPackages = with pkgs; [
     figurine

diff --git a/lib/default.nix b/lib/default.nix
@@ -10,5 +10,6 @@ in
 {
   inherit (helpers)
     mkDarwin
-    mkNixos;
+    #mkNixos
+    ;
 }
diff --git a/lib/helpers.nix b/lib/helpers.nix
@@ -1,23 +1,5 @@
 { inputs, outputs, stateVersion, ... }:
 {
-  # untested
-  # mkNixos = { hostname, username ? "alex", system ? "x86_64-linux", }:
-  #   let
-  #     unstablePkgs = inputs.nixpkgs-unstable.legacyPackages.${system};
-  #   in
-  #     modules = [
-  #       ../common/common-packages.nix
-  #       ../common/nixos-common.nix
-  #       ../hosts/nixos/${hostname}
-  #       inputs.vscode-server.nixosModules.default
-  #       inputs.home-manager.nixosModules.home-manager {
-  #         networking.hostName = hostname;
-  #         home-manager.useGlobalPkgs = true;
-  #         home-manager.useUserPackages = true;
-  #         home-manager.users.${username} = { imports = [ ./home/${username}.nix ]; };
-  #       }
-  #     ];
-
   mkDarwin = { hostname, username ? "alex", system ? "aarch64-darwin",}:
   let
     inherit (inputs.nixpkgs) lib;

diff --git a/lib/nixos.nix b/lib/nixos.nix