remove old nb host, switch to sddm

hosts/nb-new.cloonar.com/modules/sway/sddm-theme.conf

@@ -0,0 +1,3 @@
+background=/nix/persist/system/wallpaper.png
+backgroundFillMode=Image.Pad
+backgroundFill=#252525

hosts/nb-new.cloonar.com/modules/sway/sway.conf

@@ -187,7 +187,7 @@ bindsym $mod+F7 workspace $ws7; exec gcolor2
 bindsym $mod+F8 workspace $ws8; exec telegram
 bindsym $mod+F9 workspace $ws9; exec go-for-it
 bindsym Print                   exec --no-startup-id gnome-screenshot
-bindcode $mod+9 exec swaylock --image ~/.wallpaper.jpg
+bindcode $mod+9 exec swaylock -c 252525 -s center -i ~/.wallpaper.png
 bindsym Ctrl+Shift+Space exec 1password --quick-access
 bindsym $mod+Space exec rofi-rbw --menu-keybindings ctrl+p:copy:password
 
@@ -211,7 +211,7 @@ bindsym $mod+Shift+c reload
 bindsym $mod+Shift+r restart
 
 # manage i3 session
-bindsym $mod+Shift+e exec swaynag --background f1fa8c --border ffb86c --border-bottom-size 0 --button-background ffb86c --button-text 282a36 -t warning -f "pango:Hack 9" -m "Do you really want to exit?" -B "    Exit " "swaymsg exit" -B "    Lock " "pkill swaynag && swaylock --image ~/.wallpaper.jpg" -B "    Reboot " "pkill swaynag && reboot" -B "    Shutdown " "pkill swaynag && shutdown -h now" -B " Suspend " "pkill swaynag && systemctl suspend"
+bindsym $mod+Shift+e exec swaynag --background f1fa8c --border ffb86c --border-bottom-size 0 --button-background ffb86c --button-text 282a36 -t warning -f "pango:Hack 9" -m "Do you really want to exit?" -B "    Exit " "swaymsg exit" -B "    Lock " "pkill swaynag && swaylock -c 252525 -s center -i ~/.wallpaper.png" -B "    Reboot " "pkill swaynag && reboot" -B "    Shutdown " "pkill swaynag && shutdown -h now" -B " Suspend " "pkill swaynag && systemctl suspend"
 
 # resize window
 bindsym $mod+r mode "  "
@@ -301,8 +301,8 @@ exec nextcloud
 exec cryptomator
 exec swayidle \
  before-sleep 'loginctl lock-session $XDG_SESSION_ID' \
- lock 'swaylock --color #282a36 --image ~/.wallpaper.jpg' \
- timeout 180 'swaylock --screenshots --effect-blur 7x5' \
+ lock 'swaylock -c 252525 -s center -i ~/.wallpaper.png' \
+ timeout 180 'swaylock -c 252525 -s center -i ~/.wallpaper.png' \
  timeout 1800 'systemctl suspend'
 exec dunst
 #exec --no-startup-id swaybg -c "#000000" -m fill -i ~/.config/wallpaper/wot.jpg

hosts/nb-new.cloonar.com/modules/sway/sway.nix

@@ -3,8 +3,6 @@
 with lib;
 
 let
-  cfg = config.cloonar.sway;
-
   dbus-sway-environment = pkgs.writeTextFile {
     name = "dbus-sway-environment";
     destination = "/bin/dbus-sway-environment";
@@ -17,8 +15,8 @@ let
     '';
   };
 
