Up

Former-commit-id: 381b3228dc

home/hyprland/default.nix

@@ -1,6 +1,6 @@
-{ pkgs, config, ... }: {
+{ self, pkgs, config, ... }: {
 
-  imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ];
+  imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ./hyprcursor.nix ];
 
   home.packages = with pkgs; [
     hyprshot
@@ -29,11 +29,12 @@
     settings = {
       "$mod" = "SUPER";
       "$shiftMod" = "SUPER_SHIFT";
-      "$menu" = "menu";
-      "$powermenu" = "${pkgs.wlogout}/bin/wlogout";
 
-      exec-once =
-        [ "${pkgs.hypridle}/bin/hypridle" "${pkgs.hyprpaper}/bin/hyprpaper" "${pkgs.bitwarden}/bin/bitwarden" ];
+      exec-once = [
+        "${pkgs.hypridle}/bin/hypridle"
+        "${pkgs.hyprpaper}/bin/hyprpaper"
+        "${pkgs.bitwarden}/bin/bitwarden"
+      ];
 
       monitor = [
         "eDP-2,highres,0x0,1"
@@ -43,22 +44,25 @@
 
       bind = [
         "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty"
-        "$mod, Q, killactive,"
         "$mod, E, exec, ${pkgs.xfce.thunar}/bin/thunar"
-        "$mod, T, togglefloating,"
-        "$mod, F, fullscreen"
         "$mod, B, exec, ${pkgs.qutebrowser}/bin/qutebrowser"
         "$mod, C, exec, ${pkgs.kitty}/bin/kitty --class peaclock peaclock"
         "$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
-        "$mod, SPACE, exec, $menu"
-        "$mod, X, exec, $powermenu"
+        "$mod, X, exec, ${pkgs.wlogout}/bin/wlogout"
+        "$mod, SPACE, exec, menu"
+        # Windows control
+        "$mod, Q, killactive,"
+        "$mod, T, togglefloating,"
+        "$mod, F, fullscreen"
         "$mod, left, movefocus, l"
         "$mod, right, movefocus, r"
         "$mod, up, movefocus, u"
         "$mod, down, movefocus, d"
+        # Screenshots
         "$mod, PRINT, exec, ${pkgs.hyprshot}/bin/hyprshot -m window -o ~/Pictures/screenshots"
         ", PRINT, exec, ${pkgs.hyprshot}/bin/hyprshot -m output -o ~/Pictures/screenshots"
         "$shiftMod, PRINT, exec, ${pkgs.hyprshot}/bin/hyprshot -m region -o ~/Pictures/screenshots"
+        # Night Shift
         "$mod, F2, exec, night-shift-off"
         "$mod, F3, exec, night-shift-on"
       ] ++ (builtins.concatLists (builtins.genList (i:
@@ -96,6 +100,8 @@
         "QT_QPA_PLATFORM=wayland,xcb"
         "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
         "GTK_THEME,Flat-Remix-GTK-White-Darkest-Solid:dark"
+        "HYPRCURSOR_THEME,rose-pine-hyprcursor"
+        "HYPRCURSOR_SIZE,10"
       ];
 
       general = {

home/hyprland/hyprcursor.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, ... }: {
+  home.packages = with pkgs; [ hyprcursor ];
+
+  home.file.".local/share/icons/rose-pine-hyprcursor" = {
+    recursive = true;
+    source = ./rose-pine;
+  };
+
+}

home/hyprland/rose-pine/manifest.hl

@@ -0,0 +1,4 @@
+name = rose-pine-hyprcursor
+description = BreezeX remixed with Rose Pine remixed to Hyprcursor format
+version = 0.2
+cursors_directory = hyprcursors

home/misc/default.nix

@@ -1,6 +1 @@
-{
-  imports = [
-    ./cava/default.nix
-    ./nextcloud.nix # REMOVE
-  ];
-}
+{ imports = [ ./cava/default.nix ]; }

home/misc/nextcloud.nix

@@ -1,27 +0,0 @@
-{ pkgs, ... }: {
-  systemd.user.services.watch-nextcloud = {
-    Unit = { Description = "Start Nextcloud if I'm on one of my network"; };
-    Install = { WantedBy = [ "default.target" ]; };
-    Service = {
-      ExecStart = "${pkgs.writeShellScript "watch-nextcloud" ''
-        while 1;do
-          ssid=$(nmcli -t -f name connection show --active | head -n1)
-          if [[ $ssid == "inthecloud" || $ssid == "Wired connection 2" ]]; then
-            status=$(systemctl --user status nextcloud-client)
-            service_status=$(echo "$status" | awk '/Active:/ {print $2}')
-            if [[ $service_status == "inactive" ]]; then
-              systemctl --user start nextcloud-client
-            fi
-          else
-            status=$(systemctl --user status nextcloud-client)
-            service_status=$(echo "$status" | awk '/Active:/ {print $2}')
-            if [[ $service_status == "active" ]]; then
-              systemctl --user stop nextcloud-client
-            fi
-          fi
-          sleep 120
-        done
-      ''}";
-    };
-  };
-}

home/shell/zsh.nix

@@ -4,8 +4,8 @@
 
   programs.zsh = {
     enable = true;
-    enableAutosuggestions = true;
     enableCompletion = true;
+    autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
     historySubstringSearch.enable = true;
 

home/sops/default.nix

@@ -9,7 +9,8 @@
 
   systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ];
 
-  home.activation.setupEtc = config.lib.dag.entryAfter [ "writeBoundary" ] ''
-    /run/current-system/sw/bin/systemctl start --user sops-nix
-  '';
+  # Make home-manager crash on boot, dafuk ?
+  #  home.activation.setupEtc = config.lib.dag.entryAfter [ "writeBoundary" ] ''
+  #    /run/current-system/sw/bin/systemctl start --user sops-nix
+  #  '';
 }