Compare commits
3 Commits
10f4940ae1
...
3ff5e00d29
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3ff5e00d29 | ||
|
|
3b76eed716 | ||
|
|
f97659c7db |
@@ -14,7 +14,7 @@
|
|||||||
(setq display-line-numbers-type t)
|
(setq display-line-numbers-type t)
|
||||||
|
|
||||||
;; Fonts
|
;; Fonts
|
||||||
(setq doom-font (font-spec :family "Iosevka" :size 15))
|
(setq doom-font (font-spec :family "Iosevka Nerd Font" :size 15))
|
||||||
(setq doom-unicode-font (font-spec :family "Iosevka Nerd Font" :size 15))
|
(setq doom-unicode-font (font-spec :family "Iosevka Nerd Font" :size 15))
|
||||||
|
|
||||||
;; Themeing
|
;; Themeing
|
||||||
@@ -67,6 +67,18 @@
|
|||||||
(use-package parinfer
|
(use-package parinfer
|
||||||
:defer t)
|
:defer t)
|
||||||
|
|
||||||
|
;; -----------------------------------------------------------------------------
|
||||||
|
;; LSP
|
||||||
|
;; -----------------------------------------------------------------------------
|
||||||
|
(use-package lsp-mode
|
||||||
|
:init
|
||||||
|
:hook (;;
|
||||||
|
(clojure-mode . lsp-deferred)
|
||||||
|
(python-mode . lsp-deferred)
|
||||||
|
;; if you want which-key integration
|
||||||
|
(lsp-mode . lsp-enable-which-key-integration))
|
||||||
|
:commands (lsp lsp-deferred))
|
||||||
|
|
||||||
;; -----------------------------------------------------------------------------
|
;; -----------------------------------------------------------------------------
|
||||||
;; Python
|
;; Python
|
||||||
;; -----------------------------------------------------------------------------
|
;; -----------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -113,7 +113,8 @@
|
|||||||
:lang
|
:lang
|
||||||
;;agda ; types of types of types of types...
|
;;agda ; types of types of types of types...
|
||||||
;;cc ; C/C++/Obj-C madness
|
;;cc ; C/C++/Obj-C madness
|
||||||
clojure ; java with a lisp
|
(clojure
|
||||||
|
+lsp) ; java with a lisp
|
||||||
;;common-lisp ; if you've seen one lisp, you've seen them all
|
;;common-lisp ; if you've seen one lisp, you've seen them all
|
||||||
;;coq ; proofs-as-programs
|
;;coq ; proofs-as-programs
|
||||||
;;crystal ; ruby at the speed of c
|
;;crystal ; ruby at the speed of c
|
||||||
|
|||||||
@@ -7,25 +7,25 @@ adapter = ADP0
|
|||||||
poll-interval = 1
|
poll-interval = 1
|
||||||
|
|
||||||
format-full = <label-full>
|
format-full = <label-full>
|
||||||
label-full = "%{T2}%{T-} %percentage%%"
|
label-full = "%{T2}%{T-} %percentage%%"
|
||||||
label-full-background = ${colours/battery.full-bg}
|
label-full-background = ${colours/battery.full-bg}
|
||||||
label-full-foreground = ${colours/battery.full-fg}
|
label-full-foreground = ${colours/battery.full-fg}
|
||||||
label-full-padding = 1
|
label-full-padding = 1
|
||||||
|
|
||||||
format-charging = <label-charging>
|
format-charging = <label-charging>
|
||||||
label-charging = "%{T2}%{T-} %percentage%%"
|
label-charging = "%{T2}%{T-} %percentage%%"
|
||||||
label-charging-background = ${colours/battery.charging-bg}
|
label-charging-background = ${colours/battery.charging-bg}
|
||||||
label-charging-foreground = ${colours/battery.charging-fg}
|
label-charging-foreground = ${colours/battery.charging-fg}
|
||||||
label-charging-padding = 1
|
label-charging-padding = 1
|
||||||
|
|
||||||
format-discharging = <label-discharging>
|
format-discharging = <label-discharging>
|
||||||
label-discharging = "%{T2}%{T-} %percentage%%"
|
label-discharging = "%{T2}%{T-} %percentage%%"
|
||||||
label-discharging-background = ${colours/battery.discharging-bg}
|
label-discharging-background = ${colours/battery.discharging-bg}
|
||||||
label-discharging-foreground = ${colours/battery.discharging-fg}
|
label-discharging-foreground = ${colours/battery.discharging-fg}
|
||||||
label-discharging-padding = 1
|
label-discharging-padding = 1
|
||||||
|
|
||||||
format-low = <label-low>
|
format-low = <label-low>
|
||||||
label-low = "%{T2}%{T-} %percentage%%"
|
label-low = "%{T2}%{T-} %percentage%%"
|
||||||
label-low-background = ${colours/battery.low-bg}
|
label-low-background = ${colours/battery.low-bg}
|
||||||
label-low-foreground = ${colours/battery.low-fg}
|
label-low-foreground = ${colours/battery.low-fg}
|
||||||
label-low-padding = 1
|
label-low-padding = 1
|
||||||
|
|||||||
@@ -3,13 +3,13 @@ type = internal/pulseaudio
|
|||||||
interval = 5
|
interval = 5
|
||||||
|
|
||||||
format-volume = <label-volume>
|
format-volume = <label-volume>
|
||||||
label-volume = %{T2}墳%{T-} %percentage%%
|
label-volume = %{T2}%{T-} %percentage%%
|
||||||
label-volume-padding = 1
|
label-volume-padding = 1
|
||||||
label-volume-foreground = ${colours/volume.volume-fg}
|
label-volume-foreground = ${colours/volume.volume-fg}
|
||||||
label-volume-background = ${colours/volume.volume-bg}
|
label-volume-background = ${colours/volume.volume-bg}
|
||||||
|
|
||||||
format-muted = <label-muted>
|
format-muted = <label-muted>
|
||||||
label-muted = %{T2}ﱝ%{T-} muted
|
label-muted = %{T2}%{T-} muted
|
||||||
label-muted-padding = 1
|
label-muted-padding = 1
|
||||||
label-muted-foreground = ${colours/volume.muted-fg}
|
label-muted-foreground = ${colours/volume.muted-fg}
|
||||||
label-muted-background = ${colours/volume.muted-bg}
|
label-muted-background = ${colours/volume.muted-bg}
|
||||||
|
|||||||
@@ -11,13 +11,13 @@ accumulate-stats = true
|
|||||||
speed-unit = ''
|
speed-unit = ''
|
||||||
|
|
||||||
format-connected = <label-connected>
|
format-connected = <label-connected>
|
||||||
label-connected = %{T2}直%{T-} %essid% (%local_ip%)
|
label-connected = %{T2}%{T-} %essid% (%local_ip%)
|
||||||
label-connected-background = ${colours/wireless.connected-bg}
|
label-connected-background = ${colours/wireless.connected-bg}
|
||||||
label-connected-foreground = ${colours/wireless.connected-fg}
|
label-connected-foreground = ${colours/wireless.connected-fg}
|
||||||
label-connected-padding = 1
|
label-connected-padding = 1
|
||||||
|
|
||||||
format-disconnected = <label-disconnected>
|
format-disconnected = <label-disconnected>
|
||||||
label-disconnected = %{T2}睊
|
label-disconnected = %{T2}
|
||||||
label-disconnected-background = ${colours/wireless.disconnected-bg}
|
label-disconnected-background = ${colours/wireless.disconnected-bg}
|
||||||
label-disconnected-foreground = ${colours/wireless.disconnected-fg}
|
label-disconnected-foreground = ${colours/wireless.disconnected-fg}
|
||||||
label-disconnected-padding = 1
|
label-disconnected-padding = 1
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ main() {
|
|||||||
album=$(echo "$meta" | sed -nr '/xesam:album"/,+2s/^ +variant +string "(.*)"$/\1/p' | tail -1| sed 's/\&/\\&/g'| sed 's#\/#\\/#g')
|
album=$(echo "$meta" | sed -nr '/xesam:album"/,+2s/^ +variant +string "(.*)"$/\1/p' | tail -1| sed 's/\&/\\&/g'| sed 's#\/#\\/#g')
|
||||||
title=$(echo "$meta" | sed -nr '/xesam:title"/,+2s/^ +variant +string "(.*)"$/\1/p' | tail -1 | sed 's/\&/\\&/g'| sed 's#\/#\\/#g')
|
title=$(echo "$meta" | sed -nr '/xesam:title"/,+2s/^ +variant +string "(.*)"$/\1/p' | tail -1 | sed 's/\&/\\&/g'| sed 's#\/#\\/#g')
|
||||||
|
|
||||||
echo "阮 ${*:-%artist% - %title%}" | sed "s/%artist%/$artist/g;s/%title%/$title/g;s/%album%/$album/g"i | sed "s/\&/\&/g" | sed "s#\/#\/#g"
|
echo " ${*:-%artist% - %title%}" | sed "s/%artist%/$artist/g;s/%title%/$title/g;s/%album%/$album/g"i | sed "s/\&/\&/g" | sed "s#\/#\/#g"
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
@@ -217,7 +217,7 @@ print_status() {
|
|||||||
done
|
done
|
||||||
printf "\n"
|
printf "\n"
|
||||||
else
|
else
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,11 +10,11 @@ theme='powermenu'
|
|||||||
# CMDs
|
# CMDs
|
||||||
|
|
||||||
# Options
|
# Options
|
||||||
shutdown='襤 Shutdown'
|
shutdown=' Shutdown'
|
||||||
reboot=' Reboot'
|
reboot=' Reboot'
|
||||||
lock=' Lock'
|
lock=' Lock'
|
||||||
suspend=' Suspend'
|
suspend=' Suspend'
|
||||||
logout=' Logout'
|
logout=' Logout'
|
||||||
yes='Yes'
|
yes='Yes'
|
||||||
no='No'
|
no='No'
|
||||||
|
|
||||||
|
|||||||
16
flake.lock
generated
16
flake.lock
generated
@@ -77,16 +77,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667907331,
|
"lastModified": 1692099905,
|
||||||
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
|
"narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
|
"rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-22.05",
|
"ref": "release-23.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -141,16 +141,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1668984258,
|
"lastModified": 1692525914,
|
||||||
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=",
|
"narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a",
|
"rev": "475d5ae2c4cb87b904545bdb547af05681198fcc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-22.05",
|
"ref": "nixos-23.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,10 +4,10 @@
|
|||||||
inputs = {
|
inputs = {
|
||||||
|
|
||||||
# - Nixpkgs ----------------------------------
|
# - Nixpkgs ----------------------------------
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
|
||||||
|
|
||||||
# - Home-Manager -----------------------------
|
# - Home-Manager -----------------------------
|
||||||
home-manager.url = "github:nix-community/home-manager/release-22.05";
|
home-manager.url = "github:nix-community/home-manager/release-23.05";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
# - NUR --------------------------------------
|
# - NUR --------------------------------------
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ in
|
|||||||
(nerdfonts.override { fonts = [ "Iosevka" ]; })
|
(nerdfonts.override { fonts = [ "Iosevka" ]; })
|
||||||
];
|
];
|
||||||
|
|
||||||
|
programs.zsh.enable = true;
|
||||||
hm.programs.zsh = {
|
hm.programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dotDir = ".config/zsh";
|
dotDir = ".config/zsh";
|
||||||
|
|||||||
Reference in New Issue
Block a user