Add guard for git-sync-all for non-main branch

Only pull/push non-syncing repos (currently nixos and emacs) if on the
"main" branch, echo warning message and skip otherwise.

home/desktop.nix

@@ -0,0 +1,63 @@
+{
+  lib,
+  config,
+  pkgs,
+  catppuccinVariant ? "Mocha",
+  ...
+}: {
+  imports = [
+    ./default.nix
+    ./email/default.nix
+    ./password-store/default.nix
+    ./waybar/default.nix
+    ./rofi/default.nix
+    ./swaylock/default.nix
+    ./swaync/default.nix
+    ./avizo/default.nix
+    ./alacritty/default.nix
+    ./emacs/default.nix
+    ./obs/default.nix
+    ./cava/default.nix
+  ];
+  programs.rofi.terminal = "${config.programs.alacritty.package}/bin/alacritty";
+  services = {
+    gpg-agent.pinentryFlavor = "gtk2";
+    avizo.enable = true;
+    syncthing.enable = true;
+    udiskie = {
+      enable = true;
+      notify = true;
+      automount = true;
+      tray = "never";
+    };
+  };
+  gtk = with lib.strings; let
+    accent = "Lavender";
+    size = "Standard";
+  in {
+    enable = true;
+    iconTheme = {
+      package = pkgs.catppuccin-papirus-folders.override {
+        accent = toLower accent;
+        flavor = toLower catppuccinVariant;
+      };
+      name = "Papirus-Dark";
+    };
+    cursorTheme = let
+      variant = "${lib.strings.toLower catppuccinVariant}Dark";
+    in {
+      package = pkgs.catppuccin-cursors.${variant};
+      name = "Catppuccin-${catppuccinVariant}-Dark-Cursors";
+      size = 32;
+    };
+    theme = {
+      package = with lib.strings;
+        pkgs.catppuccin-gtk.override {
+          accents = [(toLower accent)];
+          size = toLower size;
+          variant = toLower catppuccinVariant;
+        };
+      name = "Catppuccin-${catppuccinVariant}-${size}-${accent}-Dark";
+    };
+  };
+}

home/hyprland/default.nix

@@ -5,23 +5,9 @@
   fonts,
   scheme,
   accentColour ? "base07",
