Merge branch 'main' into ags/fix-icons

brckd · Jul 3, 2024 · 9bdba53 · 9bdba53
2 parents e148ef7 + c5dda60
commit 9bdba53
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 11 deletions.
diff --git a/configs/home/personal/default.nix b/configs/home/personal/default.nix
@@ -0,0 +1,46 @@
+{...}: {
+  home = {
+    username = "personal";
+    homeDirectory = "/home/personal";
+  };
+
+  # Terminal
+  programs.zsh.enable = true;
+  programs.starship.enable = true;
+  programs.kitty.enable = true;
+  programs.fastfetch.enable = true;
+  programs.git = {
+    enable = true;
+    extraConfig = {
+      push.autoSetupRemote = true;
+      pull.rebase = true;
+    };
+  };
+  programs.gh.enable = true;
+
+  # Desktop environment
+  wayland.windowManager.hyprland = {
+    enable = true;
+    settings.input.kb_layout = "de";
+  };
+  programs.wpaperd.enable = true;
+  programs.ags.enable = true;
+  programs.rofi = {
+    enable = true;
+    keybind.enable = true;
+  };
+  services.cliphist.enable = true;
+
+  # Editor
+  programs.nixvim = {
+    enable = true;
+    defaultEditor = true;
+  };
+
+  # Music
+  programs.spotify-player.enable = true;
+  programs.cava.enable = true;
+
+  # Apps
+  programs.librewolf.enable = true;
+}
diff --git a/configs/nixos/desktop/default.nix b/configs/nixos/desktop/default.nix
@@ -46,6 +46,11 @@
         description = "Bricked";
         extraGroups = ["networkmanager" "wheel"];
       };
+      personal = {
+        isNormalUser = true;
+        description = "Personal";
+        extraGroups = ["networkmanager" "wheel"];
+      };
       john = {
         isNormalUser = true;
         description = "John";

diff --git a/modules/home/ags/default.nix b/modules/home/ags/default.nix
@@ -13,7 +13,7 @@ in {
       configDir = pkgs.buildNpmPackage {
         name = "ags-dots";
         src = ./.;
-				npmDepsHash = "sha256-0Phl7IrrKSd8j4yQ3nefJ4xT/QgrvDnlN68G7bDHCfE=";
+        npmDepsHash = "sha256-0Phl7IrrKSd8j4yQ3nefJ4xT/QgrvDnlN68G7bDHCfE=";
 
         nativeBuildInputs = with pkgs; [bun];
         postPatch = ''

diff --git a/modules/home/ags/package.json b/modules/home/ags/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bricked/ags-dots",
-	"version": "0.1.0",
+  "version": "0.1.0",
   "module": "src/index.ts",
   "devDependencies": {
     "@types/bun": "latest",

diff --git a/modules/home/ags/widget/Bar.ts b/modules/home/ags/widget/Bar.ts
@@ -30,7 +30,7 @@ export const End = () =>
   Widget.Box({
     hexpand: true,
     hpack: "end",
-    children: [VolumeSlider(), PowerMenu()]
+    children: [VolumeSlider(), PowerMenu()],
   });
 
 export const Bar = (monitor = 0) =>

diff --git a/modules/home/ags/widget/PowerMenu.ts b/modules/home/ags/widget/PowerMenu.ts
@@ -1,7 +1,8 @@
-export const PowerButton = (command: string, icon: string) => Widget.Button({
-	onClicked: () => Utils.exec(command),
-		child: Widget.Icon(icon)
-})
+export const PowerButton = (command: string, icon: string) =>
+  Widget.Button({
+    onClicked: () => Utils.exec(command),
+    child: Widget.Icon(icon),
+  });
 
 export const PowerMenu = () => Widget.Box({
 	className: "powermenu",

diff --git a/modules/home/ags/widget/VolumeSlider.ts b/modules/home/ags/widget/VolumeSlider.ts
@@ -2,11 +2,13 @@ const audio = await Service.import("audio");
 
 export const VolumeSlider = (type: "speaker" | "microphone" = "speaker") =>
   Widget.Box({
-		className: "volume-slider",
+    className: "volume-slider",
     children: [
-			Widget.Label({
-				label: audio[type].bind("volume").transform(v => Math.round(v * 100).toString()),
-			}),
+      Widget.Label({
+        label: audio[type]
+          .bind("volume")
+          .transform((v) => Math.round(v * 100).toString()),
+      }),
       Widget.Slider({
         className: "slider",
         hexpand: true,