Skip to content

Commit 6272f57

Browse files
takeokunntakeokunn
committed
update
1 parent d5427fc commit 6272f57

File tree

5 files changed

+71
-178
lines changed

5 files changed

+71
-178
lines changed

‎home-manager/programs/emacs/elisp/init.org

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4506,14 +4506,13 @@ https://github.com/ch11ng/exwm/wiki#gpg-pinentry
45064506
(add-hook 'prog-mode-hook #'view-mode)))
45074507

45084508
;; config
4509-
45104509
(setq org-capture-use-agenda-date t)
45114510
(setq org-capture-bookmark nil)
45124511
(setq org-capture-templates `(("m" "Memo" entry (file ,(expand-file-name "memo.org" org-directory))
45134512
"* %T\n%?")
45144513
("j" "Journal" entry (file+olp+datetree ,(expand-file-name "journal.org" org-directory))
45154514
"* %U\n%?\n%i\n")
4516-
("1" "OPENLOGI" entry (file+headline ,(expand-file-name "task/openlogi.org" org-directory) "Backlog")
4515+
("1" "Attm" entry (file+headline ,(expand-file-name "task/attm.org" org-directory) "Backlog")
45174516
"** TODO Capture %U\n%?")
45184517
("2" "Other" entry (file+headline ,(expand-file-name "task/other.org" org-directory) "Backlog")
45194518
"** TODO Capture %U\n%?"))))

‎home-manager/programs/waybar/config

Lines changed: 37 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,53 @@
11
{
22
"layer": "top",
33
"position": "top",
4+
"height": 24,
5+
"spacing": 4,
46
"modules-left": [
5-
"sway/workspaces",
6-
"custom/right-arrow-dark"
7+
"wlr/workspaces",
8+
"wlr/taskbar"
79
],
810
"modules-center": [
9-
"custom/left-arrow-dark",
10-
"clock#1",
11-
"custom/left-arrow-light",
12-
"custom/left-arrow-dark",
13-
"clock#2",
14-
"custom/right-arrow-dark",
15-
"custom/right-arrow-light",
16-
"clock#3",
17-
"custom/right-arrow-dark"
11+
"hyprland/window"
1812
],
1913
"modules-right": [
20-
"custom/left-arrow-dark",
21-
"pulseaudio",
22-
"custom/left-arrow-light",
23-
"custom/left-arrow-dark",
24-
"memory",
25-
"custom/left-arrow-light",
26-
"custom/left-arrow-dark",
27-
"cpu",
28-
"custom/left-arrow-light",
29-
"custom/left-arrow-dark",
30-
"battery",
31-
"custom/left-arrow-light",
32-
"custom/left-arrow-dark",
33-
"disk",
34-
"custom/left-arrow-light",
35-
"custom/left-arrow-dark",
36-
"tray"
14+
"tray",
15+
"hyprland/language",
16+
"custom/weather",
17+
"clock"
3718
],
38-
"custom/left-arrow-dark": {
39-
"format": "",
40-
"tooltip": false
41-
},
42-
"custom/left-arrow-light": {
43-
"format": "",
44-
"tooltip": false
45-
},
46-
"custom/right-arrow-dark": {
47-
"format": "",
48-
"tooltip": false
49-
},
50-
"custom/right-arrow-light": {
51-
"format": "",
52-
"tooltip": false
53-
},
54-
"sway/workspaces": {
55-
"disable-scroll": true,
56-
"format": "{name}"
57-
},
58-
"clock#1": {
59-
"format": "{:%a}",
60-
"tooltip": false
61-
},
62-
"clock#2": {
63-
"format": "{:%Y-%m-%d}",
64-
"tooltip": false
65-
},
66-
"clock#3": {
67-
"format": "{:%H:%M}",
68-
"tooltip": false
69-
},
70-
"pulseaudio": {
71-
"format": "{icon} {volume:2}%",
72-
"format-bluetooth": "{icon} {volume}%",
73-
"format-muted": "MUTE",
74-
"format-icons": {
75-
"headphones": " ",
76-
"default": [
77-
" ",
78-
" "
79-
]
80-
},
81-
"scroll-step": 5,
82-
"on-click": "pamixer -t",
83-
"on-click-right": "pavucontrol"
84-
},
85-
"memory": {
86-
"interval": 5,
87-
"format": "Mem {}%"
19+
"wlr/taskbar": {
20+
"on-click": "activate",
21+
"on-click-middle": "close",
22+
"ignore-list": [
23+
"foot"
24+
]
8825
},
89-
"cpu": {
90-
"interval": 5,
91-
"format": "CPU {usage:2}%"
26+
"wlr/workspaces": {
27+
"on-click": "activate",
28+
"on-scroll-up": "hyprctl dispatch workspace e-1",
29+
"on-scroll-down": "hyprctl dispatch workspace e+1"
9230
},
93-
"battery": {
94-
"states": {
95-
"good": 95,
96-
"warning": 30,
97-
"critical": 15
98-
},
99-
"format": "{icon} {capacity}%",
100-
"format-icons": [
101-
" ",
102-
" ",
103-
" ",
104-
" ",
105-
" "
106-
]
31+
"hyprland/window": {
32+
"max-length": 128
10733
},
108-
"disk": {
109-
"interval": 5,
110-
"format": "Disk {percentage_used:2}%",
111-
"path": "/"
34+
"clock": {
35+
"format": "{:%c}",
36+
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
11237
},
11338
"tray": {
114-
"icon-size": 20
39+
"spacing": 4
40+
},
41+
"custom/weather": {
42+
"exec": "~/.config/waybar/wittr.sh",
43+
"return-type": "json",
44+
"format": "{}",
45+
"tooltip": true,
46+
"interval": 900
47+
},
48+
"hyprland/language": {
49+
"format-pl": "[pl]",
50+
"format-en": "[us]",
51+
"on-click": "hyprctl switchxkblayout at-translated-set-2-keyboard next"
11552
}
11653
}

‎home-manager/programs/waybar/default.nix

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{ pkgs }:
22
{
3-
home.file = {
4-
".config/waybar/colors.css".source = ./colors.css;
5-
".config/waybar/style.css".source = ./style.css;
6-
".config/waybar/config".source = ./config;
3+
xdg.configFile = {
4+
"waybar/colors.css".source = ./colors.css;
5+
"waybar/style.css".source = ./style.css;
6+
"waybar/config".source = ./config;
7+
"waybar/wittr.sh".source = ./wittr.sh;
78
};
89

910
programs.waybar.enable = pkgs.stdenv.isLinux;

‎home-manager/programs/waybar/style.css

Lines changed: 22 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,46 @@
11
@import url("./colors.css");
2+
23
* {
3-
border: none;
4-
border-radius: 0;
5-
font-family: HackGenNerd;
6-
font-size: 11pt;
7-
min-height: 0;
4+
border: none;
5+
border-radius: 0;
6+
font-family: Iosevka;
7+
font-size: 11pt;
8+
min-height: 0;
89
}
910

1011
window#waybar {
11-
opacity: 0.9;
12-
background: @background-darker;
13-
color: @foreground;
14-
border-bottom: 2px solid @background;
12+
opacity: 0.9;
13+
background: @background-darker;
14+
color: @foreground;
15+
border-bottom: 2px solid @background;
1516
}
1617

1718
#workspaces button {
18-
padding: 0 10px;
19-
background: @background;
20-
color: @foreground;
19+
padding: 0 10px;
20+
background: @background;
21+
color: @foreground;
2122
}
2223

2324
#workspaces button:hover {
24-
box-shadow: inherit;
25-
text-shadow: inherit;
26-
background-image: linear-gradient(0deg, @selection, @background-darker);
25+
box-shadow: inherit;
26+
text-shadow: inherit;
27+
background-image: linear-gradient(0deg, @selection, @background-darker);
2728
}
2829

30+
#workspaces button.focused,
2931
#workspaces button.active {
30-
background-image: linear-gradient(0deg, @purple, @selection);
32+
background-image: linear-gradient(0deg, @purple, @selection);
3133
}
3234

3335
#workspaces button.urgent {
34-
background-image: linear-gradient(0deg, @red, @background-darker);
36+
background-image: linear-gradient(0deg, @red, @background-darker);
3537
}
3638

3739
#taskbar button.active {
38-
background-image: linear-gradient(0deg, @selection, @background-darker);
40+
background-image: linear-gradient(0deg, @selection, @background-darker);
3941
}
4042

4143
#clock {
42-
padding: 0 4px;
43-
background: @background;
44-
}
45-
46-
#custom-right-arrow-dark,
47-
#custom-left-arrow-dark {
48-
color: @background-darker;
49-
}
50-
#custom-right-arrow-light,
51-
#custom-left-arrow-light {
52-
color: @background;
53-
background: @background-darker;
54-
}
55-
56-
#workspaces,
57-
#clock.1,
58-
#clock.2,
59-
#clock.3,
60-
#pulseaudio,
61-
#memory,
62-
#cpu,
63-
#battery,
64-
#disk,
65-
#tray {
66-
background: @background-darker;
67-
}
68-
69-
#workspaces button {
70-
padding: 0 2px;
71-
color: @foreground;
72-
}
73-
74-
#workspaces button.focused {
75-
color: @cyan;
76-
}
77-
78-
#workspaces button:hover {
79-
box-shadow: inherit;
80-
text-shadow: inherit;
81-
}
82-
83-
#workspaces button:hover {
84-
background: @background-darker;
85-
border: @background-darker;
86-
padding: 0 3px;
87-
}
88-
89-
#clock,
90-
#pulseaudio,
91-
#memory,
92-
#cpu,
93-
#battery,
94-
#disk {
95-
padding: 0 10px;
44+
padding: 0 4px;
45+
background: @background;
9646
}

‎home-manager/programs/waybar/wittr.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/sh
2+
3+
req=$(curl -s wttr.in/CITY?format="%t|%l+(%c%f)+%h,+%C")
4+
bar=$(echo $req | awk -F "|" '{print $1}')
5+
tooltip=$(echo $req | awk -F "|" '{print $2}')
6+
echo "{\"text\":\"$bar\", \"tooltip\":\"$tooltip\"}"

0 commit comments

Comments
 (0)