Feauture/niri custom

flake.nix

@@ -12,7 +12,13 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    flake-utils.url = "github:numtide/flake-utils";
+    flake-utils = {
+      url = "github:numtide/flake-utils";
+    };
+
+    catppuccin = {
+      url = "github:catppuccin/nix";
+    };
   };
 
   outputs = {
@@ -21,6 +27,7 @@
     nix-darwin,
     home-manager,
     flake-utils,
+    catppuccin,
   } @ inputs:
   let
     systems = {
@@ -73,6 +80,7 @@
         modules = [
           ./nix/home-manager/common
           ./nix/home-manager/nixos
+          catppuccin.homeModules.catppuccin
         ];
       };
       myHome-darwin = inputs.home-manager.lib.homeManagerConfiguration {
@@ -86,6 +94,7 @@
         modules = [
           ./nix/home-manager/common
           ./nix/home-manager/darwin
+          catppuccin.homeModules.catppuccin
         ];
       };
     };

nix/home-manager/common/bat/default.nix

@@ -0,0 +1,10 @@
+{
+  programs.bat = {
+    enable = true;
+  };
+
+  catppuccin.bat = {
+    enable = true;
+    flavor = "mocha";
+  };
+}

nix/home-manager/common/bottom/default.nix

@@ -0,0 +1,10 @@
+{
+  programs.bottom = {
+    enable = true;
+  };
+
+  catppuccin.bottom = {
+    enable = true;
+    flavor = "mocha";
+  };
+}

nix/home-manager/common/default.nix

@@ -6,8 +6,10 @@ in
   imports = [
     ./zsh.nix
     ./zoxide.nix
-    ./wezterm
+    ./wezterm # alternative cat command
     ./starship.nix
+    ./bat
+    ./bottom # system monitor
     neovim
   ];
 
@@ -17,14 +19,12 @@ in
       # general
       # ====================
       fzf
-      bat # alternative cat command
       eza # alternative ls command
       ripgrep # alternative grep command
       duf # alternative df command
       fd # alternative find command
       diff-so-fancy # alternative diff command
       tldr # alternative man command
-      bottom # system monitor
       unzip
 
       # browser

nix/home-manager/nixos/default.nix

@@ -3,6 +3,8 @@
   imports = [
     ./niri
     ./waybar.nix
+    ./fuzzel
+    ./hyprlock
   ];
 
   home = rec {
@@ -17,7 +19,7 @@
 
     packages = with pkgs; [
       niri
-      fuzzel
+      # fuzzel
       swaybg
     ];
   };

nix/home-manager/nixos/fuzzel/default.nix

@@ -0,0 +1,10 @@
+{
+  programs.fuzzel = {
+    enable = true;
+  };
+
+  catppuccin.fuzzel = {
+    enable = true;
+    flavor = "mocha";
+  };
+}

nix/home-manager/nixos/hyprlock/default.nix

@@ -0,0 +1,33 @@
+{ config, ...}:
+{
+  programs.hyprlock = {
+    enable = true;
+    settings = {
+      general = {
+      };
+      animations = {
+        enabled = true;
+        fade_in = {
+          duration = 300;
+          bezier = "easeOutQuint";
+        };
+        fade_out = {
+          duration = 300;
+          bezier = "easeOutQuint";
+        };
+      };
+      background = [
+        {
+          path = "${config.home.homeDirectory}/wallpaper/lock.png";
+          blur_passes = 3;
+          blur_size = 8;
+        }
+      ];
+    };
+  };
+
+  catppuccin.hyprlock = {
+    enable = true;
+    flavor = "mocha";
+  };
+}

nix/home-manager/nixos/niri/config.kdl

@@ -28,6 +28,11 @@ layout {
   }
 }
 
+window-rule {
+  geometry-corner-radius 12
+  clip-to-geometry true
+}
+
 // ウィンドウの透過設定（フォーカス状態に関係なく適用）
 prefer-no-csd
 window-rule {
@@ -41,6 +46,7 @@ binds {
   // launch
   Mod+T { spawn "wezterm"; }
   Mod+D { spawn "fuzzel"; }
+  Mod+P { spawn "hyprlock"; }
 
   // focus window
   Mod+H { focus-column-left; }