revert back to gnome console, kitty sucks

.bashrc

@@ -11,7 +11,7 @@ alias gl='git log --stat'
 # Home Manager Configuration
 alias hm='cd $HOME/dotfiles/config/home-manager/ && home-manager'
 alias hmnews='hm news --flake .#$DOTF_HOSTNAME'
-alias hmswitch='hm switch --flake .#$DOTF_HOSTNAME --impure'
+alias hmup='hm switch --flake .#$DOTF_HOSTNAME --impure'
 
 # Modern tools aliases
 alias l="eza --header --long --git --group-directories-first --group --icons --color=always --sort=name --hyperlink -o --no-permissions"

README.md

@@ -47,7 +47,7 @@ It's probably a good idea that you either reboot or log out and log back in to m
 Run the `dotf update` command, although nixos-rebuild and home-manager already ran the dotf cli didn't yet place proper symlinks for everything.
 
 ```bash
-dotf update
+source ~/.bashrc && dotf update
 ```
 
 ### 5. Setup 1Password

bin/helpers/functions.sh

@@ -229,6 +229,12 @@ check_or_make_symlink() {
     # Ensure the parent directory of the target exists
     mkdir -p "$(dirname "$TARGET")"
 
+    # if source doesn't exist it's likely a secret that hasn't been decrypted yet
+    if [ ! -e "$SOURCE" ]; then
+        printfe "%s\n" "yellow" "    - Source $SOURCE doesn't exist"
+        return
+    fi
+
     SOURCE=$(resolve_path "$SOURCE")
     TARGET=$(resolve_path "$TARGET")
 

config/config.yaml

@@ -61,6 +61,10 @@ config:
       source: ~/dotfiles/.bashrc
       target: ~/.bashrc
 
+    profile:
+      source: ~/dotfiles/.bashrc
+      target: ~/.profile
+
     # Starship config
     starship:
       source: ~/dotfiles/config/starship.toml

config/home-manager/packages/workstation/kitty.nix

@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.kitty = {
-    enable = true;
-    font = {
-      name = "Hack Nerd Font";
-      size = 14;
-    };
-
-    settings = {
-      dynamic_background_opacity = true;
-      background_opacity = "0.95";
-      background_blur = 64;
-    };
-
-    shellIntegration.enableFishIntegration = true;
-    theme = "Catppuccin-Macchiato";
-    #Also available: Catppuccin-Frappe Catppuccin-Latte Catppuccin-Macchiato Catppuccin-Mocha
-    # See all available kitty themes at: https://github.com/kovidgoyal/kitty-themes/blob/46d9dfe230f315a6a0c62f4687f6b3da20fd05e4/themes.json
-  };
-}

config/home-manager/workstation/dconf.nix

@@ -48,11 +48,17 @@
           "org.telegram.desktop.desktop"
           "spotify.desktop"
           "vesktop.desktop"
-          "kitty.desktop"
           "org.gnome.Geary.desktop"
         ];
       };
 
+      # GNOME Terminal settings
+      "org/gnome/Console" = {
+        use-system-font = false;
+        custom-font = "Hack Nerd Font 14";
+        theme = "night";
+      };
+
       # Set wallpaper
       "org/gnome/desktop/background" = {
         picture-uri-dark = "file:///${config.home.homeDirectory}/dotfiles/secrets/wp/9.png";

config/home-manager/workstation/gnome-extensions.nix

@@ -104,7 +104,6 @@
         menu-button-icon-image = 23;
         menu-button-icon-size = 24;
         menu-button-system-monitor = "missioncenter";
-        menu-button-terminal = "kitty";
         show-power-options = false;
         symbolic-icon = true;
         use-custom-icon = false;

config/home-manager/workstation/keyboard-shortcuts.nix

@@ -10,16 +10,11 @@
 
     "org/gnome/settings-daemon/plugins/media-keys" = {
       custom-keybindings = [
-        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal/"
         "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/1password-quick-access/"
         "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/missioncenter/"
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal/"
       ];
     };
-    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal" = {
-      binding = "<Primary><Alt>t";
-      command = "kitty";
-      name = "open-terminal";
-    };
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/1password-quick-access" = {
       binding = "<Ctrl><Alt>space";
       command = "1password --quick-access";
@@ -30,5 +25,10 @@
       command = "missioncenter";
       name = "missioncenter";
     };
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal" = {
+      binding = "<Ctrl><Alt>t";
+      command = "kgx";
+      name = "terminal";
+    };
   };
 }

config/nixos/users.nix

@@ -1,6 +1,7 @@
 { config, pkgs, ... }:
 {
   users.users.menno = {
+    shell = pkgs.bash;
     isNormalUser = true;
     description = "Menno van Leeuwen";
     extraGroups = [
@@ -13,6 +14,5 @@
       "video"
       "render"
     ];
-    packages = with pkgs; [ ];
   };
 }

setup.sh

@@ -172,6 +172,12 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
+# Make .profile a symlink to .bashrc
+if [ -f $HOME/.profile ]; then
+    mv $HOME/.profile $HOME/.profile.bak
+fi
+ln -s $HOME/.bashrc $HOME/.profile
+
 tput setaf 2
 echo
 echo "Setup complete. Please logout / restart to continue with 'dotf update'."
@@ -183,6 +189,6 @@ touch $HOME/.dotfiles-setup
 tput setaf 1
 echo
 echo "!!! Ensure the correct UUID is set for the boot device under your hardware configuration before rebooting !!!"
-echo "!!! Afterwards logout / restart to continue with 'dotf update' !!!"
+echo "!!! Afterwards logout / restart to continue with 'source ~/.bashrc && dotf update' !!!"
 echo
 tput sgr0