Merge branch 'master' of ssh://git.mvl.sh/vleeuwenmenno/dotfiles

.bashrc

@@ -366,7 +366,10 @@ export DOTFILES_PATH=$HOME/.dotfiles
 export PATH=$PATH:$HOME/.local/bin
 export PATH=$PATH:$HOME/.cargo/bin
 export PATH=$PATH:$DOTFILES_PATH/bin
-export PATH=$PATH:$HOME/.spicetify
+
+if [ -d "$HOME/.spicetify" ]; then
+    export PATH=$PATH:$HOME/.spicetify
+fi
 
 # Include pnpm if it exists
 if [ -d "$HOME/.local/share/pnpm" ]; then

config/ansible/inventory.ini

@@ -1,5 +1,6 @@
 [workstations]
 mennos-laptop-w ansible_connection=local
+mennos-cachyos-laptop ansible_connection=local
 mennos-desktop ansible_connection=local
 mennos-cachyos-desktop ansible_connection=local
 

config/ansible/playbook.yml

@@ -12,7 +12,7 @@
 
     - name: Include workstation tasks
       ansible.builtin.import_tasks: tasks/workstations/workstation.yml
-      when: inventory_hostname in ['mennos-laptop-w', 'mennos-desktop', 'mennos-cachyos-desktop']
+      when: inventory_hostname in ['mennos-laptop-w', 'mennos-cachyos-laptop', 'mennos-desktop', 'mennos-cachyos-desktop']
 
     - name: Include server tasks
       ansible.builtin.import_tasks: tasks/servers/server.yml

config/ansible/tasks/global/symlinks.yml

@@ -29,6 +29,7 @@
       gitconfig_mapping:
         mennos-desktop: "$DOTFILES_PATH/config/git/gitconfig.wsl"
         mennos-cachyos-desktop: "$DOTFILES_PATH/config/git/gitconfig.linux"
+        mennos-cachyos-laptop: "$DOTFILES_PATH/config/git/gitconfig.linux"
         mennos-laptop-w: "$DOTFILES_PATH/config/git/gitconfig.wsl"
         mennos-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
         mennos-cloud-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"

config/ansible/tasks/workstations/workstation.yml

@@ -24,12 +24,13 @@
       ansible.builtin.import_tasks: tasks/workstations/snaps.yml
       when: ansible_facts.packages.snapd is defined and 'microsoft-standard-WSL2' not in ansible_kernel
 
-    - name: Include Zen browser tasks
+    # Disabled for now since we are not using Zen browser anymore in favor of Brave
-      ansible.builtin.import_tasks: tasks/workstations/zen-browser.yml
+    # - name: Include Zen browser tasks
-      vars:
+    #   ansible.builtin.import_tasks: tasks/workstations/zen-browser.yml
-        browser_name: "zen"
+    #   vars:
-        browser_executable: "zen"
+    #     browser_name: "zen"
-      when: "'microsoft-standard-WSL2' not in ansible_kernel"
+    #     browser_executable: "zen"
+    #   when: "'microsoft-standard-WSL2' not in ansible_kernel"
 
     - name: Include 1Password Browsers tasks
       ansible.builtin.import_tasks: tasks/workstations/1password-browsers.yml

config/home-manager/flake.lock

@@ -57,11 +57,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1752480373,
+        "lastModified": 1752687322,
-        "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+        "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+        "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
         "type": "github"
       },
       "original": {

config/home-manager/flake.nix

@@ -47,6 +47,20 @@
           };
         };
 
+        "mennos-cachyos-laptop" = home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+          modules = [ ./home.nix ];
+          extraSpecialArgs = {
+            inherit
+              pkgs
+              pkgs-unstable
+              opnix
+              ;
+            isServer = false;
+            hostname = "mennos-cachyos-laptop";
+          };
+        };
+
         "mennos-desktop" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           modules = [ ./home.nix ];

config/home-manager/packages/common/hosts/mennos-cachyos-laptop.nix

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

config/home-manager/packages/common/packages.nix

@@ -13,6 +13,8 @@
       [ ./hosts/mennos-cachyos-desktop.nix ]
     else if hostname == "mennos-laptop-w" then
       [ ./hosts/mennos-laptop-w.nix ]
+    else if hostname == "mennos-cachyos-laptop" then
+      [ ./hosts/mennos-cachyos-laptop.nix ]
     else if hostname == "mennos-server" then
       [ ./hosts/mennos-server.nix ]
     else if hostname == "mennos-cloud-server" then

config/home-manager/packages/common/secrets.nix

@@ -39,6 +39,11 @@
         path = ".ssh/config.d/work-prod.conf";
         mode = "0644";
       };
+      tradawarePem = {
+        reference = "op://Dotfiles/Tradaware TransIP PEM/pem";
+        path = ".config/tradaware.pem";
+        mode = "0600";
+      };
     };
   };
 }