Misc fixes (mostlt for Legion)

Move stylix config up to flake.nix as config wouldn't build without it,
also move wallpapers directory up to top level to match

Only enable git-sync where it's defined, rather than in home/default.nix

flake.nix

@@ -123,6 +123,55 @@
                 ];
               system = { inherit stateVersion; };
               networking = { inherit hostName; };
+              stylix = {
+                image = ./wallpapers/default.jpg;
+                base16Scheme =
+                  "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
+                polarity = "dark";
+                opacity = {
+                  popups = 0.8;
+                  terminal = 0.8;
+                };
+                fonts = rec {
+                  emoji = {
+                    name = "Noto Color Emoji";
+                    package = pkgs.noto-fonts-emoji;
+                  };
+                  monospace = {
+                    name = "Fira Mono";
+                    package = pkgs.fira-mono;
+                  };
+                  sansSerif = {
+                    name = "Fira Sans";
+                    package = pkgs.fira;
+                  };
+                  serif = sansSerif;
+                };
+                homeManagerIntegration.followSystem = true;
+              };
+              fonts = {
+                packages = with pkgs; [
+                  fira
+                  fira-mono
+                  fira-code
+                  fira-code-symbols
+                  (nerdfonts.override { fonts = [ "FiraCode" ]; })
+                  noto-fonts
+                  noto-fonts-cjk
+                  noto-fonts-emoji
+                  liberation_ttf
+                  emacs-all-the-icons-fonts
+                ];
+                fontconfig = {
+                  enable = true;
+                  defaultFonts = rec {
+                    sansSerif = [ "Fira Sans" "DejaVu Sans" ];
+                    serif = sansSerif;
+                    monospace = [ "Fira Mono" "DejaVu Sans Mono" ];
+                    emoji = [ "Noto Color Emoji" "Noto Emoji" ];
+                  };
+                };
+              };
               users.users.${user} = {
                 inherit group;
                 isNormalUser = true;

home/default.nix

@@ -1,7 +1,6 @@
 { config, lib, pkgs, tokyonight-folke, gitui, ... }:
 
 {
-  services.git-sync.enable = true;
   programs = {
     bash.enable = true;
     readline = {

home/pass.nix

@@ -25,9 +25,12 @@
         no-allow-external-cache
       '';
     };
-    git-sync.repositories.password-store = {
+    git-sync = {
+      enable = true;
+      repositories.password-store = {
         path = "${config.home.homeDirectory}/.password-store";
         uri = "git+https://git.xenia.me.uk/xenia/pass.git";
       };
     };
+  };
 }

system/desktop.nix

@@ -19,54 +19,7 @@
     remmina
     nomachine-client
   ];
-  stylix = {
-    image = ./wallpapers/default.jpg;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
-    polarity = "dark";
-    opacity = {
-      popups = 0.8;
-      terminal = 0.8;
-    };
-    fonts = rec {
-      emoji = {
-        name = "Noto Color Emoji";
-        package = pkgs.noto-fonts-emoji;
-      };
-      monospace = {
-        name = "Fira Mono";
-        package = pkgs.fira-mono;
-      };
-      sansSerif = {
-        name = "Fira Sans";
-        package = pkgs.fira;
-      };
-      serif = sansSerif;
-    };
-    homeManagerIntegration.followSystem = true;
-  };
-  fonts = {
-    packages = with pkgs; [
-      fira
-      fira-mono
-      fira-code
-      fira-code-symbols
-      (nerdfonts.override { fonts = [ "FiraCode" ]; })
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-      liberation_ttf
-      emacs-all-the-icons-fonts
-    ];
-    fontconfig = {
-      enable = true;
-      defaultFonts = rec {
-        sansSerif = [ "Fira Sans" "DejaVu Sans" ];
-        serif = sansSerif;
-        monospace = [ "Fira Mono" "DejaVu Sans Mono" ];
-        emoji = [ "Noto Color Emoji" "Noto Emoji" ];
-      };
-    };
-  };
+
   security = {
     rtkit.enable = true;
     pam.services.gtklock.enableGnomeKeyring = true;