From 24d5d3a615edb203275daf462d84fbd2b7735f08 Mon Sep 17 00:00:00 2001 From: Nydragon Date: Sun, 19 May 2024 16:26:56 +0900 Subject: [PATCH] swaylock: move to hm --- home/default.nix | 29 +++++++++++++++++++ home/fish/default.nix | 1 + home/sway/swaylock.nix | 65 ++++++++++++++++++++++++------------------ 3 files changed, 67 insertions(+), 28 deletions(-) diff --git a/home/default.nix b/home/default.nix index cbc0f81..1887020 100644 --- a/home/default.nix +++ b/home/default.nix @@ -32,6 +32,35 @@ qt.enable = true; qt.platformTheme.name = "gtk"; + gtk = + let + pointer = { + name = "Catppuccin-Frappe-Lavender-Cursors"; + package = pkgs.catppuccin-cursors.frappeLavender; + size = 32; + }; + in + { + enable = true; + theme = { + name = "Catppuccin-Frappe-Compact-Lavender-Dark"; + package = pkgs.catppuccin-gtk.override { + accents = [ "lavender" ]; + size = "compact"; + variant = "frappe"; + }; + }; + cursorTheme = pointer; + iconTheme = { + name = "Papirus-Dark"; + # package = pkgs.papirus-icon-theme; + package = pkgs.catppuccin-papirus-folders.override { + accent = "lavender"; + flavor = "frappe"; + }; + }; + }; + programs.direnv = { enable = true; nix-direnv.enable = true; diff --git a/home/fish/default.nix b/home/fish/default.nix index 1a1e8c0..525a6ee 100644 --- a/home/fish/default.nix +++ b/home/fish/default.nix @@ -11,6 +11,7 @@ cat = "bat"; sd = ''cd "$(dirname "$HOME/$(env --chdir ~ fzf)")"''; mkdir = "mkdir --parent"; + cp = "cp -i"; }; functions = { gitignore = "curl -sL https://www.gitignore.io/api/$argv"; diff --git a/home/sway/swaylock.nix b/home/sway/swaylock.nix index 951a6e4..bc49261 100644 --- a/home/sway/swaylock.nix +++ b/home/sway/swaylock.nix @@ -1,34 +1,43 @@ -{ pkgs, ... }: - -let - pointer = { - name = "Catppuccin-Frappe-Lavender-Cursors"; - package = pkgs.catppuccin-cursors.frappeLavender; - size = 32; - }; -in +{ ... }: { programs.swaylock = { enable = true; - }; - gtk = { - enable = true; - theme = { - name = "Catppuccin-Frappe-Compact-Lavender-Dark"; - package = pkgs.catppuccin-gtk.override { - accents = [ "lavender" ]; - size = "compact"; - variant = "frappe"; - }; - }; - cursorTheme = pointer; - iconTheme = { - name = "Papirus-Dark"; - # package = pkgs.papirus-icon-theme; - package = pkgs.catppuccin-papirus-folders.override { - accent = "lavender"; - flavor = "frappe"; - }; + settings = { + ignore-empty-password = true; + indicator-idle-visible = true; + indicator-radius = 150; + indicator-thickness = 30; + + # Theme + color = "303446"; + bs-hl-color = "f2d5cf"; + caps-lock-bs-hl-color = "f2d5cf"; + caps-lock-key-hl-color = "a6d189"; + inside-color = "00000000"; + inside-clear-color = "00000000"; + inside-caps-lock-color = "00000000"; + inside-ver-color = "00000000"; + inside-wrong-color = "00000000"; + key-hl-color = "a6d189"; + layout-bg-color = "00000000"; + layout-border-color = "00000000"; + layout-text-color = "c6d0f5"; + line-color = "00000000"; + line-clear-color = "00000000"; + line-caps-lock-color = "00000000"; + line-ver-color = "00000000"; + line-wrong-color = "00000000"; + ring-color = "babbf1"; + ring-clear-color = "f2d5cf"; + ring-caps-lock-color = "ef9f76"; + ring-ver-color = "8caaee"; + ring-wrong-color = "ea999c"; + separator-color = "00000000"; + text-color = "c6d0f5"; + text-clear-color = "f2d5cf"; + text-caps-lock-color = "ef9f76"; + text-ver-color = "8caaee"; + text-wrong-color = "ea999c"; }; }; }