8 files changed, 102 insertions, 347 deletions

diff --git a/.config/emacs/exwm/Xmodmap b/.Xmodmap
index cb4706f..cb4706f 100644
--- a/.config/emacs/exwm/Xmodmap
+++ b/.Xmodmap
diff --git a/.config/guix/machines/base.scm b/.config/guix/machines/base.scm
deleted file mode 100644
index 20c49f4..0000000
--- a/.config/guix/machines/base.scm
+++ /dev/null
@@ -1,27 +0,0 @@
-(define-module (base)
-  #:use-module (gnu)
-  #:use-module (gnu system nss)
-  #:use-module (gnu services pm)
-  #:use-module (gnu services desktop)
-  #:use-module (gnu services docker)
-  #:use-module (gnu services networking)
-  #:use-module (gnu services virtualization)
-  #:use-module (gnu packages wm)
-  #:use-module (gnu packages vim)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages emacs)
-  #:use-module (gnu packages file-systems)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages audio)
-  #:use-module (gnu packages pulseaudio)
-  #:use-module (gnu packages web-browsers)
-  #:use-module (gnu packages version-control)
-  #:use-module (gnu packages package-management)
-  #:use-module (nongnu packages linux)
-  #:use-module (nongnu system linux-initrd))
-
-
-(use-service-modules desktop xorg)
-(use-package-modules certs)
-(use-package-modules shells)
diff --git a/.config/guix/machines/base-system.scm b/.config/guix/systems/base-system.scm
index a294aca..7c67fad 100644
--- a/.config/guix/machines/base-system.scm
+++ b/.config/guix/systems/base-system.scm
@@ -1,21 +1,17 @@
 (define-module (base-system)
   #:use-module (gnu)
-  #:use-module (gnu system nss)
   #:use-module (gnu services pm)
-  #:use-module (gnu services desktop)
   #:use-module (gnu services docker)
   #:use-module (gnu services networking)
-  #:use-module (gnu services virtualization)
-  #:use-module (gnu packages wm)
+  #:use-module (gnu services virtualization) ; todo make 
   #:use-module (gnu packages vim)
-  #:use-module (gnu packages gtk)
+  #:use-module (gnu services desktop)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages file-systems)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages pulseaudio)
-  #:use-module (gnu packages web-browsers)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages package-management))
                                         ;    #:use-module (nongnu packages linux)
@@ -30,6 +26,7 @@
    (host-name "base")
    (timezone "Europe/Warsaw")
    (locale "en_US.utf8")
+   (keyboard-layout (keyboard-layout "pl"))
 
    ;; Use non-free Linux and firmware
    ;;     (kernel linux)
@@ -82,6 +79,7 @@
                       bluez-alsa
                       pulseaudio
                       tlp
+                      ncurses
                       xf86-input-libinput
                       nss-certs) ;; For https connection
                      %base-packages))
