Move dconf setup to desktop/default.nix, make some more sway options sensible defaults

.rsyncignore

@@ -2,4 +2,3 @@
 .pre-commit-config.yaml
 .stylua.toml
 Makefile
-nvim/

desktop/default.nix

@@ -0,0 +1,4 @@
+{...}: {
+  console.keyMap = "uk";
+  programs.dconf.enable = true;
+}

desktop/hyprland.nix

@@ -1,4 +1,5 @@
 {pkgs, ...}: {
+  imports = [./default.nix];
   nixpkgs.overlays = [
     (self: super: {
       waybar = super.waybar.overrideAttrs (oldAttrs: {

desktop/xfce-bspwm.nix

@@ -1,8 +1,5 @@
 {pkgs, ...}: {
-  imports = [
+  imports = [./sddm.nix];
-    ./xserver.nix
-    ./sddm.nix
-  ];
   services.xserver = {
     enable = true;
     desktopManager = {

desktop/xfce.nix

@@ -1,8 +1,5 @@
 {pkgs, ...}: {
-  imports = [
+  imports = [./sddm.nix];
-    ./xserver.nix
-    ./sddm.nix
-  ];
   services.xserver = {
     enable = true;
     desktopManager.xfce.enable = true;

desktop/xserver.nix

@@ -1,9 +1,8 @@
 {...}: {
+  imports = [./default.nix];
   services.xserver = {
     enable = true;
     layout = "gb";
     xkbVariant = "";
   };
-  console.keyMap = "uk";
-  programs.dconf.enable = true;
 }

home/desktop/sway.nix

@@ -8,7 +8,7 @@
   term = config.wayland.windowManager.sway.config.terminal;
 in {
   imports = [
-    # ./swaylock.nix
+    ./swaylock.nix
     # ./eww.nix
     ./waybar.nix
     ./gtk.nix
@@ -27,11 +27,18 @@ in {
   wayland.windowManager.sway = {
     enable = true;
     config = {
+      input."*".xkb_layout = "gb";
+      output."*".bg = "~/nixos/wallpaper.jpg fill";
       fonts = {
         names = ["FiraCode Nerd Font" "FiraCode Nerd Font Mono"];
         size = 12.0;
       };
+      gaps = {
+        inner = lib.mkDefault 5;
+        outer = lib.mkDefault 20;
+      };
       bars = [];
+      startup = [{command = "dunst";} {command = "waybar";}];
       modifier = lib.mkDefault "Mod4";
       terminal = lib.mkDefault "${pkgs.wezterm}/bin/wezterm";
       keybindings = lib.mkOptionDefault {

machines/J0162/elitherl.nix

@@ -1,5 +1,9 @@
 {pkgs, ...}: {
-  imports = [../../home/work.nix ../../home/gui ../../home/desktop/hyprland.nix];
+  imports = [
+    ../../home/work.nix
+    ../../home/gui
+    ../../home/desktop/hyprland.nix
+  ];
   home.username = "elitherl";
   home.homeDirectory = "/home/elitherl";
   home.stateVersion = "22.11";
@@ -11,9 +15,11 @@
     zoom-us
   ];
 
-  wayland.windowManager.hyprland.extraConfig = ''source=./common.conf 
+  wayland.windowManager.hyprland.extraConfig = ''
-  monitor=eDP-1,preferred,auto,1.00
+    source=./common.conf
+    monitor=eDP-1,preferred,auto,1.00
   '';
+  # wayland.windowManager.sway.config.output.eDP-1.scale = "1.0";
   programs.waybar.settings.main = {
     "modules-left" = ["wlr/workspaces"];
     "modules-center" = ["clock"];

machines/Vanguard/xenia.nix

@@ -12,22 +12,9 @@
   #   source=./common.conf
   #   monitor=HDMI-A-2,preferred,auto,2.00
   # '';
-  wayland.windowManager.sway = {
+  wayland.windowManager.sway.config = {
-    config = {
+    output.HDMI-A-2.scale = "2.0";
-      input = {"*" = {xkb_layout = "gb";};};
+    startup = [{command = "steam";}];
-      modifier = "Mod4";
-      output = {
-        HDMI-A-2 = {
-          scale = "2.0";
-          bg = "~/nixos/wallpaper.jpg fill";
-        };
-      };
-      gaps = {
-        inner = 5;
-        outer = 20;
-      };
-      startup = [{command = "dunst";} {command = "waybar";} {command = "steam";}];
-    };
   };
   programs.waybar.settings.main = {
     "modules-left" = ["sway/workspaces"];