modules/home/alacritty/default.nix

@@ -35,6 +35,6 @@ in
       ".config/alacritty/alacritty.toml".source = ./alacritty.toml;
     };
 
-    home.sessionVariables.TERMINAL = "alacritty";
+    systemd.user.sessionVariables.TERMINAL = "alacritty";
   };
 }

modules/home/desktop/default.nix

@@ -26,7 +26,7 @@ in
   ];
 
   config = lib.mkIf cfg.enable {
-    # home.sessionVariables.GTK_THEME = "Catppuccin-Mocha-Compact-Blue-dark";
+    # systemd.user.sessionVariables.GTK_THEME = "Catppuccin-Mocha-Compact-Blue-dark";
     prism = {
       enable = true;
       wallpapers = ./wallpapers;

modules/home/hyprland/default.nix

@@ -46,8 +46,7 @@ in
       # hyprpicker # TODO
       # hyprcursor # TODO
       brightnessctl
-      # grimblast
+      grimblast
-      frajul.hyprshot-gui
     ];
 
     # services.hypridle = {
@@ -217,7 +216,7 @@ in
           "$mod, Escape, exec, wlogout -p layer-shell"
           "$mod, TAB, exec, hyprlock"
           "$mod SHIFT, R, exec, hyprctl reload"
-          ", Print, exec, hyprshot-gui"
+          ", Print, exec, grimblast --notify copysave area"
 
           # "$mod SHIFT, E, exec, pkill Hyprland"
           # "$mod, G, togglegroup,"

modules/home/kitty/default.nix

@@ -43,6 +43,6 @@ in
       };
     };
 
-    home.sessionVariables.TERMINAL = "kitty";
+    systemd.user.sessionVariables.TERMINAL = "kitty";
   };
 }

modules/home/wezterm/default.nix

@@ -47,7 +47,7 @@ in
       '';
     };
 
-    home.sessionVariables.TERMINAL = "wezterm-start-here";
+    systemd.user.sessionVariables.TERMINAL = "wezterm-start-here";
 
     # Otherwise wezterm does not start in directory of parent process
     home.packages = [

modules/nixos/greetd/default.nix

@@ -21,19 +21,32 @@
 }:
 
 let
-  cfg = config.modules.gdm;
+  cfg = config.modules.greetd;
 in
 {
-  options.modules.gdm = {
+  options.modules.greetd = {
     enable = lib.mkOption { default = false; };
   };
 
   config = lib.mkIf cfg.enable {
-    services.xserver.displayManager.gdm = {
+    # greetd display manager
+    services.greetd =
+      let
+        session = {
+          command = "${lib.getExe config.programs.hyprland.package}";
+          user = "julian";
+        };
+      in
+      {
         enable = true;
+        settings = {
+          terminal.vt = 1;
+          default_session = session;
+          initial_session = session;
+        };
       };
 
     # unlock GPG keyring on login
-    security.pam.services.gdm.enableGnomeKeyring = true;
+    security.pam.services.greetd.enableGnomeKeyring = true;
   };
 }

modules/nixos/hyprland/default.nix

@@ -33,6 +33,5 @@ in
     # programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland; # does only work with nixos-unstable
     programs.hyprland.xwayland.enable = true;
     security.pam.services.hyprlock = { };
-    services.displayManager.defaultSession = "hyprland";
   };
 }

modules/nixos/tuigreet/default.nix

@@ -1,57 +0,0 @@
-{
-  # Snowfall Lib provides a customized `lib` instance with access to your flake's library
-  # as well as the libraries available from your flake's inputs.
-  lib,
-  # An instance of `pkgs` with your overlays and packages applied is also available.
-  pkgs,
-  # You also have access to your flake's inputs.
-  inputs,
-
-  # Additional metadata is provided by Snowfall Lib.
-  namespace, # The namespace used for your flake, defaulting to "internal" if not set.
-  system, # The system architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
-  format, # A normalized name for the system target (eg. `iso`).
-  virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
-  systems, # An attribute map of your defined hosts.
-
-  # All other arguments come from the module system.
-  config,
-  ...
-}:
-
-let
-  cfg = config.modules.tuigreet;
-in
-{
-  options.modules.tuigreet = {
-    enable = lib.mkOption { default = false; };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.greetd = {
-      enable = true;
-      settings = {
-        default_session = {
-          command = "${lib.getExe pkgs.greetd.tuigreet} --time --remember --remember-session --cmd hyprland";
-          user = "greeter";
-        };
-      };
-    };
-
-    # https://www.reddit.com/r/NixOS/comments/u0cdpi/tuigreet_with_xmonad_how/
-    systemd.services.greetd.serviceConfig = {
-      Type = "idle";
-      StandardInput = "tty";
-      StandardOutput = "tty";
-      StandardError = "journal"; # Without this errors will spam on screen
-      # Without these bootlogs will spam on screen
-      TTYReset = true;
-      TTYVHangup = true;
-      TTYVTDisallocate = true;
-    };
-
-    # unlock GPG keyring on login
-    security.pam.services.greetd.enableGnomeKeyring = true;
-  };
-}

packages/hyprshot-gui/default.nix

@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkgs,
-  ...
-}:
-
-stdenv.mkDerivation rec {
-  pname = "hyprshot-gui";
-  version = "2023-10-20";
-
-  src = fetchFromGitHub {
-    owner = "ThatOneCalculator";
-    repo = pname;
-    rev = "30a9bc377c1c0a3ad05c63945f2fe92709a99d7b";
-    sha256 = "sha256-XUy6+mFbNL+3zDfS4tWva4DiJeLnRM9S8ECRayTcPfI=";
-  };
-
-  nativeBuildInputs = with pkgs; [ makeWrapper ];
-
-  buildInputs = with pkgs; [
-    bash
-    hyprshot
-    gnome.zenity
-  ];
-
-  dontBuild = true;
-  installPhase = ''
-    mkdir -p $out/bin
-    cp hyprshot-gui $out/bin/hyprshot-gui
-    wrapProgram $out/bin/hyprshot-gui --prefix PATH : '${lib.makeBinPath buildInputs}'
-  '';
-
-  meta = with lib; {
-    description = "A simple shell script";
-    homepage = "https://github.com/ThatOneCalculator/hyprshot-gui";
-    platforms = platforms.all;
-    mainProgram = "hyprshot-gui";
-    # maintainers
-  };
-}

systems/x86_64-linux/aspi/default.nix

@@ -73,13 +73,9 @@
     locales.enable = true;
     # thunar.enable = true;
     pcmanfm.enable = true;
-
-    # i3.enable = true;
-    # gdm.enable = true;
-
     wayland.enable = true;
     hyprland.enable = true;
-    tuigreet.enable = true;
+    # i3.enable = true;
   };
 
   nix.settings.auto-optimise-store = true;
@@ -104,11 +100,15 @@
   hardware.opengl.enable = true;
 
   services.xserver.wacom.enable = true;
-
+  # services.xserver.xautolock = { # TODO: does not work
-  services.xserver = {
+  #   enable = true;
-    enable = true;
+  #   time = 1;
+  # };
 
   # Configure keymap in X11
+  services.xserver = {
+    enable = true;
+    displayManager.gdm.enable = true;
     xkb.layout = "de";
     xkb.variant = "";
   };
@@ -119,6 +119,8 @@
     options = "--delete-older-than 30d";
   };
 
+  security.pam.services.gdm.enableGnomeKeyring = true;
+
   services.blueman.enable = true;
   services.upower.enable = true;