@@ -91,14 +89,26 @@
    (services
     (append
      (list
+   
       (service elogind-service-type)
       (service openssh-service-type)
       (service network-manager-service-type)
       (service slim-service-type)
-      (service tlp-service-type)
+      (service tlp-service-type
+               (tlp-configuration
+                (cpu-boost-on-ac? #t)
+                (wifi-pwr-on-bat? #t)))
       (bluetooth-service #:auto-enable? #t)
       (service docker-service-type)
       (service wpa-supplicant-service-type))
+     (service libvirt-service-type
+              (libvirt-configuration
+               (unix-sock-group "libvirt")
+               (tls-port "16555")))
+     (set-xorg-configuration
+      (xorg-configuration
+       (keyboard-layout keyboard-layout)))
+   
      %base-services))
    
    ;; Allow resolution of '.local' host names with mDNS
diff --git a/.config/guix/machines/viking.scm b/.config/guix/systems/viking.scm
index 0e1d4a9..00b279e 100644
--- a/.config/guix/machines/viking.scm
+++ b/.config/guix/systems/viking.scm
@@ -1,13 +1,11 @@
 (define-module (viking)
   #:use-module (base-system)
   #:use-module (gnu))
-(use-modules (base-system))
+
 (operating-system
  (inherit base-operating-system)
  (host-name "viking")
 
- (keyboard-layout (keyboard-layout "pl"))
-
  (bootloader
   (bootloader-configuration
    (bootloader grub-bootloader)
diff --git a/.xsession b/.xsession
new file mode 120000
index 0000000..65c5daf
--- /dev/null
+++ b/.xsession
@@ -0,0 +1 @@
+.config/emacs/exwm/start.sh
\ No newline at end of file
diff --git a/EXWM.org b/Desktop.org
index 61f2534..e50ef77 100644
--- a/EXWM.org
+++ b/Desktop.org
@@ -4,6 +4,7 @@
 
 
 * EXWM
+** Config
 
 #+begin_src emacs-lisp
 
@@ -43,7 +44,7 @@
     (add-hook 'exwm-update-title-hook #'jd-exwm/exwm-update-title)
     (add-hook 'exwm-manage-finish-hook #'jd-exwm/configure-window-by-class)
 
-    (start-process-shell-command "xmodmap" nil "xmodmap ~/.config/emacs/exwm/Xmodmap")
+    (start-process-shell-command "xmodmap" nil "xmodmap ~/dotfiles/.Xmodmap")
     (start-process-shell-command "nitrogen" nil "nitrogen --restore")
     (start-process-shell-command "xinput" nil "xinput set-prop 11 336 1")
 
@@ -95,8 +96,7 @@
     (exwm-enable))
 
 #+end_src
-
-* Desktop mode
+** Desktop mode
 
 #+begin_src emacs-lisp
 
@@ -111,7 +111,7 @@
 
 #+end_src
 
-* Transparency
+** Transparency
 
 #+begin_src emacs-lisp
 
@@ -122,8 +122,7 @@
 
 #+end_src
 
-
-* Start emacs
+** Start emacs
 
 #+begin_src sh :tangle ~/.config/emacs/exwm/start.sh
   #!/bin/sh
@@ -139,11 +138,86 @@
 
 #+end_src
 
-* Xmodmap
 
-#+begin_src sh :tangle ~/.config/emacs/exwm/Xmodmap
+* Applications
+** Flatpak
+
+*Applications to Install*
+
+#+begin_src sh
+
+flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+flatpak install --user flathub com.spotify.Client
+flatpak install --user flathub com.valvesoftware.Steam
+flatpak install --user flathub com.microsoft.Teams
+flatpak install --user flathub com.discordapp.Discord
+
+#+end_src
+
+*Guix Packages*
+
+#+begin_src scheme :noweb-ref packages :noweb-sep ""
+
+"flatpak"
+
+#+end_src
+
+** Audio control
+
+*Guix Packages*
+
+#+begin_src scheme :noweb-ref packages :noweb-sep ""
+
+"pulsemixer"
+
+#+end_src
+
+** Bluetooth
+
+*Guix Packages*
+
+#+begin_src scheme :noweb-ref packages :noweb-sep ""
+
+  "blueman"
+
+#+end_src
+
+** Xorg
+
+*Xmodmap*
+
+#+begin_src sh :tangle .Xmodmap
 
 clear lock
 keycode 0x42 = Escape
 
 #+end_src
+
+*Guix Packages*
+
+#+begin_src scheme :noweb-ref packages :noweb-sep ""
+
+  "xev"
+  "xset"
+  "xrdb"
+  "xhost"
+  "xmodmap"
+  "setxkbmap"
+  "xrandr"
+  "arandr"
+  "xss-lock"
+  "libinput"
+  "xinput"
+
+#+end_src
+
+** Desktop Profile
+
+#+begin_src scheme :tangle .config/guix/manifests/desktop.scm :noweb yes
+
+(specifications->manifest
+ '(
+   <<packages>>
+))
+
+#+end_src
diff --git a/Mu4e.org b/Mail.org
index 21ad1b7..d946108 100644
--- a/Mu4e.org
+++ b/Mail.org
@@ -4,11 +4,7 @@
 * jd-mu4e.el
 #+begin_src emacs-lisp
 
-      (add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
-
-  
-      (use-package org-msg
-        :ensure t)
+      (use-package org-msg)
 
       (use-package mu4e
         :defer 20
diff --git a/Qtile.org b/Qtile.org
deleted file mode 100644
index 132bbe5..0000000
--- a/Qtile.org
+++ /dev/null
@@ -1,297 +0,0 @@
-#+title: Config
-#+PROPERTY: header-args:python :tangle .config/qtile/config.py
-#+OPTIONS: TOC:3
-
-* Table of contents :TOC:
-- [[#config][Config]]
-  - [[#imports][Imports]]
-  - [[#defining-const-variables][Defining const variables]]
-  - [[#startup-script-executor][Startup script executor]]
-  - [[#defining-keybinds][Defining keybinds]]
-  - [[#layouts][Layouts]]
-  - [[#bar][Bar]]
-  - [[#other-settings][Other settings]]
-
-* Config
-** Imports
-#+begin_src python
-import os
-import subprocess
-
-from typing import List
-
-from libqtile import bar, layout, widget
-from libqtile.config import Click, Drag, Group, Key, Match, Screen, KeyChord
-from libqtile import extension
-from libqtile.lazy import lazy
-from libqtile.utils import guess_terminal
-from libqtile import hook
-#+end_src
-
-** Defining const variables
-*** Mod key
-#+begin_src python
-MOD = "mod4"
-#+end_src
-
-*** Default terminal
-#+begin_src python
-TERMINAL = guess_terminal()
-#+end_src
-
-*** Dmenu flags
-#+begin_src python
-DMENU_FLAGS = '-l 16 -p run -c -i'
-#+end_src
-
-*** Color scheme
-#+begin_src python
-BAR = '#282a36'
-LIGHT_BAR = '#393b37'
-YELLOW = '#f1fa8c'
-RED = '#ff5555'
-LIGHT_RED = '#ff9999'
-GREEN = '#50fa7b'
-CYAN = '#8be9fd'
-LIGHT_CYAN = '#abfbff'
-#+end_src
-
-** Startup script executor
-#+begin_src python
-@hook.subscribe.startup_once
-def autostart():
-    home = os.path.expanduser('~/.config/qtile/autorc')
-    subprocess.run([home])
-#+end_src
-
-** Defining keybinds
-*** Default
-#+begin_src python
-keys = [
-    Key([MOD], "h", lazy.layout.left(), desc="Move focus to left"),
-    Key([MOD], "l", lazy.layout.right(), desc="Move focus to right"),
-    Key([MOD], "j", lazy.layout.down(), desc="Move focus down"),
-    Key([MOD], "k", lazy.layout.up(), desc="Move focus up"),
-    Key([MOD], "s", lazy.next_screen() ),
-    Key([MOD], "space", lazy.window.toggle_floating(),
-        desc="Move window focus to other window"),
-
-    Key([MOD, "shift"], "h", lazy.layout.shuffle_left(),
-        desc="Move window to the left"),
-    Key([MOD, "shift"], "l", lazy.layout.shuffle_right(),
-        desc="Move window to the right"),
-    Key([MOD, "shift"], "j", lazy.layout.shuffle_down(),
-        desc="Move window down"),
-    Key([MOD, "shift"], "k", lazy.layout.shuffle_up(), desc="Move window up"),
-
-    Key([MOD, "control"], "h", lazy.layout.grow_left(),
-        desc="Grow window to the left"),
-    Key([MOD, "control"], "l", lazy.layout.grow_right(),
-        desc="Grow window to the right"),
-    Key([MOD, "control"], "j", lazy.layout.grow_down(),
-        desc="Grow window down"),
-    Key([MOD, "control"], "k", lazy.layout.grow_up(), desc="Grow window up"),
-    Key([MOD], "n", lazy.layout.normalize(), desc="Reset all window sizes"),
-
-    Key([MOD, "shift"], "Return", lazy.layout.toggle_split(),
-        desc="Toggle between split and unsplit sides of stack"),
-    Key([MOD], "Return", lazy.spawn(TERMINAL), desc="Launch terminal"),
-
-    Key([MOD], "Tab", lazy.next_layout(), desc="Toggle between layouts"),
-    Key([MOD], "c", lazy.window.kill(), desc="Kill focused window"),
-
-    Key([MOD, "control"], "r", lazy.restart(), desc="Restart Qtile"),
-    Key([MOD, "control"], "q", lazy.shutdown(), desc="Shutdown Qtile"),
-
-    Key([MOD], "F12", os.system("xbacklight -inc 10"), desc="Inc backlight"),
-    Key([MOD], "F11", os.system("xbacklight -dec 10"), desc="Dec backlight"),
-
-    Key([MOD], "r", lazy.spawncmd(),
-        desc="Spawn a command using a prompt widget"),
-
-    KeyChord([MOD], "p", [
-        Key([], "p", lazy.spawn(f"dmenu_run {DMENU_FLAGS}"), desc="Spawn dmenu run"),
-        Key([], "n", lazy.spawn(f"networkmanager_dmenu {DMENU_FLAGS}"), desc="Spawn dmenu for network manager"),
-    ]),
-
-    Key([MOD, "mod1"], "q", lazy.spawn("qutebrowser"), desc="Spawn qutebrowser"),
-    Key([MOD, "mod1"], "b", lazy.spawn("brave"), desc="Spawn brave"),
-    Key([MOD, "mod1"], "f", lazy.spawn("firefox"), desc="Spawn firefox"),
-
-    KeyChord([MOD], "e", [
-        Key([], "e", lazy.spawn("emacsclient -c -a 'emacs'"), desc="Spawn Emacsclient"),
-        Key([], "d", lazy.spawn("emacsclient -c -a 'emacs' --eval '(dired nil)'"), desc='Emacsclient Dired'),
-        Key([], "m", lazy.spawn("emacsclient -c -a 'emacs' --eval '(emms-browser)'"), desc='Emacsclient Dired'),
-    ]),
-
-    Key([MOD, "mod1"], "s", lazy.spawn("alacritty -e spt"), desc="Spawn spt (spotify clent)"),
-    Key([MOD, "mod1"], "l", lazy.spawn("slock"), desc="lock desktop"),
-    Key([MOD, "mod1"], "r", lazy.spawn("alacritty -e ranger"), desc="Spawn ranger (file manager)"),
-    Key([MOD, "mod1"], "p", lazy.spawn("alacritty -e pulsemixer"), desc="Spawn pulsemixer"),
-]
-
-groups_names = [
-    "dev",
-    "www",
-    "music",
-    "virt",
-    "sys",
-    "other"
-]
-
-groups = [Group(i) for i in groups_names]
-for i, group in enumerate(groups):
-    keys.extend([
-        Key([MOD], str(i+1), lazy.group[group.name].toscreen(),
-            desc="Switch to group {}".format(group.name)),
-
-        Key([MOD, "shift"], str(i+1), lazy.window.togroup(group.name, switch_group=True),
-            desc="Switch to & move focused window to group {}".format(group.name)),
-    ])
-#+end_src
-
-*** Mouse
-#+begin_src python
-mouse = [
-    Drag([MOD], "Button1", lazy.window.set_position_floating(),
-         start=lazy.window.get_position()),
-    Drag([MOD], "Button3", lazy.window.set_size_floating(),
-         start=lazy.window.get_size()),
-    Click([MOD], "Button2", lazy.window.bring_to_front())
-]
-#+end_src
-
-** Layouts
-*** Defining layout default properties
-#+begin_src python
-layout_cfg = {
-    'border_width': 2,
-    'border_normal': "#bb8888",
-    'border_focus': "884444",
-    'margin': 8
-}
-#+end_src
-
-*** Defining layouts
-#+begin_src python
-layouts = [
-    # layout.Columns(**layout_cfg),
-    # layout.Max(),
-    layout.Stack(num_stacks=1, **layout_cfg),
-    # layout.Bsp(),
-    # layout.Matrix(),
-    layout.MonadTall(**layout_cfg),
-    # layout.MonadWide(),
-    # layout.RatioTile(),
-    # layout.Tile(),
-    # layout.TreeTab(),
-    # layout.VerticalTile(),
-    # layout.Zoomy(),
-]
-#+end_src
-
-** Bar
-*** Defining bar widgets properties
-**** Default
-#+begin_src python
-widget_defaults = dict(
-    font='sans',
-    fontsize=12,
-    padding=6,
-)
-#+end_src
-
-**** Transparent separator
-#+begin_src python
-transparent_sep = {
-    'foreground': BAR,
-    'margin': 2
-}
-#+end_src
-
-**** Soft separator
-#+begin_src python
-soft_sep = {
-    'foreground': '44475a',
-    'padding': 2,
-    'margin': 4
-}
-#+end_src
-
-*** Bar
-#+begin_src python
-screens = [
-    Screen(
-        top=bar.Bar(
-            [
-                widget.Sep(**transparent_sep),
-                widget.Image(filename="~/.config/qtile/python.png", margin=4),
-                widget.Sep(**transparent_sep),
-                widget.CurrentLayout(),
-                widget.Sep(**transparent_sep),
-                widget.GroupBox(
-                    margin_y = 3,
-                    margin_x = 0,
-                    padding_y = 5,
-                    padding_x = 3,
-                    borderwidth = 3,
-                    rounded = False,
-                    highlight_color = LIGHT_BAR,
-                    highlight_method = "line",
-                    this_current_screen_border = CYAN,
-                    this_screen_border = CYAN,
-                    other_current_screen_border = LIGHT_BAR,
-                    other_screen_border = LIGHT_BAR,
-                ),
-                widget.Prompt(),
-                widget.Sep(**transparent_sep),
-                widget.WindowName(),
-                widget.Net(format="🌐  ↓{down} ↑{up}", foreground=YELLOW),
-                widget.Sep(**soft_sep),
-                widget.CPU(format='💻  {load_percent}%', fontsize=12, foreground=RED),
-                widget.Sep(**soft_sep),
-                widget.Battery(format='🔋  {char} {percent:2.0%} {hour:d}:{min:02d} {watt:.2f} W', foreground=GREEN),
-                widget.Sep(**soft_sep),
-                widget.Clock(format='📅  %B %-d, %H:%M', foreground=CYAN),
-                widget.Sep(**soft_sep),
-                widget.CurrentScreen(),
-                widget.Sep(**soft_sep),
-                widget.Systray()
-            ],
-            24,
-            margin=8,
-            background=BAR,
-            border_color=CYAN,
-            border_width=1
-        ),
-    ),
-]
-#+end_src
-
-** Other settings
-#+begin_src python
-floating_layout = layout.Floating(float_rules=[
-    # Run the utility of `xprop` to see the wm class and name of an X client.
-    ,*layout.Floating.default_float_rules,
-    Match(wm_class='confirmreset'),  # gitk
-    Match(wm_class='makebranch'),  # gitk
-    Match(wm_class='maketag'),  # gitk
-    Match(wm_class='ssh-askpass'),  # ssh-askpass
-    Match(title='branchdialog'),  # gitk
-    Match(title='pinentry'),  # GPG key password entry
-])
-
-dgroups_key_binder = None
-dgroups_app_rules = []
-
-follow_mouse_focus = True
-bring_front_click = False
-cursor_warp = False
-auto_fullscreen = True
-focus_on_window_activation = "smart"
-reconfigure_screens = True
-
-auto_minimize = True
-
-wmname = "LG3D"
-#+end_src