-  sway-conf = builtins.readFile ./sway.conf + cfg.additionalConfig + ''
-    exec swaybg --mode center -c #252525 -i ~/.wallpaper.png
+  sway-conf = builtins.readFile ./sway.conf + ''
+    exec swaybg -m center -c 252525 -i ~/.wallpaper.png
   '';
   unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) {
     config = { allowUnfree = true; };
@@ -31,118 +29,134 @@ in {
     ./thunderbird.nix
   ];
 
-  options.cloonar.sway = {
-    additionalConfig = mkOption {
-      type = types.str;
-      default = "";
-      description = lib.mdDoc ''
-        Additional sway config
-      '';
-    };
+  hardware.sane.enable = true;
+  hardware.pulseaudio.enable = false;
+
+  virtualisation.virtualbox.host.enable = true;
+  users.extraGroups.vboxusers.members = [ "dominik" ];
+
+  services.gnome.gnome-keyring.enable = true;
+
+  services.displayManager.defaultSession = "sway";
+  services.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
+    theme = "where_is_my_sddm_theme_qt5";
   };
 
-  config = {
-    hardware.sane.enable = true;
-    hardware.pulseaudio.enable = false;
+  # services.xserver = {
+  #   enable = true;
+  #   excludePackages = [ pkgs.xterm ];
+  #   displayManager.gdm.enable = true;
+  #   displayManager.gdm.wayland = true;
+  #   # displayManager.sddm.enable = true;
+  #   displayManager.sessionPackages = [ pkgs.sway ];
+  #   displayManager.defaultSession = "sway";
+  #   libinput.enable = true;
+  # };
 
-    virtualisation.virtualbox.host.enable = true;
-    users.extraGroups.vboxusers.members = [ "dominik" ];
+  environment.systemPackages = with pkgs; [
+    alsaUtils
+    apache-directory-studio
+    bitwarden
+    bitwarden-cli
+    rofi-rbw-wayland
+    cryptomator
 
-    services.gnome.gnome-keyring.enable = true;
+    brave
+    chromium
+    firefox
+    vivaldi
 
-    environment.systemPackages = with pkgs; [
-      alsaUtils
-      apache-directory-studio
-      bitwarden
-      bitwarden-cli
-      rofi-rbw-wayland
-      cryptomator
+    unstable.cura
+    freecad
+    openscad
 
-      brave
-      chromium
-      firefox
-      vivaldi
+    (unstable.where-is-my-sddm-theme.override {
+      themeConfig.General = {
+        showUsersByDefault = true;
+        background = "/nix/persist/system/wallpaper.png";
+        backgroundFill = "#252525";
+        backgroundFillMode="Image.Pad";
+      };
+      variants = ["qt5"];
+    })
 
-      unstable.cura
-      freecad
-      openscad
+    dbus-sway-environment
+    ddev
+    dracula-theme
+    foot
+    gcc
+    git
+    glib
+    gimp
+    gnome.seahorse
+    gnome3.adwaita-icon-theme
+    go
+    grim
+    hunspell
+    hunspellDicts.de_DE
+    hunspellDicts.en_US
+    jmeter
+    libreoffice
+    mako
+    mqttui
+    networkmanagerapplet
+    nextcloud-client
+    onlyoffice-bin
+    pavucontrol
+    pcmanfm
+    pinentry
+    rbw
+    rofi-rbw
+    slurp
+    sway
+    swaybg
+    sway-launcher-desktop
+    swayidle
+    swaylock
+    thunderbird
+    unzip
+    vlc
+    waybar
+    wayland
+    wl-clipboard
+    wofi
+    wtype
+    yubikey-manager-qt
+  ];
 
-      dbus-sway-environment
-      ddev
-      dracula-theme
-      foot
-      gcc
-      git
-      glib
-      gimp
-      gnome.seahorse
-      gnome3.adwaita-icon-theme
-      go
-      grim
-      hunspell
-      hunspellDicts.de_DE
-      hunspellDicts.en_US
-      jmeter
-      libreoffice
-      mako
-      mqttui
-      networkmanagerapplet
-      nextcloud-client
-      onlyoffice-bin
-      pavucontrol
-      pcmanfm
-      pinentry
-      rbw
-      rofi-rbw
-      slurp
-      sway
-      swaybg
-      sway-launcher-desktop
-      swayidle
-      swaylock
-      thunderbird
-      unzip
-      vlc
-      waybar
-      wayland
-      wl-clipboard
-      wofi
-      wtype
-      yubikey-manager-qt
+  programs.light.enable = true;
+
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    nerdfonts
+  ];
+
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+
+  programs.sway = {
+    enable = true;
+    wrapperFeatures.gtk = true;
+    extraOptions = [
+      "--unsupported-gpu"
     ];
+  };
 
-    programs.light.enable = true;
-
-    fonts.packages = with pkgs; [
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-      nerdfonts
-    ];
-
-    security.rtkit.enable = true;
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      jack.enable = true;
-    };
-
-    programs.sway = {
-      enable = true;
-      wrapperFeatures.gtk = true;
-      extraOptions = [
-        "--unsupported-gpu"
-      ];
-    };
-
-    environment.etc = {
-      "sway/config".text = sway-conf;
-      "wofi/style.css".text = builtins.readFile ./wofi.css;
-      "xdg/waybar/config".text = builtins.readFile ./waybar.conf;
-      "xdg/waybar/style.css".text = builtins.readFile ./waybar.css;
-      "xdg/foot/foot.ini".text = builtins.readFile ./foot.ini;
-    };
+  environment.etc = {
+    "sway/config".text = sway-conf;
+    "wofi/style.css".text = builtins.readFile ./wofi.css;
+    "xdg/waybar/config".text = builtins.readFile ./waybar.conf;
+    "xdg/waybar/style.css".text = builtins.readFile ./waybar.css;
+    "xdg/foot/foot.ini".text = builtins.readFile ./foot.ini;
   };
 }