Update

Former-commit-id: ab65fe342b
2026-04-02 11:12:09 +02:00 · 2024-10-07 10:13:21 +02:00
parent 18c30e5931
commit a33cf73ff1
75 changed files with 132 additions and 471 deletions
--- a/home/programs/nvim/keymaps.nix
+++ b/home/programs/nvim/keymaps.nix
@@ -60,6 +60,12 @@
        action = "<cmd>Oil<cr>";
        options.desc = "Oil";
      }
+      {
+        key = "<leader>E";
+        action = "<cmd>Neotree<cr>";
+        options.desc = "Neotree";
+      }
+
      {
        key = "<C-h>";
        action = "<cmd>TmuxNavigateLeft<cr>";
--- a/home/programs/nvim/plugins/utils.nix
+++ b/home/programs/nvim/plugins/utils.nix
@@ -14,6 +14,10 @@
      telescope = {
        enable = true;
        extensions.fzf-native = { enable = true; };
+        settings = {
+          selection_caret = "/ ";
+          layout_config = { prompt_position = "top"; };
+        };
      };
      todo-comments.enable = true;
      treesitter = {
--- a/home/programs/shell/fzf.nix
+++ b/home/programs/shell/fzf.nix
@@ -1,15 +1,15 @@
-{ config, ... }: {
+{ config, lib, ... }: {
  programs.fzf = {
    enable = true;
    enableZshIntegration = true;
-    # colors = {
-    #   "fg+" = config.var.theme.colors.accentName;
-    #   "bg+" = "-1";
-    #   "fg" = "white";
-    #   "bg" = "-1";
-    #   "prompt" = "grey";
-    #   "pointer" = config.var.theme.colors.accentName;
-    # };
+    colors = lib.mkForce {
+      "fg+" = "#" + config.lib.stylix.colors.base0D;
+      "bg+" = "-1";
+      "fg" = "#" + config.lib.stylix.colors.base05;
+      "bg" = "-1";
+      "prompt" = "#" + config.lib.stylix.colors.base03;
+      "pointer" = "#" + config.lib.stylix.colors.base0D;
+    };
    defaultOptions = [
      "--margin=1"
      "--layout=reverse"
--- a/home/programs/shell/zsh.nix
+++ b/home/programs/shell/zsh.nix
@@ -60,11 +60,10 @@
      sl = "ls";
      open = "${pkgs.xdg_utils}/bin/xdg-open";
      icat = "${pkgs.kitty}/bin/kitty +kitten icat";
+
      wireguard-import = "nmcli connection import type wireguard file";
-      neorg =
-        "cd ~/nextcloud/neorg && vim -c ':ZenMode' -c ':Telescope find_files' index.norg";
-      notes =
-        "cd ~/nextcloud/Notes && vim -c ':ZenMode' -c ':Telescope find_files' index.md";
+
+      notes = "cd ~/nextcloud/Notes && -c ':Telescope find_files' index.md";
      note = "notes";

      # git
--- a/home/programs/spicetify/default.nix
+++ b/home/programs/spicetify/default.nix
@@ -9,6 +9,13 @@ in {
    enable = true;
    theme = lib.mkForce spicePkgs.themes.text;

+    # TODO: Colors not working
+    customColorScheme = lib.mkForce {
+      button = "#${config.lib.stylix.colors.base0D}";
+      button-active = "#${config.lib.stylix.colors.base0D}";
+      tab-active = "#${config.lib.stylix.colors.base0D}";
+    };
+
    enabledExtensions = with spicePkgs.extensions; [
      playlistIcons
      lastfm
--- a/home/programs/yazi/default.nix
+++ b/home/programs/yazi/default.nix
@@ -12,28 +12,5 @@
        sort_reverse = true;
      };
    };
-
-    theme = {
-      filetype = {
-        rules = [
-          {
-            fg = "#7AD9E5";
-            mime = "image/*";
-          }
-          {
-            fg = "#F3D398";
-            mime = "video/*";
-          }
-          {
-            fg = "#F3D398";
-            mime = "audio/*";
-          }
-          {
-            fg = "#CD9EFC";
-            mime = "application/x-bzip";
-          }
-        ];
-      };
-    };
  };
 }
--- a/home/scripts/hyprfocus/default.nix
+++ b/home/scripts/hyprfocus/default.nix
@@ -27,9 +27,9 @@ let
    # bash 
    ''
      if [ -f /tmp/hyprfocus ]; then
-        hyprfocus-kill
+        hyprfocus-off
      else
-        hyprfocus
+        hyprfocus-on
      fi
    '';
 in { home.packages = [ hyprfocus-on hyprfocus-off hyprfocus-toggle ]; }
--- a/home/scripts/system/default.nix
+++ b/home/scripts/system/default.nix
@@ -10,11 +10,7 @@ let
  '';

  powermenu = pkgs.writeShellScriptBin "powermenu" ''
-    if pgrep wlogout; then
-    	pkill wlogout
-    else
-      ${pkgs.wlogout}/bin/wlogout
-    fi
+    hyprpanel -t powerdropdownmenu
  '';

  lock = pkgs.writeShellScriptBin "lock" ''
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@@ -134,7 +134,7 @@
        "XDG_SESSION_TYPE,wayland"
        "SDL_VIDEODRIVER,wayland"
        "CLUTTER_BACKEND,wayland"
-        "AQ_DRM_DEVICES,/dev/dri/card2" # TODO: Why the fuck this is needed
+        "AQ_DRM_DEVICES,/dev/dri/card2" # FIXME: Why the fuck this is needed
      ];

      cursor = {
--- a/home/wallpapers/20.png.REMOVED.git-id
+++ b/home/wallpapers/20.png.REMOVED.git-id
@@ -1 +0,0 @@
-0bef89318f039fd8142330b3e3e1960a717ce8ed
--- a/home/wallpapers/astronaut.png.REMOVED.git-id
+++ b/home/wallpapers/astronaut.png.REMOVED.git-id
@@ -1 +0,0 @@
-3f5cc89d810f8fdaa4d8a9b5532e392c29ed724d
--- a/home/wallpapers/aurore.png.REMOVED.git-id
+++ b/home/wallpapers/aurore.png.REMOVED.git-id
@@ -1 +0,0 @@
-c7b7658ca1bbfad7738b8e91f44ab3e51c5cc43a
--- a/home/wallpapers/barcode.png
+++ b/home/wallpapers/barcode.png
--- a/home/wallpapers/black-and-white.png.REMOVED.git-id
+++ b/home/wallpapers/black-and-white.png.REMOVED.git-id
@@ -1 +0,0 @@
-516cf6100c07d395d097b89f054f71d95f61810a
--- a/home/wallpapers/cat-leaves.png
+++ b/home/wallpapers/cat-leaves.png
--- a/home/wallpapers/city.png.REMOVED.git-id
+++ b/home/wallpapers/city.png.REMOVED.git-id
@@ -1 +0,0 @@
-24a8294cad1622d0359e7aec7c8517940e88414d
--- a/home/wallpapers/cloud.png.REMOVED.git-id
+++ b/home/wallpapers/cloud.png.REMOVED.git-id
@@ -1 +0,0 @@
-dd1f75939a0cc1d41272d2f7bddf335e79a1fbbf
--- a/home/wallpapers/clouds-2.png.REMOVED.git-id
+++ b/home/wallpapers/clouds-2.png.REMOVED.git-id
@@ -1 +0,0 @@
-75b12882ff6996cd9ee6d7f454b81d736efdd52f
--- a/home/wallpapers/clouds-3.png.REMOVED.git-id
+++ b/home/wallpapers/clouds-3.png.REMOVED.git-id
@@ -1 +0,0 @@
-3addebd3ef241757ae18a5992daec247532633e8
--- a/home/wallpapers/clouds.png.REMOVED.git-id
+++ b/home/wallpapers/clouds.png.REMOVED.git-id
@@ -1 +0,0 @@
-86282d03988085652aae7955b839a448ca8c13e8
--- a/home/wallpapers/clouds2.png.REMOVED.git-id
+++ b/home/wallpapers/clouds2.png.REMOVED.git-id
@@ -1 +0,0 @@
-f4685d7b2bcbe643551e4292376c26001e257210
--- a/home/wallpapers/coffee.png
+++ b/home/wallpapers/coffee.png
--- a/home/wallpapers/crane.png.REMOVED.git-id
+++ b/home/wallpapers/crane.png.REMOVED.git-id
@@ -1 +0,0 @@
-f343e5cb29474b4766fc0d2f8b30c2cba1deeafc
--- a/home/wallpapers/dark-forest.png.REMOVED.git-id
+++ b/home/wallpapers/dark-forest.png.REMOVED.git-id
@@ -1 +0,0 @@
-6064fd523d520e6031339fe852a7535715a4eeb0
--- a/home/wallpapers/dark-waves.png.REMOVED.git-id
+++ b/home/wallpapers/dark-waves.png.REMOVED.git-id
@@ -1 +0,0 @@
-972fd3616f1615000064de16a82164578007971c
--- a/home/wallpapers/dark.png
+++ b/home/wallpapers/dark.png
--- a/home/wallpapers/dark_cloud.png.REMOVED.git-id
+++ b/home/wallpapers/dark_cloud.png.REMOVED.git-id
@@ -1 +0,0 @@
-1891c4bec22b5f7ac2ada47b284c032e528e9d72
--- a/home/wallpapers/degirled.png.REMOVED.git-id
+++ b/home/wallpapers/degirled.png.REMOVED.git-id
@@ -1 +0,0 @@
-5589d21b5d6a5a72526d8441c9c43b864c1b384b
--- a/home/wallpapers/diner-lonely-road.png.REMOVED.git-id
+++ b/home/wallpapers/diner-lonely-road.png.REMOVED.git-id
@@ -1 +0,0 @@
-3d41d1ecf0f135bdd6db016aff4f563f62f996a5
--- a/home/wallpapers/fuji-dark.png.REMOVED.git-id
+++ b/home/wallpapers/fuji-dark.png.REMOVED.git-id
@@ -1 +0,0 @@
-32e98b57e5369ffabc1b43dde16e65a117e7b5b7
--- a/home/wallpapers/fuji-light.png.REMOVED.git-id
+++ b/home/wallpapers/fuji-light.png.REMOVED.git-id
@@ -1 +0,0 @@
-afec5d4bbd3c0663789ca2db3fa45b291816abc7
--- a/home/wallpapers/galaxy.png
+++ b/home/wallpapers/galaxy.png
--- a/home/wallpapers/horizon-2.png.REMOVED.git-id
+++ b/home/wallpapers/horizon-2.png.REMOVED.git-id
@@ -1 +0,0 @@
-0d3f53e91d83bdbedbc55206fb60d47ad8e39ebc
--- a/home/wallpapers/house-cloud.png
+++ b/home/wallpapers/house-cloud.png
--- a/home/wallpapers/key.png.REMOVED.git-id
+++ b/home/wallpapers/key.png.REMOVED.git-id
@@ -1 +0,0 @@
-deca70107ee1ec5f3f23f1dc518aff3675cf3c03
--- a/home/wallpapers/lavender-cat.png
+++ b/home/wallpapers/lavender-cat.png
--- a/home/wallpapers/lofi-computer.png.REMOVED.git-id
+++ b/home/wallpapers/lofi-computer.png.REMOVED.git-id
@@ -1 +0,0 @@
-543bfdf3612171c1d2735c67deff4a8530db7f52
--- a/home/wallpapers/lofi-urban.png.REMOVED.git-id
+++ b/home/wallpapers/lofi-urban.png.REMOVED.git-id
@@ -1 +0,0 @@
-ee44c091d64ab99adbd39a3a8bbd7afa87d5c908
--- a/home/wallpapers/magma.png.REMOVED.git-id
+++ b/home/wallpapers/magma.png.REMOVED.git-id
@@ -1 +0,0 @@
-eb1543f0fc165700573c7eb9df0be436095d9c0e
--- a/home/wallpapers/mountains-black.png
+++ b/home/wallpapers/mountains-black.png
--- a/home/wallpapers/mountains.png
+++ b/home/wallpapers/mountains.png
--- a/home/wallpapers/nasa-japan-dark.png
+++ b/home/wallpapers/nasa-japan-dark.png
--- a/home/wallpapers/nix.png
+++ b/home/wallpapers/nix.png
--- a/home/wallpapers/pixel-galaxy.png.REMOVED.git-id
+++ b/home/wallpapers/pixel-galaxy.png.REMOVED.git-id
@@ -1 +0,0 @@
-ff06020dc59be230333cb3758b141a12b80f8be8
--- a/home/wallpapers/problems.png
+++ b/home/wallpapers/problems.png
--- a/home/wallpapers/rains-dark.png.REMOVED.git-id
+++ b/home/wallpapers/rains-dark.png.REMOVED.git-id
@@ -1 +0,0 @@
-4a2f7982027e3a44cc05be78f2a579ca13a11f96
--- a/home/wallpapers/rocket-launch.png.REMOVED.git-id
+++ b/home/wallpapers/rocket-launch.png.REMOVED.git-id
@@ -1 +0,0 @@
-7d60de0b8a8a1ab0f98b203c74fa38b200894a64
--- a/home/wallpapers/sea.png.REMOVED.git-id
+++ b/home/wallpapers/sea.png.REMOVED.git-id
@@ -1 +0,0 @@
-3c54a04f3296962b36b34212633dfae7cbd12aad
--- a/home/wallpapers/sea2.png.REMOVED.git-id
+++ b/home/wallpapers/sea2.png.REMOVED.git-id
@@ -1 +0,0 @@
-985cb432c6b3b5c1383228df0d250c8ff8e6fe79
--- a/home/wallpapers/space.png
+++ b/home/wallpapers/space.png
--- a/home/wallpapers/space2.png.REMOVED.git-id
+++ b/home/wallpapers/space2.png.REMOVED.git-id
@@ -1 +0,0 @@
-0c8c452ea4323a091ed93fc152b7d1ce16f7484d
--- a/home/wallpapers/street.png.REMOVED.git-id
+++ b/home/wallpapers/street.png.REMOVED.git-id
@@ -1 +0,0 @@
-e16bf4bf4d40525cbbfa446b9b4e6f8ec67273c1
--- a/home/wallpapers/sun.png.REMOVED.git-id
+++ b/home/wallpapers/sun.png.REMOVED.git-id
@@ -1 +0,0 @@
-452cd015616fbf0da6157ce9564d1815f13de47d
--- a/home/wallpapers/the-road-black.png.REMOVED.git-id
+++ b/home/wallpapers/the-road-black.png.REMOVED.git-id
@@ -1 +0,0 @@
-ccb25958fa85b0d758cf96e0b2441e5e5394400c
--- a/home/wallpapers/tokyo.png.REMOVED.git-id
+++ b/home/wallpapers/tokyo.png.REMOVED.git-id
@@ -1 +0,0 @@
-df26dfb08f00f9bd820218b4131a741338a5cf6d
--- a/home/wallpapers/train.png
+++ b/home/wallpapers/train.png
--- a/home/wallpapers/windows.png.REMOVED.git-id
+++ b/home/wallpapers/windows.png.REMOVED.git-id
@@ -1 +0,0 @@
-b10ab345b583376465569a8a0f0931df7373ed79
--- a/home/wallpapers/wp.png.REMOVED.git-id
+++ b/home/wallpapers/wp.png.REMOVED.git-id
@@ -1 +0,0 @@
-5adea2c94ee6a6324e1ee5e44a0e8b2090eb8ff8