refactor some stuff

6 files changed, 27 insertions, 46 deletions

diff --git a/home/apps/caelestia/default.nix b/home/apps/caelestia/default.nix
index 75dbb26..d691fb8 100644
--- a/home/apps/caelestia/default.nix
+++ b/home/apps/caelestia/default.nix
@@ -15,7 +15,6 @@ in {
 
   config = mkIf cfg.enable {
     default.appLauncher = lib.mkOverride 600 "caelestia-shell ipc call drawers toggle launcher";
-    #default.lockScreen = "caelestia-shell ipc call lock lock";
 
     programs.caelestia = {
       enable = true;
diff --git a/home/default.nix b/home/default.nix
index 6d157a2..7adabec 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,13 +1,8 @@
 {
-  lib,
   config,
   pkgs,
-  inputs,
-  system,
   ...
-}: let
-  inherit (lib) optionals;
-in {
+}: {
   imports = [
     ./apps
     ./browsers
@@ -36,30 +31,9 @@ in {
     (with pkgs; [
       home-manager
       pfetch-rs
+      talc
       yt-dlp
     ])
-    ++ [
-      inputs.talc.packages.${system}.talc
-    ]
-    ++ (with pkgs;
-      optionals config.desktops.enable [
-        # social
-        gajim
-        thunderbird-latest
-        # programs
-        brightnessctl
-        easyeffects
-        filezilla
-        gimp3
-        imv
-        mpv
-        pavucontrol
-        vlc
-        zathura
-        # media
-        ffmpeg
-        imagemagick
-      ])
     # mirrored from system
     ++ config.extraPackages;
 
diff --git a/home/desktops/default.nix b/home/desktops/default.nix
index ea00f07..47be159 100644
--- a/home/desktops/default.nix
+++ b/home/desktops/default.nix
@@ -48,7 +48,26 @@ in {
         roboto-mono
         roboto-serif
         roboto-slab
+        sf-pro
+        sf-mono
+        sf-compact
         twemoji-color-font
+        # social
+        gajim
+        thunderbird-latest
+        # programs
+        brightnessctl
+        easyeffects
+        filezilla
+        gimp3
+        imv
+        mpv
+        pavucontrol
+        vlc
+        zathura
+        # media
+        ffmpeg
+        imagemagick
       ]
       ++ (optionals config.desktops.wayland.enable [
         # wayland
@@ -57,12 +76,6 @@ in {
         wl-clipboard
         wl-clip-persist
         wl-mirror
-      ])
-      ++ (with inputs.apple-fonts.packages.${system}; [
-        # apple fonts
-        sf-pro
-        sf-mono
-        sf-compact
       ]);
 
     # set uwsm vars
diff --git a/home/desktops/hyprland/binds.nix b/home/desktops/hyprland/binds.nix
index 7582edf..d6aa3b9 100644
--- a/home/desktops/hyprland/binds.nix
+++ b/home/desktops/hyprland/binds.nix
@@ -15,7 +15,6 @@ in {
       # Misc
 
       "${mod} SHIFT, L, exit"
-      #"${mod}, tab, hyprexpo:expo, toggle"
 
       # Window operations
 
diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix
index 913ca57..e3624ec 100644
--- a/home/desktops/hyprland/default.nix
+++ b/home/desktops/hyprland/default.nix
@@ -1,8 +1,6 @@
 {
-  inputs,
-  config,
   lib,
-  system,
+  config,
   pkgs,
   ...
 }: let
@@ -25,8 +23,8 @@ in {
 
     wayland.windowManager.hyprland = {
       enable = true;
-      package = inputs.hyprland.packages.${system}.hyprland;
-      portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
+      package = pkgs.hyprland;
+      portalPackage = pkgs.xdg-desktop-portal-hyprland;
 
       xwayland.enable = true;
       systemd.enable = true;
diff --git a/home/desktops/hyprland/plugins.nix b/home/desktops/hyprland/plugins.nix
index e8ec00d..d9804d1 100644
--- a/home/desktops/hyprland/plugins.nix
+++ b/home/desktops/hyprland/plugins.nix
@@ -1,13 +1,11 @@
 {
-  inputs,
   config,
-  system,
+  pkgs,
   ...
 }: {
   wayland.windowManager.hyprland = {
-    plugins = [
-      #inputs.hyprland-plugins.packages.${system}.hyprexpo
-      inputs.hy3.packages.${system}.hy3
+    plugins = with pkgs; [
+      hy3
     ];
 
     settings.plugin = {