Skip to content

Commit 7d94289

Browse files
committed
feat(home-manager): refactor Sway and Swaylock configs, remove Peco
- Removed Peco program and its configuration - Refactored Sway configuration: - Deleted unused `ime.sh` script - Updated `emacs-ime.sh` to use nix-shell shebang - Removed floating Vim bindings from `input.conf` - Added Dracula-themed wallpaper and configuration for Swaylock - Adjusted Kitty font size from 14.0 to 13.0 - Simplified imports by removing unused `lib` dependencies
1 parent 208525a commit 7d94289

File tree

12 files changed

+52
-93
lines changed

12 files changed

+52
-93
lines changed

home-manager/advanced.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ let
4141
inherit pkgs sources;
4242
};
4343
advancedPrograms = import ./programs/advanced.nix {
44-
inherit (nixpkgs) lib;
4544
inherit pkgs nodePkgs sources;
4645
inherit org-babel emacsPkg;
4746
};

home-manager/programs/advanced.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
lib,
32
pkgs,
43
nodePkgs,
54
sources,
@@ -27,7 +26,7 @@ let
2726
# for window manager
2827
rofi = import ./rofi { inherit pkgs; };
2928
sway = import ./sway;
30-
swaylock = import ./swaylock { inherit lib pkgs; };
29+
swaylock = import ./swaylock { inherit pkgs; };
3130
waybar = import ./waybar { inherit pkgs; };
3231
in
3332
[

home-manager/programs/basic.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ let
1616
misc = import ./misc;
1717
neovim = import ./neovim { inherit pkgs sources; };
1818
password-store = import ./password-store { inherit pkgs; };
19-
peco = import ./peco { inherit pkgs; };
2019
fzf = import ./fzf;
2120
readline = import ./readline;
2221
ripgrep = import ./ripgrep;
@@ -41,7 +40,6 @@ in
4140
misc
4241
password-store
4342
neovim
44-
peco
4543
fzf
4644
readline
4745
ripgrep

home-manager/programs/kitty/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
enable = true;
44

55
settings = {
6-
font_size = 14.0;
6+
font_size = 13.0;
77
font_family = "HackGenNerd";
88

99
# thanks. https://github.com/dracula/kitty/blob/master/dracula.conf

home-manager/programs/peco/default.nix

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
input * {
22
xkb_layout "jp"
33
}
4-
5-
for_window [app_id="FloatingVim"] floating enable
6-
bindsym $mod+i exec XMODIFIERS=@im= ~/.config/sway/ime.sh

home-manager/programs/sway/default.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
xdg.configFile = {
33
"sway/wallpaper.png".source = ./wallpaper.png;
44
"sway/config".source = ./config;
5-
"sway/ime.sh" = {
6-
source = ./ime.sh;
7-
executable = true;
8-
};
95
"sway/emacs-ime.sh" = {
106
source = ./emacs-ime.sh;
117
executable = true;

home-manager/programs/sway/emacs-ime.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
#!/bin/bash
1+
#! /usr/bin/env nix-shell
2+
#! nix-shell -i bash -p bash
23

34
TEMP_FILE=$(mktemp)
45

5-
# Kittyを起動し、専用の設定ファイルを適用し、タイトルを設定
6-
# -c は --config の短縮形
76
kitty \
8-
-c ~/.config/kitty/emacsclient_transparent.conf \
7+
--config ~/.config/kitty/emacsclient_transparent.conf \
98
--title "Temporary Editor" \
109
sh -c "
1110
emacsclient -c --eval \

home-manager/programs/sway/ime.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

home-manager/programs/swaylock/config

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
image=~/.config/swaylock/dracula-wallpaper.svg
2+
3+
daemonize
4+
show-failed-attempts
5+
clock
6+
screenshot
7+
effect-blur=13x13
8+
effect-vignette=0.5:0.5
9+
color=6272A4
10+
font="Inter"
11+
indicator
12+
indicator-radius=200
13+
indicator-thickness=20
14+
line-color=282A36
15+
ring-color=BD93F9
16+
inside-color=282A36
17+
key-hl-color=50FA7B
18+
separator-color=00000000
19+
text-color=F8F8F2
20+
text-caps-lock-color=""
21+
line-ver-color=BD93F9
22+
ring-ver-color=BD93F9
23+
inside-ver-color=282A36
24+
text-ver-color=8BE9FD
25+
ring-wrong-color=FF5555
26+
text-wrong-color=FF5555
27+
inside-wrong-color=282A36
28+
inside-clear-color=282A36
29+
text-clear-color=8BE9FD
30+
ring-clear-color=8BE9FD
31+
line-clear-color=8BE9FD
32+
line-wrong-color=282A36
33+
bs-hl-color=8BE9FD
34+
grace=2
35+
grace-no-mouse
36+
grace-no-touch
37+
datestr=%a, %B %e
38+
timestr=%I:%M %p
39+
fade-in=0.4
40+
ignore-empty-password

0 commit comments

Comments
 (0)