sqrtminusone/dotfiles
1
0
Fork 0
mirror of https://github.com/SqrtMinusOne/dotfiles.git synced 2025-12-10 19:23:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

arch: upd

Browse source
This commit is contained in:
Pavel Korytov 2025-11-12 18:23:14 +03:00
parent cbd5ff7b0c
commit 9ffcbde6d2
4 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.config/metapac/groups/system.toml
View file

@ -24,6 +24,7 @@ arch = [
"openssh", "openssh",
"metapac", "metapac",
"nano", "nano",
"inetutils",
"linux-firmware", "linux-firmware",
"linux", "linux",
"lightdm-gtk-greeter", "lightdm-gtk-greeter",

3
Arch.org
View file

@ -71,12 +71,12 @@ yadm clone git@github.com:SqrtMinusOne/dotfiles.git
Checkout the changed files. Checkout the changed files.
Clone the org-mode repo: Clone the org-mode repo:
#+begin_src bash #+begin_src bash
git clone git@github.com:SqrtMinusOne/dotfiles.git "/home/pavel/30-39 Life/32 org-mode" git clone git@github.com:SqrtMinusOne/dotfiles.git "/home/pavel/30-39 Life/32 org-mode"
#+end_src #+end_src
Install wakatime: Install wakatime:
#+begin_src bash #+begin_src bash
cd ~/00-Scratch/ cd ~/00-Scratch/
git clone https://github.com/wakatime/wakatime-cli.git git clone https://github.com/wakatime/wakatime-cli.git
@ -165,6 +165,7 @@ Some necessary Arch packages:
| lightdm-gtk-greeter | | lightdm-gtk-greeter |
| linux | | linux |
| linux-firmware | | linux-firmware |
| inetutils |
| nano | | nano |
| metapac | | metapac |
| openssh | | openssh |

40
Desktop.org
View file

@ -30,8 +30,8 @@ Removed features:
I used to define color codes here (see [[https://github.com/SqrtMinusOne/dotfiles/commit/2dbf1cdd008ec0061456782cca3ebd76e603b31e][previous version of the file]]), now I just get colors from the current Emacs theme. I used to define color codes here (see [[https://github.com/SqrtMinusOne/dotfiles/commit/2dbf1cdd008ec0061456782cca3ebd76e603b31e][previous version of the file]]), now I just get colors from the current Emacs theme.
To use them, let's define a noweb block: To use them, let's define a noweb block:
#+NAME: get-color
#+NAME: get-color
#+begin_src emacs-lisp :var name="black" quote=0 #+begin_src emacs-lisp :var name="black" quote=0
(let ((color (or (my/color-value name)))) (let ((color (or (my/color-value name))))
(if (> quote 0) (if (> quote 0)
@ -1966,17 +1966,19 @@ As we want to interweave polybar modules with these glyphs in the right order an
Also excluding some modules from certain monitors, which for now is about excluding =battery= from the monitors of my desktop PC: Also excluding some modules from certain monitors, which for now is about excluding =battery= from the monitors of my desktop PC:
#+NAME: polybar_modules_exclude #+NAME: polybar_modules_exclude
| Monitor | Exclude | | Monitor | Exclude |
|----------+---------| |-----------+---------|
| DVI-D-0 | battery | | DVI-D-0 | battery |
| HDMI-A-0 | battery | | HDMI-A-0 | battery |
| HDMI-0 | battery | | HDMI-0 | battery |
| DP-1 | battery | | DP-1 | battery |
| eDP | nvidia | | Virtual-1 | battery |
| eDP-1 | nvidia | | eDP | nvidia |
| DVI-D-0 | nvidia | | eDP-1 | nvidia |
| HDMI-A-0 | nvidia | | DVI-D-0 | nvidia |
| HDMI-1 | nvidia | | HDMI-A-0 | nvidia |
| HDMI-1 | nvidia |
| Virtual-1 | nvidia |
Another thing we need to do is to set the color of modules in accordance with the =polybar_modules= table. The background can be determined from the =Color= column with the following code block: Another thing we need to do is to set the color of modules in accordance with the =polybar_modules= table. The background can be determined from the =Color= column with the following code block:
#+NAME: get-polybar-bg #+NAME: get-polybar-bg
@ -2242,6 +2244,7 @@ declare -A FONT_SIZES=(
["HDMI-1"]="13" ["HDMI-1"]="13"
["HDMI-0"]="13" ["HDMI-0"]="13"
["DP-1"]="13" ["DP-1"]="13"
["Virtual-1"]="13"
) )
declare -A EMOJI_SCALE=( declare -A EMOJI_SCALE=(
["eDP"]="9" ["eDP"]="9"
@ -2251,6 +2254,7 @@ declare -A EMOJI_SCALE=(
["HDMI-1"]="10" ["HDMI-1"]="10"
["HDMI-0"]="10" ["HDMI-0"]="10"
["DP-1"]="10" ["DP-1"]="10"
["Virtual-1"]="13"
) )
declare -A BAR_HEIGHT=( declare -A BAR_HEIGHT=(
["eDP"]="29" ["eDP"]="29"
@ -2260,6 +2264,7 @@ declare -A BAR_HEIGHT=(
["HDMI-1"]="29" ["HDMI-1"]="29"
["HDMI-0"]="29" ["HDMI-0"]="29"
["DP-1"]="29" ["DP-1"]="29"
["Virtual-1"]="29"
) )
declare -A BLOCKS=( declare -A BLOCKS=(
["eDP"]="<<polybar-generate-modules(monitor="eDP")>>" ["eDP"]="<<polybar-generate-modules(monitor="eDP")>>"
@ -2269,6 +2274,7 @@ declare -A BLOCKS=(
["HDMI-1"]="<<polybar-generate-modules(monitor="HDMI-1")>>" ["HDMI-1"]="<<polybar-generate-modules(monitor="HDMI-1")>>"
["HDMI-0"]="<<polybar-generate-modules(monitor="HDMI-0")>>" ["HDMI-0"]="<<polybar-generate-modules(monitor="HDMI-0")>>"
["DP-1"]="<<polybar-generate-modules(monitor="DP-1")>>" ["DP-1"]="<<polybar-generate-modules(monitor="DP-1")>>"
["Virtual-1"]="<<polybar-generate-modules(monitor="Virtual-1")>>"
) )
declare -A TEMP_HWMON_PATHS=( declare -A TEMP_HWMON_PATHS=(
@ -4372,6 +4378,10 @@ flatpak install -y --user flathub chat.rocket.RocketChat
:END: :END:
[[https://www.gnu.org/software/shepherd/manual/html_node/index.html][GNU Shepherd]] is a service management system for GNU Guix. I'll probably migrate to systemd since I'm not on Guix anymore. [[https://www.gnu.org/software/shepherd/manual/html_node/index.html][GNU Shepherd]] is a service management system for GNU Guix. I'll probably migrate to systemd since I'm not on Guix anymore.
| Arch dependency | Disabled |
|-----------------+----------|
| shepherd | t |
** Music ** Music
| Category | Arch dependency | | Category | Arch dependency |
|----------+-----------------| |----------+-----------------|
@ -4416,6 +4426,10 @@ MPD watcher
** GNU Mcron ** GNU Mcron
[[https://www.gnu.org/software/mcron/][GNU Mcron]] is a replacement for cron, written in Scheme. [[https://www.gnu.org/software/mcron/][GNU Mcron]] is a replacement for cron, written in Scheme.
| Arch dependency | Disabled |
|-----------------+----------|
| mcron | t |
#+begin_src scheme #+begin_src scheme
(define mcron (define mcron
(make <service> (make <service>
@ -4638,7 +4652,7 @@ Run services
;; opensnitch-ui ;; opensnitch-ui
)) ))
#+end_src #+end_src
* Acch settings * Arch settings
Other desktop programs I use are listed below. Other desktop programs I use are listed below.
| Category | Arch dependency | Description | | Category | Arch dependency | Description |

4
bin/polybar.sh
View file

@ -25,6 +25,7 @@ declare -A FONT_SIZES=(
["HDMI-1"]="13" ["HDMI-1"]="13"
["HDMI-0"]="13" ["HDMI-0"]="13"
["DP-1"]="13" ["DP-1"]="13"
["Virtual-1"]="13"
) )
declare -A EMOJI_SCALE=( declare -A EMOJI_SCALE=(
["eDP"]="9" ["eDP"]="9"
@ -34,6 +35,7 @@ declare -A EMOJI_SCALE=(
["HDMI-1"]="10" ["HDMI-1"]="10"
["HDMI-0"]="10" ["HDMI-0"]="10"
["DP-1"]="10" ["DP-1"]="10"
["Virtual-1"]="13"
) )
declare -A BAR_HEIGHT=( declare -A BAR_HEIGHT=(
["eDP"]="29" ["eDP"]="29"
@ -43,6 +45,7 @@ declare -A BAR_HEIGHT=(
["HDMI-1"]="29" ["HDMI-1"]="29"
["HDMI-0"]="29" ["HDMI-0"]="29"
["DP-1"]="29" ["DP-1"]="29"
["Virtual-1"]="29"
) )
declare -A BLOCKS=( declare -A BLOCKS=(
["eDP"]="glyph-background--light-magenta pulseaudio glyph-light-magenta--magenta mpd glyph-magenta--cyan cpu glyph-cyan--cyan temperature glyph-cyan--cyan battery glyph-cyan--light-green ram-memory glyph-light-green--green swap-memory glyph-green--light-red bandwidth openvpn glyph-light-red--red xkeyboard glyph-red--light-yellow weather glyph-light-yellow--yellow sun glyph-yellow--light-blue aw-afk glyph-light-blue--blue date glyph-blue--background " ["eDP"]="glyph-background--light-magenta pulseaudio glyph-light-magenta--magenta mpd glyph-magenta--cyan cpu glyph-cyan--cyan temperature glyph-cyan--cyan battery glyph-cyan--light-green ram-memory glyph-light-green--green swap-memory glyph-green--light-red bandwidth openvpn glyph-light-red--red xkeyboard glyph-red--light-yellow weather glyph-light-yellow--yellow sun glyph-yellow--light-blue aw-afk glyph-light-blue--blue date glyph-blue--background "
@ -52,6 +55,7 @@ declare -A BLOCKS=(
["HDMI-1"]="glyph-background--light-magenta pulseaudio glyph-light-magenta--magenta mpd glyph-magenta--cyan cpu glyph-cyan--cyan temperature glyph-cyan--cyan battery glyph-cyan--light-green ram-memory glyph-light-green--green swap-memory glyph-green--light-red bandwidth openvpn glyph-light-red--red xkeyboard glyph-red--light-yellow weather glyph-light-yellow--yellow sun glyph-yellow--light-blue aw-afk glyph-light-blue--blue date glyph-blue--background " ["HDMI-1"]="glyph-background--light-magenta pulseaudio glyph-light-magenta--magenta mpd glyph-magenta--cyan cpu glyph-cyan--cyan temperature glyph-cyan--cyan battery glyph-cyan--light-green ram-memory glyph-light-green--green swap-memory glyph-green--light-red bandwidth openvpn glyph-light-red--red xkeyboard glyph-red--light-yellow weather glyph-light-yellow--yellow sun glyph-yellow--light-blue aw-afk glyph-light-blue--blue date glyph-blue--background "
["HDMI-0"]="glyph-background--light-magenta pulseaudio glyph-light-magenta--magenta mpd glyph-magenta--light-cyan nvidia glyph-light-cyan--cyan cpu glyph-cyan--cyan temperature glyph-cyan--light-green ram-memory glyph-light-green--green swap-memory glyph-green--light-red bandwidth openvpn glyph-light-red--red xkeyboard glyph-red--light-yellow weather glyph-light-yellow--yellow sun glyph-yellow--light-blue aw-afk glyph-light-blue--blue date glyph-blue--background " ["HDMI-0"]="glyph-background--light-magenta pulseaudio glyph-light-magenta--magenta mpd glyph-magenta--light-cyan nvidia glyph-light-cyan--cyan cpu glyph-cyan--cyan temperature glyph-cyan--light-green ram-memory glyph-light-green--green swap-memory glyph-green--light-red bandwidth openvpn glyph-light-red--red xkeyboard glyph-red--light-yellow weather glyph-light-yellow--yellow sun glyph-yellow--light-blue aw-afk glyph-light-blue--blue date glyph-blue--background "
["DP-1"]="glyph-background--light-magenta pulseaudio glyph-light-magenta--magenta mpd glyph-magenta--light-cyan nvidia glyph-light-cyan--cyan cpu glyph-cyan--cyan temperature glyph-cyan--light-green ram-memory glyph-light-green--green swap-memory glyph-green--light-red bandwidth openvpn glyph-light-red--red xkeyboard glyph-red--light-yellow weather glyph-light-yellow--yellow sun glyph-yellow--light-blue aw-afk glyph-light-blue--blue date glyph-blue--background " ["DP-1"]="glyph-background--light-magenta pulseaudio glyph-light-magenta--magenta mpd glyph-magenta--light-cyan nvidia glyph-light-cyan--cyan cpu glyph-cyan--cyan temperature glyph-cyan--light-green ram-memory glyph-light-green--green swap-memory glyph-green--light-red bandwidth openvpn glyph-light-red--red xkeyboard glyph-red--light-yellow weather glyph-light-yellow--yellow sun glyph-yellow--light-blue aw-afk glyph-light-blue--blue date glyph-blue--background "
["Virtual-1"]="glyph-background--light-magenta pulseaudio glyph-light-magenta--magenta mpd glyph-magenta--cyan cpu glyph-cyan--cyan temperature glyph-cyan--light-green ram-memory glyph-light-green--green swap-memory glyph-green--light-red bandwidth openvpn glyph-light-red--red xkeyboard glyph-red--light-yellow weather glyph-light-yellow--yellow sun glyph-yellow--light-blue aw-afk glyph-light-blue--blue date glyph-blue--background "
) )
declare -A TEMP_HWMON_PATHS=( declare -A TEMP_HWMON_PATHS=(