small refactors for steamdeck

home/dot_config/sway/config.tmpl

@@ -219,6 +219,11 @@ mode scratch {
                             --mark files \
                             --width 71 \
                             --height 71, $e
+    bindsym d exec sway-scratchpad \
+                            --command "alacritty -e tmuxp load /home/{{ .user }}/.config/tmuxp/dot.yml" \
+                            --mark dot \
+                            --width 90 \
+                            --height 90, $e
     bindsym Shift+c move scratchpad, $e
     bindsym c scratchpad show, $e
     bindsym Escape mode default

home/dot_config/tmuxp/dot.yml

@@ -0,0 +1,11 @@
+# tmuxp config for general dev 
+
+session_name: dot
+windows:
+  - window_name: editor
+    shell_command_before:
+      - cd ~/.local/share/chezmoi
+    panes:
+      - shell_command:
+          - nvim
+  - window_name: term

provision/nixos/hosts/bulwark/configuration.nix

@@ -21,7 +21,7 @@
   nixpkgs.config.allowUnfree = true;
   nixpkgs.overlays = import ../../lib/overlays.nix;
 
-  # Use zen kernel
+  # Custom kernel is set within Jovian-Nixos
   # boot.kernelPackages = pkgs.linuxPackages_zen;
 
   # Hardware options
@@ -45,20 +45,11 @@
   time.timeZone = "America/Los_Angeles";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  # Enable sound.
-  #sound.enable = true;
-  #hardware.pulseaudio.enable = true;
-  #hardware.pulseaudio.support32Bit = true;
-
   # Add fonts
   fonts.fonts = with pkgs; [
     nerdfonts
   ];
 
-  # Enable virtualisation
-  #virtualisation.docker.enable = true;
-  #virtualisation.docker.storageDriver = "btrfs";
-
   # Enable zsh
   programs.zsh.enable = true;
 

provision/nixos/hosts/bulwark/steam-deck.nix

@@ -15,17 +15,16 @@
     };
   };
 
-    services.xserver.enable = true;
-    services.xserver.displayManager.gdm.enable = false;
-    services.xserver.desktopManager.gnome.enable = true;
-
   # Enable GNOME
+  services.xserver.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+  services.xserver.displayManager.gdm.enable = false;
+
+  # Enable sound and handle conflict (https://github.com/Jovian-Experiments/Jovian-NixOS/issues/99)
   sound.enable = true;
   hardware.pulseaudio.enable = lib.mkForce false;
 
   environment.systemPackages = with pkgs; [
-      gnome.gnome-terminal
-      gnomeExtensions.dash-to-dock
     jupiter-dock-updater-bin
     steamdeck-firmware
   ];
@@ -38,33 +37,8 @@
         screen-keyboard-enabled = true;
       };
       "org/gnome/shell" = {
-          enabled-extensions = [
-            "dash-to-dock@micxgx.gmail.com"
-          ];
         favorite-apps = ["steam.desktop"];
       };
-        # Dash to Dock settings for a better touch screen experience
-        "org/gnome/shell/extensions/dash-to-dock" = {
-          background-opacity = 0.80000000000000004;
-          custom-theme-shrink = true;
-          dash-max-icon-size = 48;
-          dock-fixed = true;
-          dock-position = "LEFT";
-          extend-height = true;
-          height-fraction = 0.60999999999999999;
-          hot-keys = false;
-          preferred-monitor = -2;
-          preferred-monitor-by-connector = "eDP-1";
-          scroll-to-focused-application = true;
-          show-apps-at-top = true;
-          show-mounts = true;
-          show-show-apps-button = true;
-          show-trash = false;
     };
   };
-    };
-<<<<<<< HEAD
-  };
-=======
->>>>>>> b936165dedb9347725fa93e35ccaecd9bd55aa68
 }