Update

9 files changed, 112 insertions, 33 deletions

diff --git a/home.nix b/home.nix
index 2ccf390..985e801 100644
--- a/home.nix
+++ b/home.nix
@@ -54,9 +54,12 @@ in
     # Basic
     gnupg
     pnvim
-    nur.repos.pn.larbs-mail
-    nur.repos.pn.larbs-news
-    nur.repos.pn.larbs-music
+    (lowPrio nur.repos.pn.larbs-mail)
+    (lowPrio nur.repos.pn.larbs-news)
+    (lowPrio nur.repos.pn.larbs-music)
+    nur.repos.pn.larbs-scripts
+    slop
+    xlibs.xdpyinfo
     nur.repos.pn.dmenu
     amfora
     translate-shell
diff --git a/modules/dockd-old-setup.nix b/modules/dockd-old-setup.nix
new file mode 100644
index 0000000..83cb576
--- /dev/null
+++ b/modules/dockd-old-setup.nix
@@ -0,0 +1,74 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.programs.dockd;
+in
+
+{
+  options = {
+    programs.dockd = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = ''
+          ThinkPad dock manager daemon.
+        '';
+      };
+    };
+  };
+
+  config = lib.mkIf (cfg.enable) {
+    environment.etc = {
+      "dockd/docked.conf".text = ''
+        [Screen]
+        height=1920
+        width=3000
+        mm_height=506
+        mm_width=791
+
+        [CRTC]
+        crtc=63
+        x=0
+        y=241
+        rotation=1
+        mode=1920x1080
+        outputs_len=1
+        outputs_0=HDMI-3
+
+        [CRTC]
+        crtc=64
+        x=1920
+        y=0
+        rotation=2
+        mode=1920x1080
+        outputs_len=1
+        outputs_0=DP-2
+      '';
+
+      "dockd/undocked.conf".text = ''
+        [Screen]
+        height=768
+        width=1366
+        mm_height=202
+        mm_width=359
+
+        [CRTC]
+        crtc=63
+        x=0
+        y=0
+        rotation=1
+        mode=1366x768
+        outputs_len=1
+        outputs_0=LVDS-1
+
+        [CRTC]
+        crtc=64
+        x=1920
+        y=0
+        rotation=2
+        mode=None
+        outputs_len=0
+      '';
+    };
+  };
+}
diff --git a/modules/dockd.nix b/modules/dockd.nix
index 83cb576..3677f6e 100644
--- a/modules/dockd.nix
+++ b/modules/dockd.nix
@@ -21,15 +21,15 @@ in
     environment.etc = {
       "dockd/docked.conf".text = ''
         [Screen]
-        height=1920
-        width=3000
-        mm_height=506
-        mm_width=791
+        height=1225
+        width=3840
+        mm_height=323
+        mm_width=1015
 
         [CRTC]
         crtc=63
         x=0
-        y=241
+        y=145
         rotation=1
         mode=1920x1080
         outputs_len=1
@@ -39,12 +39,11 @@ in
         crtc=64
         x=1920
         y=0
-        rotation=2
+        rotation=1
         mode=1920x1080
         outputs_len=1
         outputs_0=DP-2
       '';
-
       "dockd/undocked.conf".text = ''
         [Screen]
         height=768
diff --git a/overlays.nix b/overlays.nix
index 16fbb87..bc2c426 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -12,5 +12,13 @@
         sha256 = "0lg9hwvcaiwj9z6wp9rw80czfs7l3bwvcc916fz87jxafp683m37";
       };
     });
+
+    brave-beta = super.brave.overrideAttrs (oldAttrs: rec {
+      version = "1.18.57";
+      src = super.fetchurl {
+        url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser-beta_${version}_amd64.deb";
+        sha256 = "11v7j13ids7dw1lpcjc5cw18vk6x9jc6ylsd2na7cgmygwx0f3ms";
+      };
+    });
   })
 ]
diff --git a/platforms/linux/configuration.nix b/platforms/linux/configuration.nix
index dcf2e1b..c353c59 100644
--- a/platforms/linux/configuration.nix
+++ b/platforms/linux/configuration.nix
@@ -75,14 +75,14 @@ in
       device = "/dev/disk/by-label/docker";
       fsType = "ext4";
     };
