Change dotfiles structure, and add guix-channels declaration.

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 @@
-(cons* (channel
-        (name 'nonguix)
-        (url "https://gitlab.com/nonguix/nonguix")
-        ;; Enable signature verification:
-        (introduction
-         (make-channel-introduction
-          "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
-          (openpgp-fingerprint
-           "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
-       %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 @@
-*
-!init.el
-!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 @@
+(channel
+ (version 0)
+ (directory "guix")
+ (url "https://git.jdlugosz.com/personal/dotfiles/")
+ (dependencies
+  (channel
+   (name nonguix)
+   (url "https://gitlab.com/nonguix/nonguix")
+   (branch "master"))
+  (channel
+   (name rustup)
+   (url "https://github.com/declantsien/guix-rustup")
+   (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 @@
+#!/bin/sh
+
+guix shell -C -F -N \
+     -E XDG_RUNTIME_DIR=/tmp \
+     -E WAYLAND_DISPLAY \
+     -E DISPLAY \
+     --share=$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY=/tmp/$WAYLAND_DISPLAY \
+     $@ 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 @@
      0))
 
 (define-syntax-rule (command-line-args-handle args default ((option ...) body ...) ...)
-  (let ((option? (lambda (o) (command-line-option? o args)))
-        (something-executed? #f))
-    (when (or (option? option) ...)
-      (set! something-executed? #t)
-      body ...) ...
-      (when (not something-executed?)
-        default)))
+  (let ((option? (lambda (o) (command-line-option? o args))))
+    (cond ((or (option? option) ...) body ...) ...
+          (#t default))))
+
+;; (command-line-args-handle '("a" "--help")
+;;                        0
+;;                        (("-h" "--help") "dupa"))
 
 (define (main args)
   (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 @@
+[cursor]
+style = "Block"
+unfocused_hollow = true
+
+[font]
+size = 14
+
+[font.italic]
+family = "Terminus"
+style = "Light Italic"
+
+[font.normal]
+family = "Terminus"
+style = "Light"
+
+[font.offset]
+x = 0
+y = 0
+
+[window]
+dynamic_padding = true
+# opacity = 0.90
+
+[colors.bright]
+black = "0x002b36"
+blue = "0x839496"
+cyan = "0x93a1a1"
+green = "0x586e75"
+magenta = "0x6c71c4"
+red = "0xcb4b16"
+white = "0xfdf6e3"
+yellow = "0x657b83"
+
+[colors.normal]
+black = "0x073642"
+blue = "0x268bd2"
+cyan = "0x2aa198"
+green = "0x859900"
+magenta = "0xd33682"
+red = "0xdc322f"
+white = "0xeee8d5"
+yellow = "0xb58900"
+
+[colors.primary]
+background = "0x002b36"
+foreground = "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 @@
+[cursor]
+style = "Block"
+unfocused_hollow = true
+
+[font]
+size = 14
+
+[font.italic]
+family = "Terminus"
+style = "Light Italic"
+
+[font.normal]
+family = "Terminus"
+style = "Light"
+
+[font.offset]
+x = 0
+y = 0
+
+[window]
+dynamic_padding = true
+opacity = 0.90
+
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 @@
+colors:
+  # Default colors
+  primary:
+    background: '0x002b36'
+    foreground: '0x839496'
+
+  # Normal colors
+  normal:
+    black:   '0x073642'
+    red:     '0xdc322f'
+    green:   '0x859900'
+    yellow:  '0xb58900'
+    blue:    '0x268bd2'
+    magenta: '0xd33682'
+    cyan:    '0x2aa198'
+    white:   '0xeee8d5'
+
+  # Bright colors
+  bright:
+    black:   '0x002b36'
+    red:     '0xcb4b16'
+    green:   '0x586e75'
+    yellow:  '0x657b83'
+    blue:    '0x839496'
+    magenta: '0x6c71c4'
+    cyan:    '0x93a1a1'
+    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 @@
+(cons*  (channel
+         (name 'rustup)
+         (url "https://github.com/declantsien/guix-rustup")
+         (introduction
+          (make-channel-introduction
+           "325d3e2859d482c16da21eb07f2c6ff9c6c72a80"
+           (openpgp-fingerprint
+            "F695 F39E C625 E081 33B5  759F 0FC6 8703 75EF E2F5"))))
+        
+        (channel
+         (name 'nonguix)
+         (url "https://gitlab.com/nonguix/nonguix")
+         ;; Enable signature verification:
+         (introduction
+          (make-channel-introduction
+           "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
+           (openpgp-fingerprint
+            "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
+        %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 @@
+/home/jakub/Projects/laco
+/home/jakub/Projects/yasa
+/home/jakub/Projects/trial
+/home/jakub/Projects/matura-infa
+/home/jakub/Projects/abaks-infra
+/home/jakub/Projects/lispz
+/home/jakub/Projects/zig-learning
+/home/jakub/Projects/let-over-lambda
+/home/jakub/Projects/rust
+/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
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
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
 set $primary-home-display 'Iiyama North America PLE2407HDSD 0x01010101'
 set $secondary-home-display 'Dell Inc. DELL E190S M8VPV186CELI'
 
-set $primary-display-layout   $primary-home-display $generic-display $laptop-display
+set $primary-display-layout   'Samsung Electric Company C34H89x HTJM200007' $primary-home-display $generic-display $laptop-display
 set $secondary-display-layout $secondary-home-display $laptop-display
 
-output * bg SPOILER_33.png fill
+# output * bg SPOILER_33.png fill
+output * bg #002b36 solid_color
 
 output $laptop-display          resolution 1920x1080 position 1920,0
 output $generic-display         resolution 1920x1080 position 0,0
@@ -65,6 +66,7 @@ bindsym XF86AudioPause exec playerctl pause
 
 bindsym print exec grimshot --notify copy area
 bindsym $mod+print exec grimshot --notify copy output
+bindsym $mod+Ctrl+print grimshot save area - | swappy -f -
 
 bindsym $mod+Return exec $term
 
@@ -114,7 +116,7 @@ bindsym $mod+Shift+8 move container to workspace number 8
 bindsym $mod+Shift+9 move container to workspace number 9
 bindsym $mod+Shift+0 move container to workspace number 10
 
-assign [app_id="(firefox-default|qutebrowser|Chromium-browser)"] 2
+assign [app_id="(firefox-default|Firefox|qutebrowser|Chromium-browser)"] 2
 assign [instance="(chromium-browser)"] 2
 assign [instance="(spotify)"] 3
 assign [app_id=".blueman-manager-real"] 3
@@ -124,8 +126,7 @@ assign [app_id="vesktop"] 4
 assign [app_id="com.ktechpit.whatsie"] 4
 assign [instance="(discord)"] 4
 
-for_window [app_id="vesktop"] opacity $opacity
-
+# for_window [app_id="vesktop"] opacity $opacity
 
 bindsym $mod+b splith
 bindsym $mod+v splitv
@@ -169,14 +170,15 @@ bindsym $mod+o mode "menu"
 
 workspace_layout tabbed
 
-default_border normal 3
-gaps outer 0
-gaps inner 6
+# default_border normal 3
+# gaps outer 0
+# gaps inner 6
+# corner_radius 4
+# blur_xray disable
+# blur enable
+# layer_effects "waybar" blur enable
+
 font Terminus (TTF) 12
-corner_radius 4
-blur_xray disable
-blur enable
-layer_effects "waybar" blur enable
 bindsym $mod+p exec $menu
 
 
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 @@
+*
+!init.el
+!jd
+!jd/*
+!.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 @@
 
 ;;; Code:
 
-(setq c-default-style "linux"
-      c-basic-offset 8
-      gdb-many-windows t)
+;; (setq c-default-style "linux"
+;;       c-basic-offset 8
+;;       gdb-many-windows t)
 
 (use-package lsp-mode
   :guix-package "emacs-lsp-mode"
@@ -17,7 +17,29 @@
   (setq lsp-modeline-diagnostics-enable nil)
   (setq lsp-keymap-prefix "C-c l")
   :config
-  (lsp-enable-which-key-integration t))
+  (lsp-enable-which-key-integration t)
+
+  (global-set-key (kbd "C-x ]")
+                  #'(lambda ()
+                      (interactive)
+                      (forward-page)
+                      (recenter-top-bottom 0)))
+
+  (global-set-key (kbd "C-x [")
+                  #'(lambda ()
+                      (interactive)
+                      (backward-page)
+                      (recenter-top-bottom 0)))
+
+  (define-key c-mode-map
+              (kbd "C-c C-c")
+              #'(lambda ()
+                  (interactive)
+                  (compile compile-command)))
+  
+  (define-key c-mode-map
+              (kbd "C-c M-c")
+              'compile))
 
 (use-package lsp-ivy
   :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 @@
   (global-set-key (kbd "C-<") 'mc/mark-previous-like-this)
   (global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this))
 
-
 (use-package hydra
   :guix-package "emacs-hydra"
   ;; :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 @@
+;;; Dotfiles --- Jakub Dlugosz emacs config
+;;; Commentary:
+
+;;; Code:
+
+(defun jd/generete-qr-from-clipboard ()
+  (interactive)
+  (let ((clipboard-value (x-get-clipboard))
+        (clipboard-file-path "/tmp/clipboard_value.txt")
+        (clipboard-out-image "/tmp/qr.png"))
+    (with-temp-file clipboard-file-path
+      (insert clipboard-value))
+    (shell-command (concat
+                    "qrencode -o "
+                    clipboard-out-image
+                    " < "
+                    clipboard-file-path))
+    (find-file clipboard-out-image)))
+
+(defun jd/dired-open-file-in-kill-ring ()
+  (interactive)
+  (let* ((last-killed (car kill-ring))
+         (exists-p (file-exists-p last-killed))
+         (dir-p (file-directory-p last-killed)))
+    (cond
+     ((not exists-p) (message "File doesn't exists!"))
+     (dir-p (dired last-killed))
+     ((not dir-p) (find-file last-killed)))))
+
+(global-set-key (kbd "C-c O") #'jd/dired-open-file-in-kill-ring)
+
+(provide 'jd-misc)
+
+;;; 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 @@
 
 ;;; Code:
 
-(defvar jd/org-home "~/Documents/Org")
+(defvar jd/org-home "~/Notes")
 (defvar jd/org-roam-home (concat jd/org-home "/roam"))
-(defvar jd/org-roam-agenda (concat jd/org-home "/agenda"))
+(defvar jd/org-sync (concat jd/org-home "/sync"))
 (defvar jd/org-roam-daily-home (concat jd/org-roam-home "/daily"))
 
 (defun jd/org-mode-init ()
@@ -22,12 +22,30 @@
 (use-package org-caldav
   :guix-package "emacs-org-caldav"
   :config
-  (setq org-caldav-url         "http://jdlugosz.com:5232/jdlugosz"
-        org-caldav-calendar-id "841a6259-8fe5-a178-e326-ddbb7c767e22"
-        org-caldav-inbox       (concat jd/org-roam-agenda
-                                       "/main.org")
+  (setq org-caldav-url         "http://caldav.jdlugosz.com/radicale/admin/"
         org-caldav-files       nil
-        org-icalendar-timezone "Europe/Warsaw"))
+        org-icalendar-timezone "Europe/Warsaw")
+  
+  (defun jd/caldav-calendar-sync ()
+    (interactive)
+    (let ((org-caldav-calendar-id "0c54a523-c7aa-2f26-2c18-a12b69c2bc86")
+          (org-caldav-inbox (concat jd/org-sync
+                                    "/calendar.org")))
+      (org-caldav-sync)))
+
+  (defun jd/caldav-journal-sync ()
+    (interactive)
+    (let ((org-caldav-calendar-id "3cc70419-a787-5f84-28c6-96f15fc606d9")
+          (org-caldav-inbox (concat jd/org-sync
+                                    "/journal.org")))
+      (org-caldav-sync)))
+
+  (defun jd/caldav-tasks-sync ()
+    (interactive)
+    (let ((org-caldav-calendar-id "372cbbb3-14f7-fc15-9f7b-cae04114920c")
+          (org-caldav-inbox (concat jd/org-sync
+                                    "/tasks.org")))
+      (org-caldav-sync))))
 
 (use-package org
   :guix-package "emacs-org"
@@ -40,39 +58,64 @@
   ("C-c o P" . #'org-mobile-push)
   ("C-c o a" . #'org-agenda)
   :config
-  (setq org-directory (file-truename "~/Documents/Org/"))
-  (setq org-mobile-inbox-for-pull (concat org-directory "flagged.org"))
-  (setq org-mobile-directory "~/Documents/Org/Mobile/")
-  (setq org-agenda-files '("Tasks.org" "Inbox.org" "Habits.org"))
-  (setq org-ellipsis " ▾")
-  (setq org-agenda-start-with-log-mode t)
-  (setq org-log-done 'time)
-  (setq org-log-into-drawer t)
-  (setq org-return-follows-link t)
-  (setq org-capture-templates
-        `(("t" "Tasks / Projects")
-          ("tt" "Task" entry (file+olp "Tasks.org" "Inbox")
-           "* TODO %?\n  %t\n  %a\n  %i" :empty-lines 1)
-          ("tT" "Task for tomorow" entry (file+olp "Tasks.org" "Inbox")
-           "* TODO %?\n %t\n  SCHEDULED: %(jd-emacs/org-insert-date \"+1d\")>\n %a\n %i" :empty-lines 1)
-
-          ("m" "Metrics Capture")
-          ("mm" "Metrics" table-line (file+headline "Metrics.org" "Metrics")
-           "| %U | %^{Weight} | %^{Waist} | %^{Notes} |" :kill-buffer t)
-          ("sh" "School Homework" entry (file+olp "school/todo(jd-emacs/org-insert-date \"1\").org"))))
-
-  (setq org-latex-listings 'minted
+  (defun jd/org-mode-file (file-name) (concat org-directory "/" file-name ".org"))
+  (setq org-directory (file-truename "~/Notes")
+        org-mobile-directory (concat org-directory "/Mobile")
+        org-mobile-inbox-for-pull (concat org-directory "/flagged.org") ;; TODO: ??
+
+        org-refile-targets '((org-agenda-files :maxlevel . 1))
+        org-outline-path-complete-in-steps nil
+        org-refile-use-outline-path t
+        org-agenda-files '("Personal.org" "Work.org" "Inbox.org")
+        org-ellipsis " ▾"
+        org-agenda-start-with-log-mode t
+        org-log-done 'time
+        org-log-into-drawer t
+        org-return-follows-link t
+        org-latex-listings 'minted
         org-latex-packages-alist '(("" "minted"))
+        
+        org-agenda-custom-commands
+        `(("p" "Planning"
+           ((tags-todo "+planning"
+                       ((org-agenda-overriding-header "Planning Tasks")))
+            (tags-todo "-{.*}"
+                       ((org-agenda-overriding-header "Untagged Tasks")))
+            (todo "*" ((org-agenda-files '(,(jd/org-mode-file "Inbox")))
+                       (org-agenda-overriding-header "Unprocessed Inbox Items")))))
+
+          ("d" "Daily Agenda"
+           ((agenda "" ((org-agenda-span 'day)
+                        (org-deadline-warning-days 7)))
+            (tags-todo "+PRIORITY=\"A\""
+                       ((org-agenda-overriding-header "High Priority Tasks")))))
+
+          ("w" "Weekly Review"
+           ((agenda ""
+                    ((org-agenda-overriding-header "Completed Tasks")
+                     (org-agenda-skip-function '(org-agenda-skip-entry-if 'nottodo 'done))
+                     (org-agenda-span 'week)))
+
+            (agenda ""
+                    ((org-agenda-overriding-header "Unfinished Scheduled Tasks")
+                     (org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done))
+                     (org-agenda-span 'week))))))
+        
+        org-capture-templates
+        `(("i" "Capture to Inbox" entry (file+olp ,(jd/org-mode-file "Inbox") "Inbox")
+           "* TODO %?\n  %t\n" :empty-lines 1))
+        
         org-latex-pdf-process
         '("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
           "pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"))
+  
   (require 'org-tempo)
   
   (defun jd/org-font-setup ()
     ;; Replace list hyphen with dot
-    (font-lock-add-keywords 'org-mode
-                            '(("^ *\\([-]\\) "
-                               (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•-"))))))
+    ;; (font-lock-add-keywords 'org-mode
+    ;;                      '(("^ *\\([.]\\) "
+    ;;                         (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•-"))))))
 
     ;; Set faces for heading levels
     (dolist (face '((org-level-1 . 1.3)
@@ -90,7 +133,6 @@
     (set-face-attribute 'org-table nil    :inherit 'fixed-pitch)
     (set-face-attribute 'org-formula nil  :inherit 'fixed-pitch)
     (set-face-attribute 'org-code nil     :inherit '(shadow fixed-pitch))
-    (set-face-attribute 'org-table nil    :font "Terminus" :inherit '(shadow fixed-pitch))
     (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch))
     (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch))
     (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch))
@@ -103,7 +145,6 @@
   (defun jd-emacs/org-timer-stop ()
     (start-process-shell-command "notify-send" nil "notify-send Zakonczono odliczanie"))
 
-
   (add-hook 'org-timer-stop-hook #'jd-emacs/org-timer-stop)
 
   (defun jd/org-tempo-setup ()
@@ -124,16 +165,8 @@
   (org-babel-do-load-languages
    'org-babel-load-languages
    '((emacs-lisp . t)
-     (python . t)))
-
-  (defun jd/org-babel-tangle-config ()
-    (when (string-equal (file-name-directory (buffer-file-name))
-                        (expand-file-name "~/dotfiles/"))
-      ;; Dynamic scoping to the rescue
-      (let ((org-confirm-babel-evaluate nil))
-        (org-babel-tangle))))
-
-  (add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'jd/org-babel-tangle-config))))
+     (python . t)
+     (shell . t))))
 
 (use-package org-superstar
   :guix-package "emacs-org-superstar"
@@ -157,6 +190,8 @@
   :bind-keymap
   ("C-c n d" . org-roam-dailies-map)
   :config
+  (require 'org-roam-dailies)
+  
   (defun jd/org-roam-filter-by-tag (tag-name)
     (lambda (node)
       (member tag-name (org-roam-node-tags node))))
@@ -167,45 +202,17 @@
              (jd/org-roam-filter-by-tag tag-name)
              (org-roam-node-list))))
 
-  (defun jd/org-roam-refreshagenda-list ()
-    (interactive)
-    (setq org-agenda-files (org-roam-list-files)))
-
   (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
   (setq org-roam-capture-templates
-        '(("a" "workstuff" plain (file (concat org-roam-directory "/work"))
-           :target (file+head "work/%<%Y%m%d%H%M%S>-${slug}.org"
-                              "#+title: ${title}\n")
-           :unnarrowed t)
-          ("b" "research" plain (file "~/Documents/roam/study/templates/research.org")
-           :target (file+head "study/%<%Y%m%d%H%M%S>-${slug}.org"
-                              "#+title: ${title}\n")
-           :unnarrowed t)
-          ("s" "School")
-          ("ss" "School General" plain nil
-           :target (file+head
-                    "school/%<%Y%m%d%H%M%S>-${slug}.org"
-                    "#+title: ${title}\n")
-           :unnarrowed t)
-          ("sp" "Polish Lesson" plain nil
-           :target (file+head
-                    "school/polish/%<%Y%m%d%H%M%S>-${slug}.org"
-                    "#+title: ${title}\n")
-           :unnarrowed t)
-          ("sw" "Wos Lesson" plain nil
-           :target (file+head
-                    "school/wos/%<%Y%m%d%H%M%S>-${slug}.org"
-                    "#+title: ${title}\n")
-           :unnarrowed t)
-          ("g" "Guitar" plain nil
+        '(("d" "default" plain "%?"
            :target (file+head
-                    "guitar/%<%Y%m%d%H%M%S>-${slug}.org"
-                    "#+title: ${title}\n")
+                    "%<%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: `%?`
            :unnarrowed t)
-          ("d" "default" plain nil
-           :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org"
-                              "#+title: ${title}\n")
-           :unnarrowed t)))
+          ;; ("n" "insert node" plain (file "~/Documents/roam/study/templates/research.org")
+          ;;  :target (file+head "study/%<%Y%m%d%H%M%S>-${slug}.org"
+          ;;                  "#+title: ${title}\n")
+          ;;  :unnarrowed t)
+          ))
 
   (org-roam-db-autosync-mode))
 
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 @@
+;;; Dotfiles --- Jakub Dlugosz emacs config
+;;; Commentary:
+
+;;; Code:
+
+(defun use-package-normalize/:diminish (name keyword args)
+  (use-package-as-one (symbol-name keyword) args
+    (apply-partially #'use-package-normalize-diminish name) t))
+
+(use-package shackle
+  :guix-package "emacs-shackle")
+
+(use-package sway
+  :guix-package "emacs-sway")
+
+(provide 'jd-sway)
+
+;;; 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 @@
 (menu-bar-mode -1)
 (set-fringe-mode 10)
 
-(set-frame-parameter (selected-frame) 'alpha '(92 . 92))
-(add-to-list 'default-frame-alist '(alpha . (92 . 92)))
-
-(custom-set-faces
- '(default ((t (:inherit nil :height 125 :family "Terminus"))))
- '(line-number ((t (:inherit nil :height 125 :family "Terminus"))))
- '(line-number-current-line ((t (:inherit nil :height 125 :family "Terminus")))))
+;; (set-frame-parameter (selected-frame) 'alpha '(92 . 92))
+;; (add-to-list 'default-frame-alist '(alpha . (92 . 92)))
+
+(let ((height (if (string-equal (system-name)
+                                "berserker")
+                  175
+                125)))
+ (custom-set-faces
+  `(default ((t (:inherit nil :height ,height :family "Terminus"))))
+  `(line-number ((t (:inherit nil :height ,height :family "Terminus"))))
+  `(line-number-current-line ((t (:inherit nil :height ,height :family "Terminus"))))))
 
 (add-hook 'prog-mode-hook 'menu-bar--display-line-numbers-mode-relative)
 
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 @@
   #:use-module (nongnu system linux-initrd))
 
 (use-package-modules wm gnome networking virtualization
-                     lisp lisp-xyz cups fonts gnupg)
+                     lisp lisp-xyz cups fonts gnupg android)
 
 (use-service-modules cups desktop networking ssh xorg
                      docker virtualization pm sound dbus
@@ -68,6 +68,7 @@
                            "audio"    ;; control audio devices
                            "video"    ;; access to webcam
                            "dialout"  ;; access to /dev/ttyUSBX devices
+                           "adbusers"
                            ))))
 
 (define-public %jd-base-user-accounts
@@ -147,7 +148,7 @@
                  (map (lambda (tty)
                         (cons tty (file-append
                                    font-terminus
-                                   "/share/consolefonts/ter-112n")))
+                                   "/share/consolefonts/ter-122n.psf.gz")))
                       '("tty1" "tty2" "tty3" "tty4" "tty5" "tty6")))
 
    (service screen-locker-service-type
@@ -167,6 +168,7 @@
             (bluetooth-configuration
              (auto-enable? #t)))
 
+   (service containerd-service-type)
    (service docker-service-type)
    (service libvirt-service-type
             (libvirt-configuration
@@ -188,29 +190,38 @@
    (service nix-service-type)
    
    polkit-network-manager-service
+
+   (udev-rules-service 'android android-udev-rules
+                       #:groups '("adbusers"))
+
+   (udev-rules-service 'microbit (udev-rule
+                                  "69-microbit.rules"
+                                  (string-append "ACTION!=\"add|change\", GOTO=\"microbit_rules_end\""
+                                                 "SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0d28\", ATTR{idProduct}==\"0204\", TAG+=\"uaccess\""
+                                                 "LABEL=\"microbit_rules_end\"")))
    
    ;; %desktop-services
    (modify-services %desktop-services
-                    (guix-service-type config => (guix-configuration
-                                                  (inherit config)
-                                                  (substitute-urls
-                                                   (append (list "https://substitutes.nonguix.org")
-                                                           %default-substitute-urls))
-                                                  (authorized-keys
-                                                   (append (list (plain-file "non-guix.pub"
-                                                                             "(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))"))
-                                                           %default-authorized-guix-keys))))
-                    (delete network-manager-service-type)
-                    ;; (delete mingetty-service-type)
-                    (delete console-font-service-type)
-
-                    (delete pulseaudio-service-type)
-                    (delete alsa-service-type)
-                    (delete (if (string-prefix? "x86_64"
-                                                (or (%current-target-system)
-                                                    (%current-system)))
-                                gdm-service-type
-                                sddm-service-type)))))
+     (guix-service-type config => (guix-configuration
+                                   (inherit config)
+                                   (substitute-urls
+                                    (append (list "https://substitutes.nonguix.org")
+                                            %default-substitute-urls))
+                                   (authorized-keys
+                                    (append (list (plain-file "non-guix.pub"
+                                                              "(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))"))
+                                            %default-authorized-guix-keys))))
+     (delete network-manager-service-type)
+     ;; (delete mingetty-service-type)
+     (delete console-font-service-type)
+
+     (delete pulseaudio-service-type)
+     (delete alsa-service-type)
+     (delete (if (string-prefix? "x86_64"
+                                 (or (%current-target-system)
+                                     (%current-system)))
+                 gdm-service-type
+                 sddm-service-type)))))
 
 ;; Odin is a base for my operating systems
 (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 @@
 (define-module (jd desktops berserker)
   #:use-module (jd desktops base)
+  #:use-module (jd packages linux)
   #:use-module (gnu)
   #:use-module (gnu home))
 
@@ -10,30 +11,35 @@
 (define system
   (operating-system
    (inherit odin-non-free)
+   (kernel-loadable-modules (list xmm7360-pci))
    (host-name "berserker")
 
-   (bootloader (bootloader-configuration
+   
+  (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader)
                 (targets (list "/boot/efi"))))
+  (mapped-devices (list (mapped-device
+                          (source (uuid
+                                   "1f2b1bf2-89fe-4e2c-8b40-c460572bb776"))
+                          (target "crypthome")
+                          (type luks-device-mapping))))
 
-   (swap-devices (list (swap-space
-                        (target (uuid
-                                 "70ee2477-66ff-4856-aebf-8a77053c4462")))))
-
-   (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid "BE9B-69F0"
-                                       'fat32))
-                         (type "vfat"))
-
-                        (file-system
+  (file-systems (cons* (file-system
                          (mount-point "/")
                          (device (uuid
-                                  "d8783299-c180-4ca3-9c56-9826797f928d"
+                                  "66396ba1-bda9-46bd-ab26-5edc46b437d6"
                                   'ext4))
                          (type "ext4"))
-
-                        %base-file-systems))))
+                       (file-system
+                         (mount-point "/boot/efi")
+                         (device (uuid "482A-B117"
+                                       'fat32))
+                         (type "vfat"))
+                       (file-system
+                         (mount-point "/home")
+                         (device "/dev/mapper/crypthome")
+                         (type "ext4")
+                         (dependencies mapped-devices)) %base-file-systems))))
 
 
 (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 @@
 (define (desktop-profile-service config)
   (append
    (list font-terminus-ttf)
-   (specifications->packages '( ;; sway
-                               "swayfx"
+   (specifications->packages '("sway"
+                               ;; "swayfx"
                                "swaylock"
                                "swayidle"
+                               "swaynotificationcenter"
                                "waybar"
                                "fuzzel"
                                "foot"
@@ -31,6 +32,7 @@
                                "wl-clipboard"
                                "wlsunset"
                                "grimshot"
+                               "swappy"
                               
                                "udiskie"
                                ;; rest
@@ -54,6 +56,8 @@
 
                                "blueman"
 
+                               "nomacs"
+
                                "xdg-utils"
                                "xdg-dbus-proxy"
                                "xdg-desktop-portal-gtk"
@@ -68,8 +72,8 @@
 
                                "dunst"
 
-                               "gimp"
-                               "inkscape"
+                               ; "gimp"
+                               ; "inkscape"
 
                                "mpv"
                                "youtube-dl"
@@ -107,7 +111,11 @@
                                "rlwrap"
 
                                "nheko"
-                               "quassel"))))
+                               "quassel"
+                               "inkscape"
+                               "gimp"
+                               "libreoffice"
+                               "steam"))))
 
 (define (desktop-environment-variables-service config)
   `(("GTK_THEME" . "Adwaita:dark")
@@ -126,7 +134,7 @@
     ("CLUTTER_BACKEND" . "wayland")
     ("ELM_ENGINE" . "wayland_egl")
     ("ECORE_EVAS_ENGINE" . "wayland-egl")
-    ("QT_QPA_PLATFORM" . "wayland-egl")))
+    ("QT_QPA_PLATFORM" . "wayland-egl"))) ;; QT_QPA_PLATFORM=xcb
 
 (define (desktop-xdg-mime-applications-service config)
   (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 @@
+(define-module (jd packages linux)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system linux-module)
+  #:use-module (guix git-download)
+  #:use-module (guix gexp)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pciutils)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages autotools)
+  #:use-module ((guix licenses) #:prefix license:))
+
+(define-public xmm7360-pci
+  (package
+    (name "xmm7360-pci")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/xmm7360/xmm7360-pci.git")
+             (commit "a8ff2c6ceee84cbe74df8a78cfaa5a016d362ed4")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1aals95hk76rgd21rknqc9qfjva6g6gwicw6wz19m20bn08bs2f3"))))
+    (build-system linux-module-build-system)
+    (arguments
+     (list
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-makefile
+            (lambda _
+              (substitute* (find-files
+                            "." "^Makefile(\\.include)?$")
+                (("^ccflags-y := .*$")
+                 "ccflags-y := -Wno-multichar -Wno-incompatible-pointer-types")))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)))
+    (inputs
+     `(("kernel" ,linux-libre)
+       ("pciutils" ,pciutils)))
+    (synopsis "Kernel module for Intel XMM7360 LTE modem")
+    (description
+     "This package provides a kernel module for the Intel XMM7360 LTE modem, allowing it to function in Linux.")
+    (home-page "https://github.com/xmm7360/xmm7360-pci")
+    (license license:gpl3+)))
+