feat: changed some shit up

flake.nix

@@ -16,15 +16,14 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty = {
-      url = "github:clo4/ghostty-hm-module";
+      url = "github:ghostty-org/ghostty";
     };
     nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
-    # edgedb = {
+    edgedb = {
-    #   url = "github:edgedb/packages-nix";
+      url = "github:edgedb/packages-nix";
-    #   inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
-    #   inputs.flake-parts.follows = "flake-parts";
+      inputs.flake-parts.follows = "flake-parts";
-    # };
+    };
-
     nur = {
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -39,15 +38,43 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    yazi = {
+    yazi.url = "github:sxyazi/yazi";
-      url = "github:sxyazi/yazi";
+    helix = {
+      url = "github:helix-editor/helix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hyprland = {
+      url = "github:hyprwm/Hyprland";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hypridle = {
+      url = "github:hyprwm/hypridle";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hyprlock = {
+      url = "github:hyprwm/hyprlock";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    wpaperd = {
+      url = "github:danyspin97/wpaperd";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    waybar = {
+      url = "github:Alexays/Waybar";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    direnv = {
+      url = "github:direnv/direnv";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    helix.url = "github:helix-editor/helix";
   };
 
   outputs = inputs:
-    inputs.flake-parts.lib.mkFlake {inherit inputs;} {
+    inputs.flake-parts.lib.mkFlake {
+      inherit
+        inputs
+        ;
+    } {
       imports = [
         inputs.pre-commit-hooks-nix.flakeModule
         ./home

home/default.nix

@@ -89,7 +89,7 @@ in {
           dunst
           easyEffects
           gammastep
-          hyprland
+          hypr
           misc-hyprland
           network
           swaylock

home/modules/direnv.nix

@@ -1,6 +1,11 @@
 {
+  flake,
+  pkgs,
+  ...
+}: {
   programs.direnv = {
     enable = true;
+    package = flake.inputs.direnv.packages.${pkgs.system}.default;
     nix-direnv.enable = true;
   };
 }

home/modules/flameshot.nix

@@ -3,8 +3,9 @@
     enable = true;
     settings = {
       General = {
-        disabledTrayIcon = false;
+        disabledTrayIcon = true;
         showStartupLaunchMessage = false;
+        disabledGrimWarning = true;
       };
     };
   };

home/modules/ghostty/default.nix

@@ -18,6 +18,7 @@
 in {
   programs.ghostty = {
     enable = true;
+    package = flake.inputs.ghostty.packages.${pkgs.system}.default;
     settings = settingsPath;
     themes = themesPath;
   };

home/modules/helix/default.nix

@@ -1,11 +1,15 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  flake,
+  ...
+}: {
   programs.helix = let
     configPath = ./config;
     settingsPath = import (configPath + /settings.nix);
     languagesPath = import (configPath + /languages.nix);
   in {
     enable = true;
-    package = pkgs.helix;
+    package = flake.inputs.helix.packages.${pkgs.system}.default;
     languages = languagesPath;
     settings = settingsPath;
   };

home/modules/hypr/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./idle
+    ./land
+    ./wpaperd
+  ];
+}

home/modules/hypr/idle/config/settings.nix

@@ -0,0 +1,22 @@
+{pkgs, ...}: {
+  general = {
+    lock_cmd = "pidof swaylock || swaylock";
+    before_sleep_cmd = "loginctl lock-session";
+  };
+  listener = [
+    {
+      timeout = 150;
+      on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -s set 0";
+      on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -r";
+    }
+    {
+      timeout = 150;
+      on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -sd rgb:kbd_backlight set 0";
+      on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -rd rgb:kbd_backlight";
+    }
+    {
+      timeout = 300;
+      on-timeout = "systemctl suspend";
+    }
+  ];
+}

home/modules/hypr/idle/default.nix

@@ -0,0 +1,18 @@
+{
+  flake,
+  pkgs,
+  ...
+}: let
+  configPath = ./config;
+  settingsPath = import (configPath + /settings.nix) {
+    inherit
+      pkgs
+      ;
+  };
+in {
+  services.hypridle = {
+    enable = true;
+    package = flake.inputs.hypridle.packages.${pkgs.system}.hypridle;
+    settings = settingsPath;
+  };
+}

home/modules/hypr/land/config/animations.nix

@@ -0,0 +1,18 @@
+{
+  enabled = true;
+  animation = [
+    "border, 1, 2.2, bounce"
+    "fadeIn, 1, 1, bounce"
+    "fadeOut, 1, 4.5, bounce"
+    "fadeSwitch, 1, 2.2, bounce"
+    "windows, 1, 2.2, bounce"
+    "windowsOut, 1, 1.1, bounce"
+    "workspaces, 1, 2.2, bounce, slide"
+  ];
+  bezier = [
+    "wind, 0, 1, 0.5, 1"
+    "winIn, 0, 0.5, 0, 1"
+    "winOut, 0, 0.5, 0, 1"
+    "bounce, 0.7, 1.7, 0.5, 1"
+  ];
+}

home/modules/hypr/land/config/bind.nix

@@ -45,8 +45,7 @@ let
 
   superShiftBinds = builtins.map (x: "SUPER SHIFT, " + x) [
     # Super+shift binds
-    "S, exec, hyprshot -m region"
+    "S, exec, flameshot gui"
-    "W, exec, hyprshot -m window"
     "Print, exec, grim -g \"$(slurp)\""
     "ScrollDown, workspace, previous"
     "left , movewindow, l"

home/modules/hypr/land/config/bindl.nix

@@ -0,0 +1,4 @@
+[
+  ",switch:on:Lid Switch, exec, hyprlock --immediate"
+  ",switch:off:Lid Switch, exec, hyprlock --immediate"
+]

home/modules/hypr/land/config/decoration.nix

@@ -1,6 +1,6 @@
 {
   active_opacity = 0.95;
-  inactive_opacity = 0.95;
+  inactive_opacity = 0.90;
   fullscreen_opacity = 1;
   rounding = 10;
   dim_inactive = 1;

home/modules/hypr/land/config/exec-once.nix

@@ -11,6 +11,7 @@
   "easyeffects"
   "pkill easyeffects"
   "emote"
+  "flameshot"
   "sgsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"
   "gsettings set org.gnome.desktop.interface cursor-size 18"
 ]

home/modules/hypr/land/config/windowrulev2.nix

@@ -4,6 +4,7 @@ let
   nomacs = "(org.nomacs.ImageLounge)";
   mpv = "(mpv)";
   emote = "(emote)";
+  flameshot = "(flameshot)";
 
   maxsizeWindows = [
     "maxsize 640 640, class:^${blueman}$"
@@ -17,6 +18,7 @@ let
     "class:${emote}"
     "class:${mpv}"
     "class:${nomacs}"
+    "class:${flameshot}"
     "title:^(Picture-in-Picture)$"
   ];
 

home/modules/hypr/land/default.nix

@@ -1,11 +1,15 @@
-{pkgs, ...}: let
+{
+  pkgs,
+  flake,
+  ...
+}: let
   configPath = ./config;
   configImports = {
-    animation = import (configPath + /animation.nix);
+    animations = import (configPath + /animations.nix);
-    bezier = import (configPath + /bezier.nix);
     bind = import (configPath + /bind.nix);
     bindm = import (configPath + /bindm.nix);
     binds = import (configPath + /binds.nix);
+    bindl = import (configPath + /bindl.nix);
     decoration = import (configPath + /decoration.nix);
     dwindle = import (configPath + /dwindle.nix);
     exec-once = import (configPath + /exec-once.nix);
@@ -18,10 +22,9 @@
 in {
   wayland.windowManager.hyprland = {
     enable = true;
-    # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland;
     xwayland.enable = true;
     systemd.enable = false;
     settings = configImports;
   };
-  xdg.configFile."wpaperd/wallpaper.toml".source = pkgs.lib.mkForce ./wpaperd/wallpaper.toml;
 }

home/modules/hypr/wpaperd/default.nix

@@ -0,0 +1,18 @@
+{
+  flake,
+  pkgs,
+  ...
+}: {
+  programs.wpaperd = {
+    enable = true;
+    package = flake.inputs.wpaperd.packages.${pkgs.system}.default;
+    settings = {
+      "default" = {
+        path = "~/Files/Projects/dotfiles/home/modules/hypr/wpaperd/wallpaper";
+        apply-shadow = true;
+        duration = "1m";
+        sorting = "random";
+      };
+    };
+  };
+}

home/modules/hyprland/config/animation.nix

@@ -1,9 +0,0 @@
-[
-  "border, 1, 2.2, bounce"
-  "fadeIn, 1, 0.1, bounce"
-  "fadeOut, 1, 4.5, bounce"
-  "fadeSwitch, 1, 2.2, bounce"
-  "windows, 1, 2.2, bounce"
-  "windowsOut, 1, 1.1, bounce"
-  "workspaces, 1, 2.2, bounce, slide"
-]

home/modules/hyprland/config/bezier.nix

@@ -1,6 +0,0 @@
-[
-  "wind, 0, 1, 0.5, 1"
-  "winIn, 0, 0.5, 0, 1"
-  "winOut, 0, 0.5, 0, 1"
-  "bounce, 0.7, 1.7, 0.5, 1"
-]

home/modules/hyprland/wpaperd/wallpaper.toml

@@ -1,5 +0,0 @@
-[default]
-path = "~/Files/Projects/dotfiles/home/modules/hyprland/wpaperd/wallpaper"
-duration = "1m"
-sorting = "random"
-apply-shadow = false

home/modules/misc/hyprland.nix

@@ -4,10 +4,9 @@
       (pkgs)
       alsa-utils
       wl-clipboard
-      wpaperd
       swaylock
       playerctl
-      hyprshot
+      brightnessctl
       ;
   };
 }

home/modules/waybar/default.nix

@@ -1,4 +1,8 @@
-{flake, ...}: let
+{
+  flake,
+  pkgs,
+  ...
+}: let
   configPath = ./config;
   settingsPath = import (configPath + /settings.nix);
   stylePath = import (configPath + /style.nix) {
@@ -9,6 +13,7 @@
 in {
   programs.waybar = {
     enable = true;
+    package = flake.inputs.waybar.packages.${pkgs.system}.default;
     settings = settingsPath;
     style = stylePath;
   };

home/modules/yazi/default.nix

@@ -1,10 +1,15 @@
 {
+  flake,
+  pkgs,
+  ...
+}: {
   programs.yazi = let
     configPath = ./config;
     keymapPath = import (configPath + /keymap.nix);
     settingsPath = import (configPath + /settings.nix);
   in {
     enable = true;
+    # package = flake.inputs.yazi.packages.${pkgs.system}.yazi;
     enableNushellIntegration = true;
     keymap = keymapPath;
     settings = settingsPath;

nixos/default.nix

@@ -75,11 +75,6 @@ in {
         inherit
           (modules)
           hyprland
-          geoclue2
-          greetd
-          swaylock
-          thunar
-          wayland
           ;
       };
     };

nixos/modules/environment.nix

@@ -5,6 +5,7 @@
       inherit
         (pkgs)
         git
+        grim
         pijul
         sshfs
         tomb
@@ -19,6 +20,10 @@
       WLR_DRM_NO_ATOMIC = "1";
       NIXPKGS_ALLOW_INSECURE = "1";
       NIXPKGS_ALLOW_UNFREE = "1";
+      FLAMESHOT_ENABLE_WAYLAND = "1";
+      USE_WAYLAND_GRIM = "1";
+      USE_WAYLAND_CLIPBOARD = "1";
+      GTK_THEME = "catppuccin-macchiato-mauve-compact";
     };
   };
 }

nixos/modules/hyprland.nix

@@ -1,17 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  programs.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-    # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-  };
-  xdg.portal = {
-    enable = true;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
-    ];
-  };
-}