-    "/media" = {
-      device = "/dev/disk/by-label/media";
-      fsType = "ext4";
-    };
-    "/backup" = {
-      device = "/dev/disk/by-label/backup";
-      fsType = "ext4";
-    };
+    # "/media" = {
+    #   device = "/dev/disk/by-label/media";
+    #   fsType = "ext4";
+    # };
+    # "/backup" = {
+    #   device = "/dev/disk/by-label/backup";
+    #   fsType = "ext4";
+    # };
     "/mnt/qnap" = {
       device = "//192.168.1.119/Patryk";
       fsType = "cifs";
@@ -143,7 +143,7 @@ in
     # Basic tools
     stdenv wget vim curl htop dnsutils zip unzip
     zsh neovim ripgrep jq groff file pinentry_gnome
-    ssh-ident busybox_utils
+    ssh-ident busybox_utils usbutils
 
     # XORG perfs
     xorg.xorgserver xorg.xf86inputevdev xorg.xf86inputsynaptics xorg.xf86inputlibinput
@@ -248,6 +248,7 @@ in
   # Enable sound.
   sound.enable = true;
   hardware.pulseaudio.enable = true;
+  hardware.sane.enable = true;
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
@@ -301,7 +302,7 @@ in
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.pn = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "video" "docker" "adbusers" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [ "wheel" "video" "docker" "adbusers" "scanner" "lp" ]; # Enable ‘sudo’ for the user.
   };
 
   users.defaultUserShell = "/run/current-system/sw/bin/zsh";
diff --git a/programs/aliases.nix b/programs/aliases.nix
index 59d94b2..28e3815 100644
--- a/programs/aliases.nix
+++ b/programs/aliases.nix
@@ -18,4 +18,6 @@
   gc = "git commit";
   gl = "git lg";
   gd = "git diff";
+
+  calibre = "calibre --with-library=~/books";
 }
diff --git a/programs/newsboat/urls b/programs/newsboat/urls
index 8b2c797..0449fcf 100644
--- a/programs/newsboat/urls
+++ b/programs/newsboat/urls
@@ -14,6 +14,7 @@ https://www.poznan.pl/mim/feeds/rss.xml "~Poznań"
 #https://tvn24.pl/najwazniejsze.xml "~Polska"
 https://portal.mozz.us/gemini/cetacean.club/journal/atom.xml "~Christine Dodrill journal"
 https://feeds.simplecast.com/cgGduVSh "~Wayward Guide"
+https://etno-love.blogspot.com/rss.xml "~Z.Margraf"
 
 ## Tech
 tech "~## TECH ##"
@@ -21,6 +22,7 @@ https://github.com/pniedzwiedzinski.private.atom?token=AESSVFF6BRN4OM6S2436XX547
 https://weekly.nixos.org/feeds/all.rss.xml "~NixOS Weekly" "tech"
 https://christine.website/blog.rss "~Christine Dodrill" "tech"
 https://portal.mozz.us/gemini/makeworld.gq/gemlog/atom.xml?raw=1 "~makeworld" "tech"
+https://portal.mozz.us/gemini/gemini.marmaladefoo.com/cgi-bin/atom-feed.cgi%3Flukee?raw=1 "~Luke Emmet"
 
 ## Youtube
 yt "~## YOUTUBE ##"
diff --git a/programs/nvim.nix b/programs/nvim.nix
index d903c4d..6ce3e7b 100644
--- a/programs/nvim.nix
+++ b/programs/nvim.nix
@@ -108,11 +108,9 @@ pkgs.neovim.override {
         autocmd BufWritepre * %s/\n\+\%$//e
 
       " When shortcut files are updated, renew bash and ranger configs with new material:
-        autocmd BufWritePost files,directories !shortcuts
+        autocmd BufWritePost bm-files,bm-dirs !shortcuts
       " Run xrdb whenever Xdefaults or Xresources are updated.
-        autocmd BufWritePost *Xresources,*Xdefaults !xrdb %
-      " Update binds when sxhkdrc is updated.
-        autocmd BufWritePost *sxhkdrc !pkill -USR1 sxhkd
+        autocmd BufWritePost *Xresources,*Xdefaults,*xresources,*xdefaults !xrdb %
 
       " Turns off highlighting on the bits of code that are changed, so the line that is changed is highlighted but the actual text that has changed stands out on the line and is readable.
       if &diff
diff --git a/programs/zsh/zprofile b/programs/zsh/zprofile
index 38288a1..244bedb 100644
--- a/programs/zsh/zprofile
+++ b/programs/zsh/zprofile
@@ -136,15 +136,7 @@ LOCATION="Poznan"
 
 [ ! -f ${XDG_CONFIG_HOME:-$HOME/.config}/shortcutrc ] && shortcuts >/dev/null 2>&1 &
 
-#if pacman -Qs libxft-bgra >/dev/null 2>&1; then
-	# Start graphical server on tty1 if not already running.
-	[ "$(tty)" = "/dev/tty1" ] && ! pidof Xorg >/dev/null 2>&1  && exec startx &> $HOME/.Xoutput
-#else
-#	echo "\033[31mIMPORTANT\033[0m: Note that \033[32m\`libxft-bgra\`\033[0m must be installed for this build of dwm.
-#Please run:
-#	\033[32myay -S libxft-bgra\033[0m
-#and replace \`libxft\`"
-#fi
+[ "$(tty)" = "/dev/tty1" ] && ! pidof Xorg >/dev/null 2>&1  && exec startx
 
 # Switch escape and caps if tty and no passwd required:
 # sudo -n loadkeys ${XDG_DATA_HOME:-$HOME/.local/share}/larbs/ttymaps.kmap 2>/dev/null