-  catppuccinVariant ? "Mocha",
   ...
 }: {
-  imports = [
+  imports = [../desktop.nix];
-    ../default.nix
-    ../email/default.nix
-    ../password-store/default.nix
-    ../waybar/default.nix
-    ../rofi/default.nix
-    ../swaylock/default.nix
-    ../swaync/default.nix
-    ../avizo/default.nix
-    ../alacritty/default.nix
-    ../emacs/default.nix
-    ../obs/default.nix
-    ../cava/default.nix
-  ];
   home.packages = with pkgs; [
     (writeShellScriptBin "protonmail-setup-bridge" ''
       pkill -9 -f protonmail-bridge
@@ -29,54 +15,6 @@
       ${config.wayland.windowManager.hyprland.finalPackage}/bin/hyprctl dispatch exec "${protonmail-bridge}/bin/protonmail-bridge -n"
     '')
   ];
-  programs = {
-    rofi = with pkgs; {
-      package = rofi-wayland;
-      terminal = "${config.programs.alacritty.package}/bin/alacritty";
-      pass.package = rofi-pass-wayland;
-    };
-    zellij.settings.copy_command = "wl-copy";
-  };
-  services = {
-    gpg-agent.pinentryFlavor = "gtk2";
-    avizo.enable = true;
-    syncthing.enable = true;
-    udiskie = {
-      enable = true;
-      notify = true;
-      automount = true;
-      tray = "never";
-    };
-  };
-  gtk = with lib.strings; let
-    accent = "Lavender";
-    size = "Standard";
-  in {
-    enable = true;
-    iconTheme = {
-      package = pkgs.catppuccin-papirus-folders.override {
-        accent = toLower accent;
-        flavor = toLower catppuccinVariant;
-      };
-      name = "Papirus-Dark";
-    };
-    cursorTheme = let
-      variant = "${lib.strings.toLower catppuccinVariant}Dark";
-    in {
-      package = pkgs.catppuccin-cursors.${variant};
-      name = "Catppuccin-${catppuccinVariant}-Dark-Cursors";
-      size = 32;
-    };
-    theme = {
-      package = with lib.strings;
-        pkgs.catppuccin-gtk.override {
-          accents = [(toLower accent)];
-          size = toLower size;
-          variant = toLower catppuccinVariant;
-        };
-      name = "Catppuccin-${catppuccinVariant}-${size}-${accent}-Dark";
-    };
-  };
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
@@ -196,12 +134,10 @@
         ++ (lib.lists.forEach layers ignorealpha);
       windowrule = [
         # Workspace binds
-        "workspace 2, (firefox|chromium-browser|com.obsproject.Studio)"
         "workspace 3, (libreoffice|soffice)(.*)"
         "workspace 4, (WebCord|signal)"
-        "workspace 4, org.prismlauncher.PrismLauncher"
+        "workspace 5, org.prismlauncher.PrismLauncher"
         "workspace 5 silent, steam" # Keep silent to avoid popups taking focus
-        "workspace 6, (x2goclient|org.remmina.Remmina|Nxplayer.bin)"
 
         # Float + move system windows
         "float, org.kde.polkit-kde-authentication-agent-1|Pinentry"
@@ -298,10 +234,9 @@
 
             # Common program shortcuts
             "SUPER, Return, exec, ${alacritty.package}/bin/alacritty"
-            "SUPER SHIFT, Return, exec, ${emacs.finalPackage}/bin/emacsclient -c"
+            "SUPER, E, exec, ${emacs.finalPackage}/bin/emacsclient -c"
-            "SUPER, E, exec, [workspace 1] ${emacs.finalPackage}/bin/emacsclient -c"
+            "SUPER, W, exec, ${firefox.package}/bin/firefox"
-            "SUPER, W, exec, [workspace 2] ${firefox.package}/bin/firefox"
+            "SUPER, F, exec, ${pkgs.xfce.thunar}/bin/thunar"
-            "SUPER, F, exec, [workspace 3] ${pkgs.xfce.thunar}/bin/thunar"
 
             # Rofi binds
             "SUPER, Space, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show drun"

home/river/default.nix

@@ -0,0 +1,51 @@
+{config, ...}: {
+  imports = [../desktop.nix];
+  wayland.windowManager.river = {
+    enable = true;
+    xwayland.enable = true;
+    extraSessionVariables = {
+      QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+      QT_QPA_PLATFORM = "wayland";
+      QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+      MOZ_ENABLE_WAYLAND = "1";
+    };
+    systemd = {
+      enable = true;
+      variables = [
+        "DISPLAY"
+        "WAYLAND_DISPLAY"
+        "XDG_CURRENT_DESKTOP"
+        "NIXOS_OZONE_WL"
+        "XCURSOR_THEME"
+        "XCURSOR_SIZE"
+      ];
+    };
+    settings = {
+      # These are currently example settings
+      border-width = 2;
+      declare-mode = [
+        "locked"
+        "normal"
+        "passthrough"
+      ];
+      input = {
+        pointer-foo-bar = {
+          accel-profile = "flat";
+          events = true;
+          pointer-accel = -0.3;
+          tap = false;
+        };
+      };
+      map = {
+        normal = {
+          "Alt Q" = "close";
+        };
+      };
+      rule-add = {};
+      set-cursor-warp = "on-output-change";
+      set-repeat = "50 300";
+      spawn = [];
+      xcursor-theme = with config.gtk.cursorTheme; "${name} ${toString size}";
+    };
+  };
+}

home/rofi/default.nix

@@ -8,11 +8,13 @@
 }: {
   programs.rofi = {
     enable = true;
+    package = pkgs.rofi-wayland;
     font = fonts.monospace.name;
     location = "center";
     plugins = with pkgs; [rofi-emoji];
     pass = {
       enable = true;
+      package = pkgs.rofi-wayland;
       extraConfig = ''
         USERNAME_field='login'
       '';

home/scripts/git-sync-all.sh

@@ -46,8 +46,12 @@ for i in "${!PULL_DIRS[@]}"; do
     fi
     (
         cd "$DIRECTORY" || exit
+        if [ "$(git branch --show-current)" = "main" ]; then
             git remote set-url origin "$URL"
             git pull --ff-only
             git push
+        else
+            echo "Not syncing repo $DIRECTORY on branch $(git branch --show-current)"
+        fi
     )
 done

home/waybar/default.nix

@@ -63,7 +63,7 @@
         format = "{icon}";
         format-icons = {
           "1" = "󰟀 ";
-          "2" = "󰖟 ";
+          "2" = "󰝚 ";
           "3" = "󱧶 ";
           "4" = "󰭻 ";
           "5" = "󰹁 ";

system/desktop.nix

@@ -1,16 +1,34 @@
 {
+  lib,
   pkgs,
   user,
   ...
 }: {
-  imports = [./default.nix];
+  imports = [./default.nix ./firefox.nix];
-  environment.systemPackages = with pkgs; [
+  nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
+  environment = {
+    sessionVariables = {
+      NIXOS_OZONE_WL = "1";
+      XDG_SESSION_TYPE = "wayland";
+      GRIM_DEFAULT_DIR = "$HOME/Pictures/Grim";
+    };
+    systemPackages = with pkgs; [
+      wtype
+      wl-clipboard
+      xdg-utils
       libnotify
       libcamera
       glib
       gsettings-desktop-schemas
       hunspell
       hunspellDicts.en_GB-large
+      swayimg
+      swaylock-effects
+      pamixer
+      pavucontrol
+      playerctl
+      brightnessctl
+      mpv
       xarchiver
       libreoffice-fresh
       zathura
@@ -22,13 +40,35 @@
       remmina
       nomachine-client
     ];
+  };
   security = {
+    pam.services.swaylock = {};
     polkit.enable = true;
     rtkit.enable = true;
   };
   sound.enable = false;
   hardware.bluetooth.enable = true;
+  programs = {
+    dconf.enable = true;
+    light.enable = true;
+    noisetorch.enable = true;
+    thunar = {
+      enable = true;
+      plugins = with pkgs.xfce; [thunar-archive-plugin thunar-volman];
+    };
+  };
+  gtk.iconCache.enable = true;
+  qt = {
+    enable = true;
+    platformTheme = "gtk2";
+    style = "gtk2";
+  };
   services = {
+    blueman.enable = true;
+    gvfs = {
+      enable = true;
+      package = lib.mkForce pkgs.gnome3.gvfs;
+    };
     accounts-daemon.enable = true;
     dbus.packages = with pkgs; [gcr];
     greetd = {
@@ -46,20 +86,90 @@
       pulse.enable = true;
       wireplumber.enable = true;
     };
-    xserver.xkb = {
+    tumbler.enable = true;
+    udisks2.enable = true;
+    xserver = {
+      enable = false;
+      xkb = {
         layout = "gb";
         variant = "";
         options = "ctrl:nocaps";
       };
     };
-  programs = {
-    dconf.enable = true;
-    noisetorch.enable = true;
   };
-  gtk.iconCache.enable = true;
+  xdg = {
-  qt = {
+    portal.enable = true;
+    mime = let
+      emacs = ["emacsclient.desktop" "emacs.desktop"];
+      browser = ["firefox.desktop"];
+      applications = {
+        "inode/directory" = ["thunar.desktop"];
+        "inode/symlink" = ["thunar.desktop"];
+
+        "image/jpeg" = ["swayimg.desktop"];
+        "image/png" = ["swayimg.desktop"];
+        "video/mp4" = ["mpv.desktop"];
+
+        "text/plain" = emacs;
+        "text/richtext" = emacs;
+        "text/org" = emacs;
+        "text/markdown" = emacs;
+        "text/rust" = emacs;
+        "text/csv" = emacs;
+        "text/html" = emacs;
+        "text/css" = emacs;
+        "text/tab-separated-values" = emacs;
+
+        "text/x-emacs-lisp" = emacs;
+        "text/x-fortran" = emacs;
+        "text/x-idl" = emacs;
+        "text/x-log" = emacs;
+        "text/x-lua" = emacs;
+        "text/x-makefile" = emacs;
+        "text/x-python" = emacs;
+        "text/x-python3" = emacs;
+        "text/x-readme" = emacs;
+        "text/x-scheme" = emacs;
+        "text/x-tex" = emacs;
+        "text/x-texinfo" = emacs;
+
+        "application/json" = emacs;
+        "application/toml" = emacs;
+        "application/yaml" = emacs;
+        "application/xml" = emacs;
+        "application/rss+xml" = emacs;
+        "application/xhtml+xml" = emacs;
+        "application/oxps" = emacs;
+        "application/x-shellscript" = emacs;
+
+        "application/pdf" = ["org.pwmt.zathura.desktop"];
+        "application/epub+zip" = ["org.pwmt.zathura.desktop"];
+        "application/msword" = ["writer.desktop"];
+        "application/zip" = ["xarchiver.desktop"];
+
+        "application/x-extension-htm" = browser;
+        "application/x-extension-html" = browser;
+        "application/x-extension-shtml" = browser;
+        "application/x-extension-xhtml" = browser;
+        "application/x-extension-xht" = browser;
+        "application/x-mozilla-bookmarks" = browser;
+
+        "x-scheme-handler/http" = browser;
+        "x-scheme-handler/https" = browser;
+        "x-scheme-handler/about" = browser;
+        "x-scheme-handler/chrome" = browser;
+        "x-scheme-handler/webcal" = browser;
+        "x-scheme-handler/unknown" = emacs;
+
+        "x-scheme-handler/ms-word" = ["writer.desktop"];
+        "x-scheme-handler/ms-powerpoint" = ["impress.desktop"];
+        "x-scheme-handler/ms-excel" = ["calc.desktop"];
+      };
+    in {
       enable = true;
-    platformTheme = "gtk2";
+      defaultApplications = applications;
-    style = "gtk2";
+      addedAssociations = applications;
+      removedAssociations = {"x-scheme-handler/zoomus" = browser;};
+    };
   };
 }

system/hyprland.nix

@@ -1,136 +1,23 @@
-{
+{pkgs, ...}: {
-  lib,
+  imports = [./desktop.nix];
-  pkgs,
-  ...
-}: {
-  imports = [./desktop.nix ./firefox.nix];
-  nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
   environment = {
     sessionVariables = {
-      NIXOS_OZONE_WL = "1";
-      XDG_SESSION_TYPE = "wayland";
       XDG_SESSION_DESKTOP = "Hyprland";
       XDG_CURRENT_DESKTOP = "Hyprland";
-      GRIM_DEFAULT_DIR = "$HOME/Pictures/Grim";
     };
     systemPackages = with pkgs; [
-      wtype
-      wl-clipboard
-      xdg-utils
       hyprpaper
       hyprpicker
-      swaylock-effects
-      swayimg
-      pamixer
-      pavucontrol
-      playerctl
-      brightnessctl
-      mpv
     ];
   };
-  security.pam.services = {
+  services.greetd.settings = let
-    swaylock = {};
-    hyprlock = {};
-  };
-  services = {
-    xserver.enable = false;
-    blueman.enable = true;
-    udisks2.enable = true;
-    tumbler.enable = true;
-    gvfs = {
-      enable = true;
-      package = lib.mkForce pkgs.gnome3.gvfs;
-    };
-    greetd.settings = let
     command = "Hyprland";
   in {
     default_session = {inherit command;};
     initial_session = {inherit command;};
   };
-  };
+  programs.hyprland = {
-  xdg.portal.enable = true;
-  xdg.mime = let
-    emacs = ["emacsclient.desktop" "emacs.desktop"];
-    browser = ["firefox.desktop"];
-    applications = {
-      "inode/directory" = ["thunar.desktop"];
-      "inode/symlink" = ["thunar.desktop"];
-
-      "image/jpeg" = ["swayimg.desktop"];
-      "image/png" = ["swayimg.desktop"];
-      "video/mp4" = ["mpv.desktop"];
-
-      "text/plain" = emacs;
-      "text/richtext" = emacs;
-      "text/org" = emacs;
-      "text/markdown" = emacs;
-      "text/rust" = emacs;
-      "text/csv" = emacs;
-      "text/html" = emacs;
-      "text/css" = emacs;
-      "text/tab-separated-values" = emacs;
-
-      "text/x-emacs-lisp" = emacs;
-      "text/x-fortran" = emacs;
-      "text/x-idl" = emacs;
-      "text/x-log" = emacs;
-      "text/x-lua" = emacs;
-      "text/x-makefile" = emacs;
-      "text/x-python" = emacs;
-      "text/x-python3" = emacs;
-      "text/x-readme" = emacs;
-      "text/x-scheme" = emacs;
-      "text/x-tex" = emacs;
-      "text/x-texinfo" = emacs;
-
-      "application/json" = emacs;
-      "application/toml" = emacs;
-      "application/yaml" = emacs;
-      "application/xml" = emacs;
-      "application/rss+xml" = emacs;
-      "application/xhtml+xml" = emacs;
-      "application/oxps" = emacs;
-      "application/x-shellscript" = emacs;
-
-      "application/pdf" = ["org.pwmt.zathura.desktop"];
-      "application/epub+zip" = ["org.pwmt.zathura.desktop"];
-      "application/msword" = ["writer.desktop"];
-      "application/zip" = ["xarchiver.desktop"];
-
-      "application/x-extension-htm" = browser;
-      "application/x-extension-html" = browser;
-      "application/x-extension-shtml" = browser;
-      "application/x-extension-xhtml" = browser;
-      "application/x-extension-xht" = browser;
-      "application/x-mozilla-bookmarks" = browser;
-
-      "x-scheme-handler/http" = browser;
-      "x-scheme-handler/https" = browser;
-      "x-scheme-handler/about" = browser;
-      "x-scheme-handler/chrome" = browser;
-      "x-scheme-handler/webcal" = browser;
-      "x-scheme-handler/unknown" = emacs;
-
-      "x-scheme-handler/ms-word" = ["writer.desktop"];
-      "x-scheme-handler/ms-powerpoint" = ["impress.desktop"];
-      "x-scheme-handler/ms-excel" = ["calc.desktop"];
-    };
-  in {
-    enable = true;
-    defaultApplications = applications;
-    addedAssociations = applications;
-    removedAssociations = {"x-scheme-handler/zoomus" = browser;};
-  };
-  programs = {
-    dconf.enable = true;
-    light.enable = true;
-    thunar = {
-      enable = true;
-      plugins = with pkgs.xfce; [thunar-archive-plugin thunar-volman];
-    };
-    hyprland = {
     enable = true;
     xwayland.enable = true;
   };
-  };
 }

system/river.nix

@@ -0,0 +1,7 @@
+{...}: {
+  imports = [./desktop.nix];
+  programs.river = {
+    enable = true;
+    extraPackages = [];
+  };
+}