From fd629f41b75d8bbab8e0360c3501fd88990e65a9 Mon Sep 17 00:00:00 2001 From: myuron Date: Mon, 9 Feb 2026 01:31:27 +0900 Subject: [PATCH 1/3] add:niri window rules radius --- nix/home-manager/nixos/niri/config.kdl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nix/home-manager/nixos/niri/config.kdl b/nix/home-manager/nixos/niri/config.kdl index 06b798f..47d2858 100644 --- a/nix/home-manager/nixos/niri/config.kdl +++ b/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 { From f0bcbf2f62a1a797b528804aa1c4f1bad8672389 Mon Sep 17 00:00:00 2001 From: myuron Date: Mon, 9 Feb 2026 02:08:10 +0900 Subject: [PATCH 2/3] add:fuzzel theme catppuccin --- flake.lock | 37 ++++++++++++++++++++++- flake.nix | 10 +++++- nix/home-manager/nixos/default.nix | 3 +- nix/home-manager/nixos/fuzzel/default.nix | 10 ++++++ 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 nix/home-manager/nixos/fuzzel/default.nix diff --git a/flake.lock b/flake.lock index 8e4dc8e..ebeb9cb 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "catppuccin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1770551880, + "narHash": "sha256-+cS5yXWsSLiK36+PP/+dcQdxpXSclx2d65p7l6Dis+A=", + "owner": "catppuccin", + "repo": "nix", + "rev": "db4dfe3f2a80e9c33492d839accd49f75c7324c2", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -59,6 +77,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1770169770, "narHash": "sha256-awR8qIwJxJJiOmcEGgP2KUqYmHG4v/z8XpL9z8FnT1A=", @@ -76,10 +110,11 @@ }, "root": { "inputs": { + "catppuccin": "catppuccin", "flake-utils": "flake-utils", "home-manager": "home-manager", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" } }, "systems": { diff --git a/flake.nix b/flake.nix index cec6100..cd2921e 100644 --- a/flake.nix +++ b/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 { diff --git a/nix/home-manager/nixos/default.nix b/nix/home-manager/nixos/default.nix index 4e33b25..ef9f8d4 100644 --- a/nix/home-manager/nixos/default.nix +++ b/nix/home-manager/nixos/default.nix @@ -3,6 +3,7 @@ imports = [ ./niri ./waybar.nix + ./fuzzel ]; home = rec { @@ -17,7 +18,7 @@ packages = with pkgs; [ niri - fuzzel + # fuzzel swaybg ]; }; diff --git a/nix/home-manager/nixos/fuzzel/default.nix b/nix/home-manager/nixos/fuzzel/default.nix new file mode 100644 index 0000000..ee39786 --- /dev/null +++ b/nix/home-manager/nixos/fuzzel/default.nix @@ -0,0 +1,10 @@ +{ + programs.fuzzel = { + enable = true; + }; + + catppuccin.fuzzel = { + enable = true; + flavor = "mocha"; + }; +} From 30c73cdf3a90894336913a33fd0e4df22d12f5d9 Mon Sep 17 00:00:00 2001 From: myuron Date: Mon, 9 Feb 2026 03:12:02 +0900 Subject: [PATCH 3/3] add:hyprlock --- flake.nix | 1 + nix/home-manager/common/bat/default.nix | 10 +++++++ nix/home-manager/common/bottom/default.nix | 10 +++++++ nix/home-manager/common/default.nix | 6 ++-- nix/home-manager/nixos/default.nix | 1 + nix/home-manager/nixos/hyprlock/default.nix | 33 +++++++++++++++++++++ nix/home-manager/nixos/niri/config.kdl | 1 + 7 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 nix/home-manager/common/bat/default.nix create mode 100644 nix/home-manager/common/bottom/default.nix create mode 100644 nix/home-manager/nixos/hyprlock/default.nix diff --git a/flake.nix b/flake.nix index cd2921e..4f67f6c 100644 --- a/flake.nix +++ b/flake.nix @@ -94,6 +94,7 @@ modules = [ ./nix/home-manager/common ./nix/home-manager/darwin + catppuccin.homeModules.catppuccin ]; }; }; diff --git a/nix/home-manager/common/bat/default.nix b/nix/home-manager/common/bat/default.nix new file mode 100644 index 0000000..7313036 --- /dev/null +++ b/nix/home-manager/common/bat/default.nix @@ -0,0 +1,10 @@ +{ + programs.bat = { + enable = true; + }; + + catppuccin.bat = { + enable = true; + flavor = "mocha"; + }; +} diff --git a/nix/home-manager/common/bottom/default.nix b/nix/home-manager/common/bottom/default.nix new file mode 100644 index 0000000..3600c84 --- /dev/null +++ b/nix/home-manager/common/bottom/default.nix @@ -0,0 +1,10 @@ +{ + programs.bottom = { + enable = true; + }; + + catppuccin.bottom = { + enable = true; + flavor = "mocha"; + }; +} diff --git a/nix/home-manager/common/default.nix b/nix/home-manager/common/default.nix index 446d900..6c93566 100644 --- a/nix/home-manager/common/default.nix +++ b/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 diff --git a/nix/home-manager/nixos/default.nix b/nix/home-manager/nixos/default.nix index ef9f8d4..a73fde6 100644 --- a/nix/home-manager/nixos/default.nix +++ b/nix/home-manager/nixos/default.nix @@ -4,6 +4,7 @@ ./niri ./waybar.nix ./fuzzel + ./hyprlock ]; home = rec { diff --git a/nix/home-manager/nixos/hyprlock/default.nix b/nix/home-manager/nixos/hyprlock/default.nix new file mode 100644 index 0000000..4d03e85 --- /dev/null +++ b/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"; + }; +} diff --git a/nix/home-manager/nixos/niri/config.kdl b/nix/home-manager/nixos/niri/config.kdl index 47d2858..dd69712 100644 --- a/nix/home-manager/nixos/niri/config.kdl +++ b/nix/home-manager/nixos/niri/config.kdl @@ -46,6 +46,7 @@ binds { // launch Mod+T { spawn "wezterm"; } Mod+D { spawn "fuzzel"; } + Mod+P { spawn "hyprlock"; } // focus window Mod+H { focus-column-left; }