summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-x.config/guix/channels.scm10
-rw-r--r--.emacs.d/.gitignore3
-rw-r--r--.guix-channel13
-rw-r--r--files/.Xmodmap (renamed from .Xmodmap)0
-rw-r--r--files/.bash_profile (renamed from .bash_profile)0
-rwxr-xr-xfiles/.bin/arduino-cli (renamed from .bin/arduino-cli)0
-rwxr-xr-xfiles/.bin/chiaki (renamed from .bin/chiaki)0
-rwxr-xr-xfiles/.bin/clean.sh (renamed from .bin/clean.sh)0
-rwxr-xr-xfiles/.bin/download_music.sh (renamed from .bin/download_music.sh)0
-rwxr-xr-xfiles/.bin/esp_upload.sh (renamed from .bin/esp_upload.sh)0
-rwxr-xr-xfiles/.bin/file_upload.sh (renamed from .bin/file_upload.sh)0
-rwxr-xr-xfiles/.bin/guix-container8
-rwxr-xr-xfiles/.bin/home-reconfigure (renamed from .bin/home-reconfigure)0
-rw-r--r--files/.bin/jd-arduino-cli.Dockerfile (renamed from .bin/jd-arduino-cli.Dockerfile)0
-rwxr-xr-xfiles/.bin/mount-nas-abaks1
-rwxr-xr-xfiles/.bin/oath (renamed from .bin/oath)0
-rwxr-xr-xfiles/.bin/profile-add-all (renamed from .bin/profile-add-all)0
-rwxr-xr-xfiles/.bin/stumpish (renamed from .bin/stumpish)0
-rwxr-xr-xfiles/.bin/system-reconfigure (renamed from .bin/system-reconfigure)0
-rwxr-xr-xfiles/.bin/update.sh (renamed from .bin/update.sh)0
-rwxr-xr-xfiles/.bin/whois-at-hsp (renamed from .bin/whois-at-hsp)14
-rw-r--r--files/.config/alacritty/alacritty.toml46
-rw-r--r--files/.config/alacritty/alacritty.toml.old23
-rw-r--r--files/.config/alacritty/alacritty.yaml27
-rw-r--r--files/.config/common-lisp/source-registry.conf.d/50-user-lisp.conf1
-rw-r--r--files/.config/dunst/dunstrc (renamed from .config/dunst/dunstrc)0
-rw-r--r--files/.config/guix/.gitignore (renamed from .config/guix/.gitignore)0
-rwxr-xr-xfiles/.config/guix/channels.scm19
-rw-r--r--files/.config/guix/shell-authorized-directories10
-rw-r--r--files/.config/picom/picom.conf (renamed from .config/picom/picom.conf)0
-rw-r--r--files/.config/polybar/config.ini (renamed from .config/polybar/config.ini)0
-rwxr-xr-xfiles/.config/qtile/autorc (renamed from .config/qtile/autorc)0
-rw-r--r--files/.config/qtile/config.py (renamed from .config/qtile/config.py)0
-rwxr-xr-xfiles/.config/qtile/mdt_shell (renamed from .config/qtile/mdt_shell)0
-rw-r--r--files/.config/qtile/photos/desktop.png (renamed from .config/qtile/photos/desktop.png)bin1555228 -> 1555228 bytes
-rw-r--r--files/.config/qtile/python.png (renamed from .config/qtile/python.png)bin52166 -> 52166 bytes
-rw-r--r--files/.config/qtile/readme.org (renamed from .config/qtile/readme.org)0
-rw-r--r--files/.config/sway/config (renamed from .config/sway/config)26
-rw-r--r--files/.config/waybar/config (renamed from .config/waybar/config)0
-rw-r--r--files/.config/waybar/style.css (renamed from .config/waybar/style.css)0
-rw-r--r--files/.emacs.d/.gitignore5
-rwxr-xr-xfiles/.emacs.d/init.el (renamed from .emacs.d/init.el)0
-rwxr-xr-xfiles/.emacs.d/jd/jd-apps.el (renamed from .emacs.d/jd/jd-apps.el)0
-rwxr-xr-xfiles/.emacs.d/jd/jd-custom.el (renamed from .emacs.d/jd/jd-custom.el)0
-rwxr-xr-xfiles/.emacs.d/jd/jd-dev.el (renamed from .emacs.d/jd/jd-dev.el)30
-rwxr-xr-xfiles/.emacs.d/jd/jd-exwm.el (renamed from .emacs.d/jd/jd-exwm.el)0
-rwxr-xr-xfiles/.emacs.d/jd/jd-gym.el (renamed from .emacs.d/jd/jd-gym.el)0
-rwxr-xr-xfiles/.emacs.d/jd/jd-keys.el (renamed from .emacs.d/jd/jd-keys.el)1
-rw-r--r--files/.emacs.d/jd/jd-misc.el34
-rwxr-xr-xfiles/.emacs.d/jd/jd-mu4e.el (renamed from .emacs.d/jd/jd-mu4e.el)0
-rwxr-xr-xfiles/.emacs.d/jd/jd-org.el (renamed from .emacs.d/jd/jd-org.el)165
-rw-r--r--files/.emacs.d/jd/jd-sway.el18
-rwxr-xr-xfiles/.emacs.d/jd/jd-ui.el (renamed from .emacs.d/jd/jd-ui.el)18
-rw-r--r--files/.gitignore (renamed from .gitignore)0
-rw-r--r--files/.guile (renamed from .guile)0
-rw-r--r--files/.mbsyncrc (renamed from .mbsyncrc)0
-rw-r--r--files/.nix-channels1
-rw-r--r--files/.stumpwm.d/.gitignore (renamed from .stumpwm.d/.gitignore)0
-rwxr-xr-xfiles/.stumpwm.d/init.lisp (renamed from .stumpwm.d/init.lisp)0
-rw-r--r--guix/jd/desktops/base.scm55
-rwxr-xr-xguix/jd/desktops/berserker.scm36
-rw-r--r--guix/jd/home/services/desktop.scm20
-rw-r--r--guix/jd/packages/linux.scm51
63 files changed, 469 insertions, 166 deletions
diff --git a/.config/guix/channels.scm b/.config/guix/channels.scm
deleted file mode 100755
index 0554922..0000000
--- a/.config/guix/channels.scm
+++ /dev/null
@@ -1,10 +0,0 @@
1(cons* (channel
2 (name 'nonguix)
3 (url "https://gitlab.com/nonguix/nonguix")
4 ;; Enable signature verification:
5 (introduction
6 (make-channel-introduction
7 "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
8 (openpgp-fingerprint
9 "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
10 %default-channels)
diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore
deleted file mode 100644
index f51c6b4..0000000
--- a/.emacs.d/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
1*
2!init.el
3!jd/ \ No newline at end of file
diff --git a/.guix-channel b/.guix-channel
new file mode 100644
index 0000000..c788233
--- /dev/null
+++ b/.guix-channel
@@ -0,0 +1,13 @@
1(channel
2 (version 0)
3 (directory "guix")
4 (url "https://git.jdlugosz.com/personal/dotfiles/")
5 (dependencies
6 (channel
7 (name nonguix)
8 (url "https://gitlab.com/nonguix/nonguix")
9 (branch "master"))
10 (channel
11 (name rustup)
12 (url "https://github.com/declantsien/guix-rustup")
13 (branch "master")))) \ No newline at end of file
diff --git a/.Xmodmap b/files/.Xmodmap
index cb4706f..cb4706f 100644
--- a/.Xmodmap
+++ b/files/.Xmodmap
diff --git a/.bash_profile b/files/.bash_profile
index 14802fe..14802fe 100644
--- a/.bash_profile
+++ b/files/.bash_profile
diff --git a/.bin/arduino-cli b/files/.bin/arduino-cli
index 7c0d41a..7c0d41a 100755
--- a/.bin/arduino-cli
+++ b/files/.bin/arduino-cli
diff --git a/.bin/chiaki b/files/.bin/chiaki
index 5fa6547..5fa6547 100755
--- a/.bin/chiaki
+++ b/files/.bin/chiaki
diff --git a/.bin/clean.sh b/files/.bin/clean.sh
index 3e6bbfd..3e6bbfd 100755
--- a/.bin/clean.sh
+++ b/files/.bin/clean.sh
diff --git a/.bin/download_music.sh b/files/.bin/download_music.sh
index e3a3601..e3a3601 100755
--- a/.bin/download_music.sh
+++ b/files/.bin/download_music.sh
diff --git a/.bin/esp_upload.sh b/files/.bin/esp_upload.sh
index 27d8d41..27d8d41 100755
--- a/.bin/esp_upload.sh
+++ b/files/.bin/esp_upload.sh
diff --git a/.bin/file_upload.sh b/files/.bin/file_upload.sh
index 0ff6c57..0ff6c57 100755
--- a/.bin/file_upload.sh
+++ b/files/.bin/file_upload.sh
diff --git a/files/.bin/guix-container b/files/.bin/guix-container
new file mode 100755
index 0000000..162eda0
--- /dev/null
+++ b/files/.bin/guix-container
@@ -0,0 +1,8 @@
1#!/bin/sh
2
3guix shell -C -F -N \
4 -E XDG_RUNTIME_DIR=/tmp \
5 -E WAYLAND_DISPLAY \
6 -E DISPLAY \
7 --share=$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY=/tmp/$WAYLAND_DISPLAY \
8 $@ coreutils
diff --git a/.bin/home-reconfigure b/files/.bin/home-reconfigure
index f3a4e5f..f3a4e5f 100755
--- a/.bin/home-reconfigure
+++ b/files/.bin/home-reconfigure
diff --git a/.bin/jd-arduino-cli.Dockerfile b/files/.bin/jd-arduino-cli.Dockerfile
index cb8eb91..cb8eb91 100644
--- a/.bin/jd-arduino-cli.Dockerfile
+++ b/files/.bin/jd-arduino-cli.Dockerfile
diff --git a/files/.bin/mount-nas-abaks b/files/.bin/mount-nas-abaks
new file mode 100755
index 0000000..6c14817
--- /dev/null
+++ b/files/.bin/mount-nas-abaks
@@ -0,0 +1 @@
sudo mount -t cifs -o vers=2.0,username=kdlugosz,password=$(pass nas/abaks/kdlugosz) //195.74.91.28/kdlugosz /mnt \ No newline at end of file
diff --git a/.bin/oath b/files/.bin/oath
index 7444993..7444993 100755
--- a/.bin/oath
+++ b/files/.bin/oath
diff --git a/.bin/profile-add-all b/files/.bin/profile-add-all
index bca4178..bca4178 100755
--- a/.bin/profile-add-all
+++ b/files/.bin/profile-add-all
diff --git a/.bin/stumpish b/files/.bin/stumpish
index 9e95c0c..9e95c0c 100755
--- a/.bin/stumpish
+++ b/files/.bin/stumpish
diff --git a/.bin/system-reconfigure b/files/.bin/system-reconfigure
index c4c1a05..c4c1a05 100755
--- a/.bin/system-reconfigure
+++ b/files/.bin/system-reconfigure
diff --git a/.bin/update.sh b/files/.bin/update.sh
index e6f9f8d..e6f9f8d 100755
--- a/.bin/update.sh
+++ b/files/.bin/update.sh
diff --git a/.bin/whois-at-hsp b/files/.bin/whois-at-hsp
index 0cd03f7..982a90e 100755
--- a/.bin/whois-at-hsp
+++ b/files/.bin/whois-at-hsp
@@ -51,13 +51,13 @@
51 0)) 51 0))
52 52
53(define-syntax-rule (command-line-args-handle args default ((option ...) body ...) ...) 53(define-syntax-rule (command-line-args-handle args default ((option ...) body ...) ...)
54 (let ((option? (lambda (o) (command-line-option? o args))) 54 (let ((option? (lambda (o) (command-line-option? o args))))
55 (something-executed? #f)) 55 (cond ((or (option? option) ...) body ...) ...
56 (when (or (option? option) ...) 56 (#t default))))
57 (set! something-executed? #t) 57
58 body ...) ... 58;; (command-line-args-handle '("a" "--help")
59 (when (not something-executed?) 59;; 0
60 default))) 60;; (("-h" "--help") "dupa"))
61 61
62(define (main args) 62(define (main args)
63 (let ((whois-data (http-get-serialize-json whois-at-hsp-endpoint))) 63 (let ((whois-data (http-get-serialize-json whois-at-hsp-endpoint)))
diff --git a/files/.config/alacritty/alacritty.toml b/files/.config/alacritty/alacritty.toml
new file mode 100644
index 0000000..39fd4e9
--- /dev/null
+++ b/files/.config/alacritty/alacritty.toml
@@ -0,0 +1,46 @@
1[cursor]
2style = "Block"
3unfocused_hollow = true
4
5[font]
6size = 14
7
8[font.italic]
9family = "Terminus"
10style = "Light Italic"
11
12[font.normal]
13family = "Terminus"
14style = "Light"
15
16[font.offset]
17x = 0
18y = 0
19
20[window]
21dynamic_padding = true
22# opacity = 0.90
23
24[colors.bright]
25black = "0x002b36"
26blue = "0x839496"
27cyan = "0x93a1a1"
28green = "0x586e75"
29magenta = "0x6c71c4"
30red = "0xcb4b16"
31white = "0xfdf6e3"
32yellow = "0x657b83"
33
34[colors.normal]
35black = "0x073642"
36blue = "0x268bd2"
37cyan = "0x2aa198"
38green = "0x859900"
39magenta = "0xd33682"
40red = "0xdc322f"
41white = "0xeee8d5"
42yellow = "0xb58900"
43
44[colors.primary]
45background = "0x002b36"
46foreground = "0x839496"
diff --git a/files/.config/alacritty/alacritty.toml.old b/files/.config/alacritty/alacritty.toml.old
new file mode 100644
index 0000000..031d81c
--- /dev/null
+++ b/files/.config/alacritty/alacritty.toml.old
@@ -0,0 +1,23 @@
1[cursor]
2style = "Block"
3unfocused_hollow = true
4
5[font]
6size = 14
7
8[font.italic]
9family = "Terminus"
10style = "Light Italic"
11
12[font.normal]
13family = "Terminus"
14style = "Light"
15
16[font.offset]
17x = 0
18y = 0
19
20[window]
21dynamic_padding = true
22opacity = 0.90
23
diff --git a/files/.config/alacritty/alacritty.yaml b/files/.config/alacritty/alacritty.yaml
new file mode 100644
index 0000000..a4f2823
--- /dev/null
+++ b/files/.config/alacritty/alacritty.yaml
@@ -0,0 +1,27 @@
1colors:
2 # Default colors
3 primary:
4 background: '0x002b36'
5 foreground: '0x839496'
6
7 # Normal colors
8 normal:
9 black: '0x073642'
10 red: '0xdc322f'
11 green: '0x859900'
12 yellow: '0xb58900'
13 blue: '0x268bd2'
14 magenta: '0xd33682'
15 cyan: '0x2aa198'
16 white: '0xeee8d5'
17
18 # Bright colors
19 bright:
20 black: '0x002b36'
21 red: '0xcb4b16'
22 green: '0x586e75'
23 yellow: '0x657b83'
24 blue: '0x839496'
25 magenta: '0x6c71c4'
26 cyan: '0x93a1a1'
27 white: '0xfdf6e3'
diff --git a/files/.config/common-lisp/source-registry.conf.d/50-user-lisp.conf b/files/.config/common-lisp/source-registry.conf.d/50-user-lisp.conf
new file mode 100644
index 0000000..5ffc4fe
--- /dev/null
+++ b/files/.config/common-lisp/source-registry.conf.d/50-user-lisp.conf
@@ -0,0 +1 @@
(:tree "/home/jakub/Projects/lisp/") \ No newline at end of file
diff --git a/.config/dunst/dunstrc b/files/.config/dunst/dunstrc
index b3b93b6..b3b93b6 100644
--- a/.config/dunst/dunstrc
+++ b/files/.config/dunst/dunstrc
diff --git a/.config/guix/.gitignore b/files/.config/guix/.gitignore
index 1f4ddec..1f4ddec 100644
--- a/.config/guix/.gitignore
+++ b/files/.config/guix/.gitignore
diff --git a/files/.config/guix/channels.scm b/files/.config/guix/channels.scm
new file mode 100755
index 0000000..13bee44
--- /dev/null
+++ b/files/.config/guix/channels.scm
@@ -0,0 +1,19 @@
1(cons* (channel
2 (name 'rustup)
3 (url "https://github.com/declantsien/guix-rustup")
4 (introduction
5 (make-channel-introduction
6 "325d3e2859d482c16da21eb07f2c6ff9c6c72a80"
7 (openpgp-fingerprint
8 "F695 F39E C625 E081 33B5 759F 0FC6 8703 75EF E2F5"))))
9
10 (channel
11 (name 'nonguix)
12 (url "https://gitlab.com/nonguix/nonguix")
13 ;; Enable signature verification:
14 (introduction
15 (make-channel-introduction
16 "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
17 (openpgp-fingerprint
18 "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
19 %default-channels)
diff --git a/files/.config/guix/shell-authorized-directories b/files/.config/guix/shell-authorized-directories
new file mode 100644
index 0000000..f6e0c84
--- /dev/null
+++ b/files/.config/guix/shell-authorized-directories
@@ -0,0 +1,10 @@
1/home/jakub/Projects/laco
2/home/jakub/Projects/yasa
3/home/jakub/Projects/trial
4/home/jakub/Projects/matura-infa
5/home/jakub/Projects/abaks-infra
6/home/jakub/Projects/lispz
7/home/jakub/Projects/zig-learning
8/home/jakub/Projects/let-over-lambda
9/home/jakub/Projects/rust
10/home/jakub/temphome/embedded-rust
diff --git a/.config/picom/picom.conf b/files/.config/picom/picom.conf
index 0f3fe1d..0f3fe1d 100644
--- a/.config/picom/picom.conf
+++ b/files/.config/picom/picom.conf
diff --git a/.config/polybar/config.ini b/files/.config/polybar/config.ini
index d43ee51..d43ee51 100644
--- a/.config/polybar/config.ini
+++ b/files/.config/polybar/config.ini
diff --git a/.config/qtile/autorc b/files/.config/qtile/autorc
index c54f683..c54f683 100755
--- a/.config/qtile/autorc
+++ b/files/.config/qtile/autorc
diff --git a/.config/qtile/config.py b/files/.config/qtile/config.py
index 9106731..9106731 100644
--- a/.config/qtile/config.py
+++ b/files/.config/qtile/config.py
diff --git a/.config/qtile/mdt_shell b/files/.config/qtile/mdt_shell
index 90fa6f3..90fa6f3 100755
--- a/.config/qtile/mdt_shell
+++ b/files/.config/qtile/mdt_shell
diff --git a/.config/qtile/photos/desktop.png b/files/.config/qtile/photos/desktop.png
index 8fca190..8fca190 100644
--- a/.config/qtile/photos/desktop.png
+++ b/files/.config/qtile/photos/desktop.png
Binary files differ
diff --git a/.config/qtile/python.png b/files/.config/qtile/python.png
index 9a4b1ed..9a4b1ed 100644
--- a/.config/qtile/python.png
+++ b/files/.config/qtile/python.png
Binary files differ
diff --git a/.config/qtile/readme.org b/files/.config/qtile/readme.org
index 235dd47..235dd47 100644
--- a/.config/qtile/readme.org
+++ b/files/.config/qtile/readme.org
diff --git a/.config/sway/config b/files/.config/sway/config
index 2807f08..cf587fc 100644
--- a/.config/sway/config
+++ b/files/.config/sway/config
@@ -14,10 +14,11 @@ set $generic-display HDMI-A-1
14set $primary-home-display 'Iiyama North America PLE2407HDSD 0x01010101' 14set $primary-home-display 'Iiyama North America PLE2407HDSD 0x01010101'
15set $secondary-home-display 'Dell Inc. DELL E190S M8VPV186CELI' 15set $secondary-home-display 'Dell Inc. DELL E190S M8VPV186CELI'
16 16
17set $primary-display-layout $primary-home-display $generic-display $laptop-display 17set $primary-display-layout 'Samsung Electric Company C34H89x HTJM200007' $primary-home-display $generic-display $laptop-display
18set $secondary-display-layout $secondary-home-display $laptop-display 18set $secondary-display-layout $secondary-home-display $laptop-display
19 19
20output * bg SPOILER_33.png fill 20# output * bg SPOILER_33.png fill
21output * bg #002b36 solid_color
21 22
22output $laptop-display resolution 1920x1080 position 1920,0 23output $laptop-display resolution 1920x1080 position 1920,0
23output $generic-display resolution 1920x1080 position 0,0 24output $generic-display resolution 1920x1080 position 0,0
@@ -65,6 +66,7 @@ bindsym XF86AudioPause exec playerctl pause
65 66
66bindsym print exec grimshot --notify copy area 67bindsym print exec grimshot --notify copy area
67bindsym $mod+print exec grimshot --notify copy output 68bindsym $mod+print exec grimshot --notify copy output
69bindsym $mod+Ctrl+print grimshot save area - | swappy -f -
68 70
69bindsym $mod+Return exec $term 71bindsym $mod+Return exec $term
70 72
@@ -114,7 +116,7 @@ bindsym $mod+Shift+8 move container to workspace number 8
114bindsym $mod+Shift+9 move container to workspace number 9 116bindsym $mod+Shift+9 move container to workspace number 9
115bindsym $mod+Shift+0 move container to workspace number 10 117bindsym $mod+Shift+0 move container to workspace number 10
116 118
117assign [app_id="(firefox-default|qutebrowser|Chromium-browser)"] 2 119assign [app_id="(firefox-default|Firefox|qutebrowser|Chromium-browser)"] 2
118assign [instance="(chromium-browser)"] 2 120assign [instance="(chromium-browser)"] 2
119assign [instance="(spotify)"] 3 121assign [instance="(spotify)"] 3
120assign [app_id=".blueman-manager-real"] 3 122assign [app_id=".blueman-manager-real"] 3
@@ -124,8 +126,7 @@ assign [app_id="vesktop"] 4
124assign [app_id="com.ktechpit.whatsie"] 4 126assign [app_id="com.ktechpit.whatsie"] 4
125assign [instance="(discord)"] 4 127assign [instance="(discord)"] 4
126 128
127for_window [app_id="vesktop"] opacity $opacity 129# for_window [app_id="vesktop"] opacity $opacity
128
129 130
130bindsym $mod+b splith 131bindsym $mod+b splith
131bindsym $mod+v splitv 132bindsym $mod+v splitv
@@ -169,14 +170,15 @@ bindsym $mod+o mode "menu"
169 170
170workspace_layout tabbed 171workspace_layout tabbed
171 172
172default_border normal 3 173# default_border normal 3
173gaps outer 0 174# gaps outer 0
174gaps inner 6 175# gaps inner 6
176# corner_radius 4
177# blur_xray disable
178# blur enable
179# layer_effects "waybar" blur enable
180
175font Terminus (TTF) 12 181font Terminus (TTF) 12
176corner_radius 4
177blur_xray disable
178blur enable
179layer_effects "waybar" blur enable
180bindsym $mod+p exec $menu 182bindsym $mod+p exec $menu
181 183
182 184
diff --git a/.config/waybar/config b/files/.config/waybar/config
index 5ebee30..5ebee30 100644
--- a/.config/waybar/config
+++ b/files/.config/waybar/config
diff --git a/.config/waybar/style.css b/files/.config/waybar/style.css
index 53d732b..53d732b 100644
--- a/.config/waybar/style.css
+++ b/files/.config/waybar/style.css
diff --git a/files/.emacs.d/.gitignore b/files/.emacs.d/.gitignore
new file mode 100644
index 0000000..10f87ad
--- /dev/null
+++ b/files/.emacs.d/.gitignore
@@ -0,0 +1,5 @@
1*
2!init.el
3!jd
4!jd/*
5!.gitignore \ No newline at end of file
diff --git a/.emacs.d/init.el b/files/.emacs.d/init.el
index 090592f..090592f 100755
--- a/.emacs.d/init.el
+++ b/files/.emacs.d/init.el
diff --git a/.emacs.d/jd/jd-apps.el b/files/.emacs.d/jd/jd-apps.el
index f06430b..f06430b 100755
--- a/.emacs.d/jd/jd-apps.el
+++ b/files/.emacs.d/jd/jd-apps.el
diff --git a/.emacs.d/jd/jd-custom.el b/files/.emacs.d/jd/jd-custom.el
index a634baa..a634baa 100755
--- a/.emacs.d/jd/jd-custom.el
+++ b/files/.emacs.d/jd/jd-custom.el
diff --git a/.emacs.d/jd/jd-dev.el b/files/.emacs.d/jd/jd-dev.el
index 569b12f..12cd21b 100755
--- a/.emacs.d/jd/jd-dev.el
+++ b/files/.emacs.d/jd/jd-dev.el
@@ -3,9 +3,9 @@
3 3
4;;; Code: 4;;; Code:
5 5
6(setq c-default-style "linux" 6;; (setq c-default-style "linux"
7 c-basic-offset 8 7;; c-basic-offset 8
8 gdb-many-windows t) 8;; gdb-many-windows t)
9 9
10(use-package lsp-mode 10(use-package lsp-mode
11 :guix-package "emacs-lsp-mode" 11 :guix-package "emacs-lsp-mode"
@@ -17,7 +17,29 @@
17 (setq lsp-modeline-diagnostics-enable nil) 17 (setq lsp-modeline-diagnostics-enable nil)
18 (setq lsp-keymap-prefix "C-c l") 18 (setq lsp-keymap-prefix "C-c l")
19 :config 19 :config
20 (lsp-enable-which-key-integration t)) 20 (lsp-enable-which-key-integration t)
21
22 (global-set-key (kbd "C-x ]")
23 #'(lambda ()
24 (interactive)
25 (forward-page)
26 (recenter-top-bottom 0)))
27
28 (global-set-key (kbd "C-x [")
29 #'(lambda ()
30 (interactive)
31 (backward-page)
32 (recenter-top-bottom 0)))
33
34 (define-key c-mode-map
35 (kbd "C-c C-c")
36 #'(lambda ()
37 (interactive)
38 (compile compile-command)))
39
40 (define-key c-mode-map
41 (kbd "C-c M-c")
42 'compile))
21 43
22(use-package lsp-ivy 44(use-package lsp-ivy
23 :guix-package "emacs-lsp-ivy" 45 :guix-package "emacs-lsp-ivy"
diff --git a/.emacs.d/jd/jd-exwm.el b/files/.emacs.d/jd/jd-exwm.el
index 7731b01..7731b01 100755
--- a/.emacs.d/jd/jd-exwm.el
+++ b/files/.emacs.d/jd/jd-exwm.el
diff --git a/.emacs.d/jd/jd-gym.el b/files/.emacs.d/jd/jd-gym.el
index 581bf65..581bf65 100755
--- a/.emacs.d/jd/jd-gym.el
+++ b/files/.emacs.d/jd/jd-gym.el
diff --git a/.emacs.d/jd/jd-keys.el b/files/.emacs.d/jd/jd-keys.el
index a5b828b..8c1c4cb 100755
--- a/.emacs.d/jd/jd-keys.el
+++ b/files/.emacs.d/jd/jd-keys.el
@@ -11,7 +11,6 @@
11 (global-set-key (kbd "C-<") 'mc/mark-previous-like-this) 11 (global-set-key (kbd "C-<") 'mc/mark-previous-like-this)
12 (global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this)) 12 (global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this))
13 13
14
15(use-package hydra 14(use-package hydra
16 :guix-package "emacs-hydra" 15 :guix-package "emacs-hydra"
17 ;; :defer t 16 ;; :defer t
diff --git a/files/.emacs.d/jd/jd-misc.el b/files/.emacs.d/jd/jd-misc.el
new file mode 100644
index 0000000..2b7d1bd
--- /dev/null
+++ b/files/.emacs.d/jd/jd-misc.el
@@ -0,0 +1,34 @@
1;;; Dotfiles --- Jakub Dlugosz emacs config
2;;; Commentary:
3
4;;; Code:
5
6(defun jd/generete-qr-from-clipboard ()
7 (interactive)
8 (let ((clipboard-value (x-get-clipboard))
9 (clipboard-file-path "/tmp/clipboard_value.txt")
10 (clipboard-out-image "/tmp/qr.png"))
11 (with-temp-file clipboard-file-path
12 (insert clipboard-value))
13 (shell-command (concat
14 "qrencode -o "
15 clipboard-out-image
16 " < "
17 clipboard-file-path))
18 (find-file clipboard-out-image)))
19
20(defun jd/dired-open-file-in-kill-ring ()
21 (interactive)
22 (let* ((last-killed (car kill-ring))
23 (exists-p (file-exists-p last-killed))
24 (dir-p (file-directory-p last-killed)))
25 (cond
26 ((not exists-p) (message "File doesn't exists!"))
27 (dir-p (dired last-killed))
28 ((not dir-p) (find-file last-killed)))))
29
30(global-set-key (kbd "C-c O") #'jd/dired-open-file-in-kill-ring)
31
32(provide 'jd-misc)
33
34;;; jd-misc.el ends here
diff --git a/.emacs.d/jd/jd-mu4e.el b/files/.emacs.d/jd/jd-mu4e.el
index b388201..b388201 100755
--- a/.emacs.d/jd/jd-mu4e.el
+++ b/files/.emacs.d/jd/jd-mu4e.el
diff --git a/.emacs.d/jd/jd-org.el b/files/.emacs.d/jd/jd-org.el
index 1126155..400d00c 100755
--- a/.emacs.d/jd/jd-org.el
+++ b/files/.emacs.d/jd/jd-org.el
@@ -3,9 +3,9 @@
3 3
4;;; Code: 4;;; Code:
5 5
6(defvar jd/org-home "~/Documents/Org") 6(defvar jd/org-home "~/Notes")
7(defvar jd/org-roam-home (concat jd/org-home "/roam")) 7(defvar jd/org-roam-home (concat jd/org-home "/roam"))
8(defvar jd/org-roam-agenda (concat jd/org-home "/agenda")) 8(defvar jd/org-sync (concat jd/org-home "/sync"))
9(defvar jd/org-roam-daily-home (concat jd/org-roam-home "/daily")) 9(defvar jd/org-roam-daily-home (concat jd/org-roam-home "/daily"))
10 10
11(defun jd/org-mode-init () 11(defun jd/org-mode-init ()
@@ -22,12 +22,30 @@
22(use-package org-caldav 22(use-package org-caldav
23 :guix-package "emacs-org-caldav" 23 :guix-package "emacs-org-caldav"
24 :config 24 :config
25 (setq org-caldav-url "http://jdlugosz.com:5232/jdlugosz" 25 (setq org-caldav-url "http://caldav.jdlugosz.com/radicale/admin/"
26 org-caldav-calendar-id "841a6259-8fe5-a178-e326-ddbb7c767e22"
27 org-caldav-inbox (concat jd/org-roam-agenda
28 "/main.org")
29 org-caldav-files nil 26 org-caldav-files nil
30 org-icalendar-timezone "Europe/Warsaw")) 27 org-icalendar-timezone "Europe/Warsaw")
28
29 (defun jd/caldav-calendar-sync ()
30 (interactive)
31 (let ((org-caldav-calendar-id "0c54a523-c7aa-2f26-2c18-a12b69c2bc86")
32 (org-caldav-inbox (concat jd/org-sync
33 "/calendar.org")))
34 (org-caldav-sync)))
35
36 (defun jd/caldav-journal-sync ()
37 (interactive)
38 (let ((org-caldav-calendar-id "3cc70419-a787-5f84-28c6-96f15fc606d9")
39 (org-caldav-inbox (concat jd/org-sync
40 "/journal.org")))
41 (org-caldav-sync)))
42
43 (defun jd/caldav-tasks-sync ()
44 (interactive)
45 (let ((org-caldav-calendar-id "372cbbb3-14f7-fc15-9f7b-cae04114920c")
46 (org-caldav-inbox (concat jd/org-sync
47 "/tasks.org")))
48 (org-caldav-sync))))
31 49
32(use-package org 50(use-package org
33 :guix-package "emacs-org" 51 :guix-package "emacs-org"
@@ -40,39 +58,64 @@
40 ("C-c o P" . #'org-mobile-push) 58 ("C-c o P" . #'org-mobile-push)
41 ("C-c o a" . #'org-agenda) 59 ("C-c o a" . #'org-agenda)
42 :config 60 :config
43 (setq org-directory (file-truename "~/Documents/Org/")) 61 (defun jd/org-mode-file (file-name) (concat org-directory "/" file-name ".org"))
44 (setq org-mobile-inbox-for-pull (concat org-directory "flagged.org")) 62 (setq org-directory (file-truename "~/Notes")
45 (setq org-mobile-directory "~/Documents/Org/Mobile/") 63 org-mobile-directory (concat org-directory "/Mobile")
46 (setq org-agenda-files '("Tasks.org" "Inbox.org" "Habits.org")) 64 org-mobile-inbox-for-pull (concat org-directory "/flagged.org") ;; TODO: ??
47 (setq org-ellipsis " â–¾") 65
48 (setq org-agenda-start-with-log-mode t) 66 org-refile-targets '((org-agenda-files :maxlevel . 1))
49 (setq org-log-done 'time) 67 org-outline-path-complete-in-steps nil
50 (setq org-log-into-drawer t) 68 org-refile-use-outline-path t
51 (setq org-return-follows-link t) 69 org-agenda-files '("Personal.org" "Work.org" "Inbox.org")
52 (setq org-capture-templates 70 org-ellipsis " â–¾"
53 `(("t" "Tasks / Projects") 71 org-agenda-start-with-log-mode t
54 ("tt" "Task" entry (file+olp "Tasks.org" "Inbox") 72 org-log-done 'time
55 "* TODO %?\n %t\n %a\n %i" :empty-lines 1) 73 org-log-into-drawer t
56 ("tT" "Task for tomorow" entry (file+olp "Tasks.org" "Inbox") 74 org-return-follows-link t
57 "* TODO %?\n %t\n SCHEDULED: %(jd-emacs/org-insert-date \"+1d\")>\n %a\n %i" :empty-lines 1) 75 org-latex-listings 'minted
58
59 ("m" "Metrics Capture")
60 ("mm" "Metrics" table-line (file+headline "Metrics.org" "Metrics")
61 "| %U | %^{Weight} | %^{Waist} | %^{Notes} |" :kill-buffer t)
62 ("sh" "School Homework" entry (file+olp "school/todo(jd-emacs/org-insert-date \"1\").org"))))
63
64 (setq org-latex-listings 'minted
65 org-latex-packages-alist '(("" "minted")) 76 org-latex-packages-alist '(("" "minted"))
77
78 org-agenda-custom-commands
79 `(("p" "Planning"
80 ((tags-todo "+planning"
81 ((org-agenda-overriding-header "Planning Tasks")))
82 (tags-todo "-{.*}"
83 ((org-agenda-overriding-header "Untagged Tasks")))
84 (todo "*" ((org-agenda-files '(,(jd/org-mode-file "Inbox")))
85 (org-agenda-overriding-header "Unprocessed Inbox Items")))))
86
87 ("d" "Daily Agenda"
88 ((agenda "" ((org-agenda-span 'day)
89 (org-deadline-warning-days 7)))
90 (tags-todo "+PRIORITY=\"A\""
91 ((org-agenda-overriding-header "High Priority Tasks")))))
92
93 ("w" "Weekly Review"
94 ((agenda ""
95 ((org-agenda-overriding-header "Completed Tasks")
96 (org-agenda-skip-function '(org-agenda-skip-entry-if 'nottodo 'done))
97 (org-agenda-span 'week)))
98
99 (agenda ""
100 ((org-agenda-overriding-header "Unfinished Scheduled Tasks")
101 (org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done))
102 (org-agenda-span 'week))))))
103
104 org-capture-templates
105 `(("i" "Capture to Inbox" entry (file+olp ,(jd/org-mode-file "Inbox") "Inbox")
106 "* TODO %?\n %t\n" :empty-lines 1))
107
66 org-latex-pdf-process 108 org-latex-pdf-process
67 '("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f" 109 '("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
68 "pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f")) 110 "pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"))
111
69 (require 'org-tempo) 112 (require 'org-tempo)
70 113
71 (defun jd/org-font-setup () 114 (defun jd/org-font-setup ()
72 ;; Replace list hyphen with dot 115 ;; Replace list hyphen with dot
73 (font-lock-add-keywords 'org-mode 116 ;; (font-lock-add-keywords 'org-mode
74 '(("^ *\\([-]\\) " 117 ;; '(("^ *\\([.]\\) "
75 (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•-")))))) 118 ;; (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•-"))))))
76 119
77 ;; Set faces for heading levels 120 ;; Set faces for heading levels
78 (dolist (face '((org-level-1 . 1.3) 121 (dolist (face '((org-level-1 . 1.3)
@@ -90,7 +133,6 @@
90 (set-face-attribute 'org-table nil :inherit 'fixed-pitch) 133 (set-face-attribute 'org-table nil :inherit 'fixed-pitch)
91 (set-face-attribute 'org-formula nil :inherit 'fixed-pitch) 134 (set-face-attribute 'org-formula nil :inherit 'fixed-pitch)
92 (set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch)) 135 (set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch))
93 (set-face-attribute 'org-table nil :font "Terminus" :inherit '(shadow fixed-pitch))
94 (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch)) 136 (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch))
95 (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch)) 137 (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch))
96 (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch)) 138 (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch))
@@ -103,7 +145,6 @@
103 (defun jd-emacs/org-timer-stop () 145 (defun jd-emacs/org-timer-stop ()
104 (start-process-shell-command "notify-send" nil "notify-send Zakonczono odliczanie")) 146 (start-process-shell-command "notify-send" nil "notify-send Zakonczono odliczanie"))
105 147
106
107 (add-hook 'org-timer-stop-hook #'jd-emacs/org-timer-stop) 148 (add-hook 'org-timer-stop-hook #'jd-emacs/org-timer-stop)
108 149
109 (defun jd/org-tempo-setup () 150 (defun jd/org-tempo-setup ()
@@ -124,16 +165,8 @@
124 (org-babel-do-load-languages 165 (org-babel-do-load-languages
125 'org-babel-load-languages 166 'org-babel-load-languages
126 '((emacs-lisp . t) 167 '((emacs-lisp . t)
127 (python . t))) 168 (python . t)
128 169 (shell . t))))
129 (defun jd/org-babel-tangle-config ()
130 (when (string-equal (file-name-directory (buffer-file-name))
131 (expand-file-name "~/dotfiles/"))
132 ;; Dynamic scoping to the rescue
133 (let ((org-confirm-babel-evaluate nil))
134 (org-babel-tangle))))
135
136 (add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'jd/org-babel-tangle-config))))
137 170
138(use-package org-superstar 171(use-package org-superstar
139 :guix-package "emacs-org-superstar" 172 :guix-package "emacs-org-superstar"
@@ -157,6 +190,8 @@
157 :bind-keymap 190 :bind-keymap
158 ("C-c n d" . org-roam-dailies-map) 191 ("C-c n d" . org-roam-dailies-map)
159 :config 192 :config
193 (require 'org-roam-dailies)
194
160 (defun jd/org-roam-filter-by-tag (tag-name) 195 (defun jd/org-roam-filter-by-tag (tag-name)
161 (lambda (node) 196 (lambda (node)
162 (member tag-name (org-roam-node-tags node)))) 197 (member tag-name (org-roam-node-tags node))))
@@ -167,45 +202,17 @@
167 (jd/org-roam-filter-by-tag tag-name) 202 (jd/org-roam-filter-by-tag tag-name)
168 (org-roam-node-list)))) 203 (org-roam-node-list))))
169 204
170 (defun jd/org-roam-refreshagenda-list ()
171 (interactive)
172 (setq org-agenda-files (org-roam-list-files)))
173
174 (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag))) 205 (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
175 (setq org-roam-capture-templates 206 (setq org-roam-capture-templates
176 '(("a" "workstuff" plain (file (concat org-roam-directory "/work")) 207 '(("d" "default" plain "%?"
177 :target (file+head "work/%<%Y%m%d%H%M%S>-${slug}.org"
178 "#+title: ${title}\n")
179 :unnarrowed t)
180 ("b" "research" plain (file "~/Documents/roam/study/templates/research.org")
181 :target (file+head "study/%<%Y%m%d%H%M%S>-${slug}.org"
182 "#+title: ${title}\n")
183 :unnarrowed t)
184 ("s" "School")
185 ("ss" "School General" plain nil
186 :target (file+head
187 "school/%<%Y%m%d%H%M%S>-${slug}.org"
188 "#+title: ${title}\n")
189 :unnarrowed t)
190 ("sp" "Polish Lesson" plain nil
191 :target (file+head
192 "school/polish/%<%Y%m%d%H%M%S>-${slug}.org"
193 "#+title: ${title}\n")
194 :unnarrowed t)
195 ("sw" "Wos Lesson" plain nil
196 :target (file+head
197 "school/wos/%<%Y%m%d%H%M%S>-${slug}.org"
198 "#+title: ${title}\n")
199 :unnarrowed t)
200 ("g" "Guitar" plain nil
201 :target (file+head 208 :target (file+head
202 "guitar/%<%Y%m%d%H%M%S>-${slug}.org" 209 "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n\n* ${title}\n %?") ;; TODO: point cursor to the end of the file, it should be: `%?`
203 "#+title: ${title}\n")
204 :unnarrowed t) 210 :unnarrowed t)
205 ("d" "default" plain nil 211 ;; ("n" "insert node" plain (file "~/Documents/roam/study/templates/research.org")
206 :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" 212 ;; :target (file+head "study/%<%Y%m%d%H%M%S>-${slug}.org"
207 "#+title: ${title}\n") 213 ;; "#+title: ${title}\n")
208 :unnarrowed t))) 214 ;; :unnarrowed t)
215 ))
209 216
210 (org-roam-db-autosync-mode)) 217 (org-roam-db-autosync-mode))
211 218
diff --git a/files/.emacs.d/jd/jd-sway.el b/files/.emacs.d/jd/jd-sway.el
new file mode 100644
index 0000000..cdfb667
--- /dev/null
+++ b/files/.emacs.d/jd/jd-sway.el
@@ -0,0 +1,18 @@
1;;; Dotfiles --- Jakub Dlugosz emacs config
2;;; Commentary:
3
4;;; Code:
5
6(defun use-package-normalize/:diminish (name keyword args)
7 (use-package-as-one (symbol-name keyword) args
8 (apply-partially #'use-package-normalize-diminish name) t))
9
10(use-package shackle
11 :guix-package "emacs-shackle")
12
13(use-package sway
14 :guix-package "emacs-sway")
15
16(provide 'jd-sway)
17
18;;; jd-sway.el ends here
diff --git a/.emacs.d/jd/jd-ui.el b/files/.emacs.d/jd/jd-ui.el
index 992ba17..4e388c9 100755
--- a/.emacs.d/jd/jd-ui.el
+++ b/files/.emacs.d/jd/jd-ui.el
@@ -11,13 +11,17 @@
11(menu-bar-mode -1) 11(menu-bar-mode -1)
12(set-fringe-mode 10) 12(set-fringe-mode 10)
13 13
14(set-frame-parameter (selected-frame) 'alpha '(92 . 92)) 14;; (set-frame-parameter (selected-frame) 'alpha '(92 . 92))
15(add-to-list 'default-frame-alist '(alpha . (92 . 92))) 15;; (add-to-list 'default-frame-alist '(alpha . (92 . 92)))
16 16
17(custom-set-faces 17(let ((height (if (string-equal (system-name)
18 '(default ((t (:inherit nil :height 125 :family "Terminus")))) 18 "berserker")
19 '(line-number ((t (:inherit nil :height 125 :family "Terminus")))) 19 175
20 '(line-number-current-line ((t (:inherit nil :height 125 :family "Terminus"))))) 20 125)))
21 (custom-set-faces
22 `(default ((t (:inherit nil :height ,height :family "Terminus"))))
23 `(line-number ((t (:inherit nil :height ,height :family "Terminus"))))
24 `(line-number-current-line ((t (:inherit nil :height ,height :family "Terminus"))))))
21 25
22(add-hook 'prog-mode-hook 'menu-bar--display-line-numbers-mode-relative) 26(add-hook 'prog-mode-hook 'menu-bar--display-line-numbers-mode-relative)
23 27
diff --git a/.gitignore b/files/.gitignore
index f3fe7e5..f3fe7e5 100644
--- a/.gitignore
+++ b/files/.gitignore
diff --git a/.guile b/files/.guile
index 2076bd2..2076bd2 100644
--- a/.guile
+++ b/files/.guile
diff --git a/.mbsyncrc b/files/.mbsyncrc
index 20a8692..20a8692 100644
--- a/.mbsyncrc
+++ b/files/.mbsyncrc
diff --git a/files/.nix-channels b/files/.nix-channels
new file mode 100644
index 0000000..46c3d72
--- /dev/null
+++ b/files/.nix-channels
@@ -0,0 +1 @@
https://nixos.org/channels/nixos-23.11 nixos
diff --git a/.stumpwm.d/.gitignore b/files/.stumpwm.d/.gitignore
index 4c478cf..4c478cf 100644
--- a/.stumpwm.d/.gitignore
+++ b/files/.stumpwm.d/.gitignore
diff --git a/.stumpwm.d/init.lisp b/files/.stumpwm.d/init.lisp
index 0970718..0970718 100755
--- a/.stumpwm.d/init.lisp
+++ b/files/.stumpwm.d/init.lisp
diff --git a/guix/jd/desktops/base.scm b/guix/jd/desktops/base.scm
index c613c26..079d57e 100644
--- a/guix/jd/desktops/base.scm
+++ b/guix/jd/desktops/base.scm
@@ -18,7 +18,7 @@
18 #:use-module (nongnu system linux-initrd)) 18 #:use-module (nongnu system linux-initrd))
19 19
20(use-package-modules wm gnome networking virtualization 20(use-package-modules wm gnome networking virtualization
21 lisp lisp-xyz cups fonts gnupg) 21 lisp lisp-xyz cups fonts gnupg android)
22 22
23(use-service-modules cups desktop networking ssh xorg 23(use-service-modules cups desktop networking ssh xorg
24 docker virtualization pm sound dbus 24 docker virtualization pm sound dbus
@@ -68,6 +68,7 @@
68 "audio" ;; control audio devices 68 "audio" ;; control audio devices
69 "video" ;; access to webcam 69 "video" ;; access to webcam
70 "dialout" ;; access to /dev/ttyUSBX devices 70 "dialout" ;; access to /dev/ttyUSBX devices
71 "adbusers"
71 )))) 72 ))))
72 73
73(define-public %jd-base-user-accounts 74(define-public %jd-base-user-accounts
@@ -147,7 +148,7 @@
147 (map (lambda (tty) 148 (map (lambda (tty)
148 (cons tty (file-append 149 (cons tty (file-append
149 font-terminus 150 font-terminus
150 "/share/consolefonts/ter-112n"))) 151 "/share/consolefonts/ter-122n.psf.gz")))
151 '("tty1" "tty2" "tty3" "tty4" "tty5" "tty6"))) 152 '("tty1" "tty2" "tty3" "tty4" "tty5" "tty6")))
152 153
153 (service screen-locker-service-type 154 (service screen-locker-service-type
@@ -167,6 +168,7 @@
167 (bluetooth-configuration 168 (bluetooth-configuration
168 (auto-enable? #t))) 169 (auto-enable? #t)))
169 170
171 (service containerd-service-type)
170 (service docker-service-type) 172 (service docker-service-type)
171 (service libvirt-service-type 173 (service libvirt-service-type
172 (libvirt-configuration 174 (libvirt-configuration
@@ -188,29 +190,38 @@
188 (service nix-service-type) 190 (service nix-service-type)
189 191
190 polkit-network-manager-service 192 polkit-network-manager-service
193
194 (udev-rules-service 'android android-udev-rules
195 #:groups '("adbusers"))
196
197 (udev-rules-service 'microbit (udev-rule
198 "69-microbit.rules"
199 (string-append "ACTION!=\"add|change\", GOTO=\"microbit_rules_end\""
200 "SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0d28\", ATTR{idProduct}==\"0204\", TAG+=\"uaccess\""
201 "LABEL=\"microbit_rules_end\"")))
191 202
192 ;; %desktop-services 203 ;; %desktop-services
193 (modify-services %desktop-services 204 (modify-services %desktop-services
194 (guix-service-type config => (guix-configuration 205 (guix-service-type config => (guix-configuration
195 (inherit config) 206 (inherit config)
196 (substitute-urls 207 (substitute-urls
197 (append (list "https://substitutes.nonguix.org") 208 (append (list "https://substitutes.nonguix.org")
198 %default-substitute-urls)) 209 %default-substitute-urls))
199 (authorized-keys 210 (authorized-keys
200 (append (list (plain-file "non-guix.pub" 211 (append (list (plain-file "non-guix.pub"
201 "(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))")) 212 "(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))"))
202 %default-authorized-guix-keys)))) 213 %default-authorized-guix-keys))))
203 (delete network-manager-service-type) 214 (delete network-manager-service-type)
204 ;; (delete mingetty-service-type) 215 ;; (delete mingetty-service-type)
205 (delete console-font-service-type) 216 (delete console-font-service-type)
206 217
207 (delete pulseaudio-service-type) 218 (delete pulseaudio-service-type)
208 (delete alsa-service-type) 219 (delete alsa-service-type)
209 (delete (if (string-prefix? "x86_64" 220 (delete (if (string-prefix? "x86_64"
210 (or (%current-target-system) 221 (or (%current-target-system)
211 (%current-system))) 222 (%current-system)))
212 gdm-service-type 223 gdm-service-type
213 sddm-service-type))))) 224 sddm-service-type)))))
214 225
215;; Odin is a base for my operating systems 226;; Odin is a base for my operating systems
216(define-public odin-free 227(define-public odin-free
diff --git a/guix/jd/desktops/berserker.scm b/guix/jd/desktops/berserker.scm
index ed673db..37e7adc 100755
--- a/guix/jd/desktops/berserker.scm
+++ b/guix/jd/desktops/berserker.scm
@@ -1,5 +1,6 @@
1(define-module (jd desktops berserker) 1(define-module (jd desktops berserker)
2 #:use-module (jd desktops base) 2 #:use-module (jd desktops base)
3 #:use-module (jd packages linux)
3 #:use-module (gnu) 4 #:use-module (gnu)
4 #:use-module (gnu home)) 5 #:use-module (gnu home))
5 6
@@ -10,30 +11,35 @@
10(define system 11(define system
11 (operating-system 12 (operating-system
12 (inherit odin-non-free) 13 (inherit odin-non-free)
14 (kernel-loadable-modules (list xmm7360-pci))
13 (host-name "berserker") 15 (host-name "berserker")
14 16
15 (bootloader (bootloader-configuration 17
18 (bootloader (bootloader-configuration
16 (bootloader grub-efi-bootloader) 19 (bootloader grub-efi-bootloader)
17 (targets (list "/boot/efi")))) 20 (targets (list "/boot/efi"))))
21 (mapped-devices (list (mapped-device
22 (source (uuid
23 "1f2b1bf2-89fe-4e2c-8b40-c460572bb776"))
24 (target "crypthome")
25 (type luks-device-mapping))))
18 26
19 (swap-devices (list (swap-space 27 (file-systems (cons* (file-system
20 (target (uuid
21 "70ee2477-66ff-4856-aebf-8a77053c4462")))))
22
23 (file-systems (cons* (file-system
24 (mount-point "/boot/efi")
25 (device (uuid "BE9B-69F0"
26 'fat32))
27 (type "vfat"))
28
29 (file-system
30 (mount-point "/") 28 (mount-point "/")
31 (device (uuid 29 (device (uuid
32 "d8783299-c180-4ca3-9c56-9826797f928d" 30 "66396ba1-bda9-46bd-ab26-5edc46b437d6"
33 'ext4)) 31 'ext4))
34 (type "ext4")) 32 (type "ext4"))
35 33 (file-system
36 %base-file-systems)))) 34 (mount-point "/boot/efi")
35 (device (uuid "482A-B117"
36 'fat32))
37 (type "vfat"))
38 (file-system
39 (mount-point "/home")
40 (device "/dev/mapper/crypthome")
41 (type "ext4")
42 (dependencies mapped-devices)) %base-file-systems))))
37 43
38 44
39(if (getenv "JD_HOME") home system) 45(if (getenv "JD_HOME") home system)
diff --git a/guix/jd/home/services/desktop.scm b/guix/jd/home/services/desktop.scm
index ec3a53a..32c8059 100644
--- a/guix/jd/home/services/desktop.scm
+++ b/guix/jd/home/services/desktop.scm
@@ -20,10 +20,11 @@
20(define (desktop-profile-service config) 20(define (desktop-profile-service config)
21 (append 21 (append
22 (list font-terminus-ttf) 22 (list font-terminus-ttf)
23 (specifications->packages '( ;; sway 23 (specifications->packages '("sway"
24 "swayfx" 24 ;; "swayfx"
25 "swaylock" 25 "swaylock"
26 "swayidle" 26 "swayidle"
27 "swaynotificationcenter"
27 "waybar" 28 "waybar"
28 "fuzzel" 29 "fuzzel"
29 "foot" 30 "foot"
@@ -31,6 +32,7 @@
31 "wl-clipboard" 32 "wl-clipboard"
32 "wlsunset" 33 "wlsunset"
33 "grimshot" 34 "grimshot"
35 "swappy"
34 36
35 "udiskie" 37 "udiskie"
36 ;; rest 38 ;; rest
@@ -54,6 +56,8 @@
54 56
55 "blueman" 57 "blueman"
56 58
59 "nomacs"
60
57 "xdg-utils" 61 "xdg-utils"
58 "xdg-dbus-proxy" 62 "xdg-dbus-proxy"
59 "xdg-desktop-portal-gtk" 63 "xdg-desktop-portal-gtk"
@@ -68,8 +72,8 @@
68 72
69 "dunst" 73 "dunst"
70 74
71 "gimp" 75 ; "gimp"
72 "inkscape" 76 ; "inkscape"
73 77
74 "mpv" 78 "mpv"
75 "youtube-dl" 79 "youtube-dl"
@@ -107,7 +111,11 @@
107 "rlwrap" 111 "rlwrap"
108 112
109 "nheko" 113 "nheko"
110 "quassel")))) 114 "quassel"
115 "inkscape"
116 "gimp"
117 "libreoffice"
118 "steam"))))
111 119
112(define (desktop-environment-variables-service config) 120(define (desktop-environment-variables-service config)
113 `(("GTK_THEME" . "Adwaita:dark") 121 `(("GTK_THEME" . "Adwaita:dark")
@@ -126,7 +134,7 @@
126 ("CLUTTER_BACKEND" . "wayland") 134 ("CLUTTER_BACKEND" . "wayland")
127 ("ELM_ENGINE" . "wayland_egl") 135 ("ELM_ENGINE" . "wayland_egl")
128 ("ECORE_EVAS_ENGINE" . "wayland-egl") 136 ("ECORE_EVAS_ENGINE" . "wayland-egl")
129 ("QT_QPA_PLATFORM" . "wayland-egl"))) 137 ("QT_QPA_PLATFORM" . "wayland-egl"))) ;; QT_QPA_PLATFORM=xcb
130 138
131(define (desktop-xdg-mime-applications-service config) 139(define (desktop-xdg-mime-applications-service config)
132 (home-xdg-mime-applications-configuration 140 (home-xdg-mime-applications-configuration
diff --git a/guix/jd/packages/linux.scm b/guix/jd/packages/linux.scm
new file mode 100644
index 0000000..94549c3
--- /dev/null
+++ b/guix/jd/packages/linux.scm
@@ -0,0 +1,51 @@
1(define-module (jd packages linux)
2 #:use-module (guix packages)
3 #:use-module (guix download)
4 #:use-module (guix build-system linux-module)
5 #:use-module (guix git-download)
6 #:use-module (guix gexp)
7 #:use-module (gnu packages linux)
8 #:use-module (gnu packages pciutils)
9 #:use-module (gnu packages pkg-config)
10 #:use-module (gnu packages autotools)
11 #:use-module ((guix licenses) #:prefix license:))
12
13(define-public xmm7360-pci
14 (package
15 (name "xmm7360-pci")
16 (version "0.1.0")
17 (source
18 (origin
19 (method git-fetch)
20 (uri (git-reference
21 (url "https://github.com/xmm7360/xmm7360-pci.git")
22 (commit "a8ff2c6ceee84cbe74df8a78cfaa5a016d362ed4")))
23 (file-name (git-file-name name version))
24 (sha256
25 (base32
26 "1aals95hk76rgd21rknqc9qfjva6g6gwicw6wz19m20bn08bs2f3"))))
27 (build-system linux-module-build-system)
28 (arguments
29 (list
30 #:tests? #f
31 #:phases
32 #~(modify-phases %standard-phases
33 (add-after 'unpack 'patch-makefile
34 (lambda _
35 (substitute* (find-files
36 "." "^Makefile(\\.include)?$")
37 (("^ccflags-y := .*$")
38 "ccflags-y := -Wno-multichar -Wno-incompatible-pointer-types")))))))
39 (native-inputs
40 `(("pkg-config" ,pkg-config)
41 ("autoconf" ,autoconf)
42 ("automake" ,automake)))
43 (inputs
44 `(("kernel" ,linux-libre)
45 ("pciutils" ,pciutils)))
46 (synopsis "Kernel module for Intel XMM7360 LTE modem")
47 (description
48 "This package provides a kernel module for the Intel XMM7360 LTE modem, allowing it to function in Linux.")
49 (home-page "https://github.com/xmm7360/xmm7360-pci")
50 (license license:gpl3+)))
51
generated by cgit v1.2.3 (git 2.45.2) at 2024-11-21 12:25:26 +0000