🐋 (neodymium/system) fix podman config to enable podman config

move hyprland and eww into sub modules
fix swayidle and swaylock configs

hosts/hydrogen/system/packages/default.nix

@@ -1 +1 @@
-{ pkgs, ... }: { environment.systemPackages = with pkgs; [ htop borgbackup ]; }
+{ pkgs, ... }: { environment.systemPackages = with pkgs; [ btop borgbackup ]; }

hosts/neodymium/home/packages.nix

@@ -11,7 +11,6 @@
     feh # image viewer
     gnome.nautilus # file explorer
     grim # screenshot utils
-    htop # replacement for top
     jaq # (fast) json utils
     jmtpfs # for Android MTP
     keepassxc # password manager
@@ -26,13 +25,11 @@
     rsync # better scp
     slurp # region selector
     socat # socket cat
-    swaybg # wayland background
-    swayidle # wayland idle hooks
-    swaylock # wayland lockscreen
     thunderbird # mail client
     tmux # terminal multiplexer
     webcord-vencord # discord client
     wl-clipboard # clipboard utils
     xdg-utils
+    sysz # better systemctl
   ];
 }

hosts/neodymium/home/shell/btop.nix

@@ -0,0 +1,26 @@
+{ pkgs, ... }:
+let
+  catppuccin-btop = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "btop";
+    rev = "c6469190f2ecf25f017d6120bf4e050e6b1d17af";
+    sha256 = "sha256-jodJl4f2T9ViNqsY9fk8IV62CrpC5hy7WK3aRpu70Cs=";
+  };
+in {
+
+  xdg.configFile."btop/themes".source = "${catppuccin-btop}/themes";
+
+  programs.btop = {
+    enable = true;
+
+    settings = {
+      theme_background = false;
+      color_theme = "catppuccin_mocha";
+
+      clock_format = "%Y-%m-%d %X";
+    };
+  };
+
+  programs.zsh.shellAliases = { htop = "btop"; };
+
+}

hosts/neodymium/home/shell/default.nix

@@ -1,4 +1,11 @@
 { ... }: {
-  imports =
-    [ ./atuin.nix ./bat.nix ./direnv.nix ./exa.nix ./git.nix ./zsh.nix ];
+  imports = [
+    ./atuin.nix
+    ./bat.nix
+    ./btop.nix
+    ./direnv.nix
+    ./exa.nix
+    ./git.nix
+    ./zsh.nix
+  ];
 }

hosts/neodymium/home/wayland/default.nix

@@ -8,11 +8,7 @@ let
   };
 in {
 
-  programs.eww = {
-    enable = true;
-    package = pkgs.eww-wayland;
-    configDir = ./eww;
-  };
+  imports = [ ./hyprland ./eww ];
 
   services.mako = {
     enable = true;
@@ -20,10 +16,61 @@ in {
     extraConfig = builtins.readFile "${catppuccin-mako}/src/mocha";
   };
 
-  wayland.windowManager.hyprland = {
+  services.swayidle = {
     enable = true;
-    recommendedEnvironment = true;
-    extraConfig = builtins.readFile ./hyprland.conf;
+    systemdTarget = "hyprland-session.target";
+    events = [
+      {
+        event = "after-resume";
+        command = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on";
+      }
+      {
+        event = "before-sleep";
+        command = "${pkgs.swaylock-effects}/bin/swaylock -f";
+      }
+    ];
+    timeouts = [
+      {
+        timeout = 120;
+        command = "${pkgs.swaylock-effects}/bin/swaylock -f --grace 3";
+      }
+      {
+        timeout = 150;
+        command = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off";
+      }
+      {
+        timeout = 300;
+        command = "${pkgs.systemd}/bin/systemctl suspend";
+      }
+    ];
+  };
+
+  programs.swaylock = {
+    enable = true;
+    package = pkgs.swaylock-effects;
+    settings = {
+      image = "/home/laurent/Pictures/wallpapers/kai-oberhauser-unsplash.jpg";
+
+      clock = true;
+      timestr = "%T";
+      datestr = "%F";
+
+      indicator = true;
+      indicator-radius = 100;
+      indicator-thickness = 7;
+
+      effect-blur = "7x5";
+      effect-vignette = "0.5:0.5";
+
+      ring-color = "bb00cc";
+      key-hl-color = "880033";
+
+      line-color = "00000000";
+      inside-color = "00000088";
+      separator-color = "00000000";
+
+      text-color = "fffffff";
+    };
   };
 
 }

hosts/neodymium/home/wayland/eww/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  programs.eww = {
+    enable = true;
+    package = pkgs.eww-wayland;
+    configDir = ./.;
+  };
+}

hosts/neodymium/home/wayland/hyprland/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }: {
+  wayland.windowManager.hyprland = {
+    enable = true;
+    recommendedEnvironment = true;
+
+    extraConfig = ''
+      exec-once=env XDG_CACHE_HOME=/tmp eww open bar
+      exec-once=${pkgs.swaybg}/bin/swaybg -i ~/Pictures/wallpapers/kai-oberhauser-unsplash.jpg
+      exec-once=mako
+      exec-once=element-desktop
+      exec-once=thunderbird
+      exec-once=webcord
+      exec-once=gnome-keyring-daemon --start --components=secrets
+    '' + builtins.readFile ./hyprland.conf;
+  };
+}

hosts/neodymium/home/wayland/hyprland/hyprland.conf

@@ -5,7 +5,14 @@ monitor=eDP-1,1920x1080@120,0x0,1
 
 
 # Execute your favorite apps at launch
-exec-once = env XDG_CACHE_HOME=/tmp eww open bar & swaybg -i ~/Pictures/wallpapers/kai-oberhauser-unsplash.jpg & mako & element-desktop & thunderbird & webcord & swayidle -w timeout 100 'swaylock -f --grace 3' timeout 130 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' timeout 300 'systemctl suspend' before-sleep 'swaylock -f' & gnome-keyring-daemon --start --components=secrets
+# exec-once = env XDG_CACHE_HOME=/tmp eww open bar & \
+#   swaybg -i ~/Pictures/wallpapers/kai-oberhauser-unsplash.jpg & \
+#   swayidle -w & \
+#   mako & \
+#   element-desktop & \
+#   thunderbird & \
+#   webcord & \
+#   gnome-keyring-daemon --start --components=secrets
 
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
@@ -82,8 +89,13 @@ gestures {
 }
 
 misc {
+  # no thanks
   disable_hyprland_logo = true
   disable_splash_rendering = true
+
+  # turn on screen when mouse moves or key is pressed
+  mouse_move_enables_dpms = true
+  key_press_enables_dpms = true
 }
 
 # https://wiki.hyprland.org/Configuring/Window-Rules/

hosts/neodymium/system/docker/default.nix

@@ -3,6 +3,9 @@
     enable = true;
 
     dockerCompat = true;
+    dockerSocket.enable = true;
+    defaultNetwork.settings.dns_enabled =
+      true; # required by networks in compose
     autoPrune.enable = true;
   };
 }