Browse Source

Caelestia is pretty..

Johan Rong 2 months ago
parent
commit
55d17bbd83
4 changed files with 189 additions and 54 deletions
  1. 169 31
      flake.lock
  2. 9 1
      flake.nix
  3. 8 3
      home/features/desktop/hyprland/config/hyprland.lua
  4. 3 19
      home/features/desktop/hyprland/default.nix

+ 169 - 31
flake.lock

@@ -1,5 +1,99 @@
 {
   "nodes": {
+    "caelestia-cli": {
+      "inputs": {
+        "caelestia-shell": "caelestia-shell",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1781413068,
+        "narHash": "sha256-iw/AerngNSmgc80aLUDk8ewyiwJAQjeUjBV1mrwmdHo=",
+        "owner": "caelestia-dots",
+        "repo": "cli",
+        "rev": "4090c4fc9192b4c272c01e7e6d5b731caca03b73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "caelestia-dots",
+        "repo": "cli",
+        "type": "github"
+      }
+    },
+    "caelestia-cli_2": {
+      "inputs": {
+        "caelestia-shell": [
+          "caelestia-shell"
+        ],
+        "nixpkgs": [
+          "caelestia-shell",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1781239472,
+        "narHash": "sha256-WFL8jZMWNH1tx3UwaJ9aa9NN25uOEJ9mbKPRNQJY/xM=",
+        "owner": "caelestia-dots",
+        "repo": "cli",
+        "rev": "3f3229aed4f36752a02fd870fd6cad94bd76555f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "caelestia-dots",
+        "repo": "cli",
+        "type": "github"
+      }
+    },
+    "caelestia-shell": {
+      "inputs": {
+        "caelestia-cli": [
+          "caelestia-cli"
+        ],
+        "m3shapes": "m3shapes",
+        "nixpkgs": [
+          "caelestia-cli",
+          "nixpkgs"
+        ],
+        "quickshell": "quickshell"
+      },
+      "locked": {
+        "lastModified": 1781408632,
+        "narHash": "sha256-kYVf3Jye4UhyBrtubYcSrmVyFv9uqOY2JvjmElFiZHE=",
+        "owner": "caelestia-dots",
+        "repo": "shell",
+        "rev": "f86c359cd90530bacc800e94e35ffbebecd3f58f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "caelestia-dots",
+        "repo": "shell",
+        "type": "github"
+      }
+    },
+    "caelestia-shell_2": {
+      "inputs": {
+        "caelestia-cli": "caelestia-cli_2",
+        "m3shapes": "m3shapes_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "quickshell": "quickshell_2"
+      },
+      "locked": {
+        "lastModified": 1781437895,
+        "narHash": "sha256-KGN7Ql7xb/1RF/xP4LInOrRHNUvjAWaL92ABNN8mFrY=",
+        "owner": "caelestia-dots",
+        "repo": "shell",
+        "rev": "7f358235aab727289c50f7e69b96ae7237efc358",
+        "type": "github"
+      },
+      "original": {
+        "owner": "caelestia-dots",
+        "repo": "shell",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1780099841,
@@ -54,6 +148,40 @@
         "type": "github"
       }
     },
+    "m3shapes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1781017666,
+        "narHash": "sha256-kfHyzZaPHgqZML48OA+5JwBOsLdQJ2ci/aGPShvUB4Y=",
+        "owner": "soramanew",
+        "repo": "m3shapes",
+        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "soramanew",
+        "repo": "m3shapes",
+        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
+        "type": "github"
+      }
+    },
+    "m3shapes_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1781017666,
+        "narHash": "sha256-kfHyzZaPHgqZML48OA+5JwBOsLdQJ2ci/aGPShvUB4Y=",
+        "owner": "soramanew",
+        "repo": "m3shapes",
+        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "soramanew",
+        "repo": "m3shapes",
+        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
+        "type": "github"
+      }
+    },
     "moose": {
       "inputs": {
         "crane": "crane",
@@ -108,47 +236,57 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "quickshell": {
+      "inputs": {
+        "nixpkgs": [
+          "caelestia-cli",
+          "caelestia-shell",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1781074563,
-        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
-        "type": "github"
+        "lastModified": 1781053488,
+        "narHash": "sha256-P4WEBaKgl8flRckHxXGHzT0potPvB3x8ZFIp9gLEAMY=",
+        "ref": "refs/heads/master",
+        "rev": "d99d87d5e5ec4e696815348692fdaaf0b6be1b2c",
+        "revCount": 822,
+        "type": "git",
+        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "git",
+        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       }
     },
-    "root": {
+    "quickshell_2": {
       "inputs": {
-        "home-manager": "home-manager",
-        "moose": "moose",
-        "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs",
-        "swayodroid": "swayodroid"
-      }
-    },
-    "swayodroid": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "caelestia-shell",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1781440097,
-        "narHash": "sha256-8kUbdvwDl1zosO6FdRAyCpPu90deZ2vxf9wlLROOfYg=",
-        "owner": "johron",
-        "repo": "swayodroid-shell",
-        "rev": "8d1523aeea833798035fc706a3a350c63386a341",
-        "type": "github"
+        "lastModified": 1781053488,
+        "narHash": "sha256-P4WEBaKgl8flRckHxXGHzT0potPvB3x8ZFIp9gLEAMY=",
+        "ref": "refs/heads/master",
+        "rev": "d99d87d5e5ec4e696815348692fdaaf0b6be1b2c",
+        "revCount": 822,
+        "type": "git",
+        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
       "original": {
-        "owner": "johron",
-        "repo": "swayodroid-shell",
-        "type": "github"
+        "type": "git",
+        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
+      }
+    },
+    "root": {
+      "inputs": {
+        "caelestia-cli": "caelestia-cli",
+        "caelestia-shell": "caelestia-shell_2",
+        "home-manager": "home-manager",
+        "moose": "moose",
+        "nix-flatpak": "nix-flatpak",
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {

+ 9 - 1
flake.nix

@@ -13,7 +13,14 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    swayodroid.url = "github:johron/swayodroid-shell";
+    caelestia-shell = {
+      url = "github:caelestia-dots/shell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    caelestia-cli = {
+      url = "github:caelestia-dots/cli";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -65,6 +72,7 @@
             { nixpkgs.overlays = overlays; }
             home-manager.nixosModules.home-manager
             {
+              home-manager.extraSpecialArgs = { inherit inputs; };
               home-manager.useGlobalPkgs = true;
               home-manager.users."${host.user}" = import ./hosts/${host.dir}/home.nix;
             }

+ 8 - 3
home/features/desktop/hyprland/config/hyprland.lua

@@ -36,7 +36,7 @@ hl.config({
 -- Set programs that you use
 local terminal    = "alacritty"
 local fileManager = "dolphin"
-local menu        = "qs -c nandoroid-shell/dotfiles/.config/quickshell/nandoroid ipc call spotlight toggle"
+local menu        = "caelestia shell drawers toggle launcher"
 
 
 -------------------
@@ -55,7 +55,7 @@ local menu        = "qs -c nandoroid-shell/dotfiles/.config/quickshell/nandoroid
 -- end)
 
 hl.on("hyprland.start", function () 
-  hl.exec_cmd("qs -c nandoroid-shell/dotfiles/.config/quickshell/nandoroid")
+  hl.exec_cmd("caelestia shell")
 end)
 
 -------------------------------
@@ -274,8 +274,13 @@ hl.bind(mainMod .. " + V", hl.dsp.layout("togglesplit"))    -- dwindle only
 hl.bind(mainMod .. " + F", hl.dsp.window.fullscreen({ action = "toggle" }))
 hl.bind(mainMod .. " + SHIFT + SPACE", hl.dsp.window.float({ action = "toggle" }))
 
-hl.bind(secMod .. " + E", hl.dsp.exec_cmd(fileManager))
+hl.bind("CONTROL + ALT + DELETE", hl.dsp.exec_cmd("caelestia shell drawers toggle session"))
+hl.bind(secMod .. " + V", hl.dsp.exec_cmd("caelestia clipboard"))
 
+hl.bind(secMod .. " + E", hl.dsp.exec_cmd(fileManager))
+hl.bind(secMod .. " + Q",  hl.dsp.exec_cmd("firefox"))
+hl.bind(secMod .. " + S",  hl.dsp.exec_cmd("spotify"))
+hl.bind(secMod .. " + D",  hl.dsp.exec_cmd("discord"))
 
 -- Move focus with mainMod + arrow keys
 hl.bind(mainMod .. " + left",  hl.dsp.focus({ direction = "left" }))

+ 3 - 19
home/features/desktop/hyprland/default.nix

@@ -1,22 +1,5 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
 
-let 
-  customQuickshell = pkgs.symlinkJoin {
-    name = "quickshell-wrapped";
-    paths = [ pkgs.quickshell ];
-    buildInputs = [ pkgs.makeWrapper ];
-    postBuild = ''
-      wrapProgram $out/bin/qs \
-        --prefix QML2_IMPORT_PATH : "${lib.makeSearchPath "lib/qt-6/qml" (with pkgs.kdePackages; [
-          qtdeclarative
-          qt5compat
-          qtsvg
-          qtimageformats
-          qtmultimedia
-        ])}"
-    '';
-  };
-in
 {
   imports = [
     ./bg
@@ -26,7 +9,8 @@ in
   ];
 
   home.packages = [
-    customQuickshell
+    inputs.caelestia-shell.packages.${pkgs.system}.default
+    inputs.caelestia-cli.packages.${pkgs.system}.default
   ];
 
   home.file.".config/hypr".source = ./config;