From 473ad6676d36ce05ee8047cab35e96114bc6138b Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Fri, 7 Nov 2025 19:46:44 +0100 Subject: [PATCH] Update --- files/.config/niri/config.kdl | 28 ++++++++++++++-------------- guix-config/channels-lock.scm | 2 +- guix-config/system/base-system.scm | 8 ++++++-- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/files/.config/niri/config.kdl b/files/.config/niri/config.kdl index cc2617c..9e28cbe 100644 --- a/files/.config/niri/config.kdl +++ b/files/.config/niri/config.kdl @@ -69,7 +69,7 @@ input { // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen. // focus-follows-mouse max-scroll-amount="0%" - disable-power-key-handling + //disable-power-key-handling } // You can configure outputs by their name, which you can find @@ -274,7 +274,7 @@ layout { spawn-sh-at-startup "emacs --daemon" // To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup: -spawn-sh-at-startup "qs -c dms" +spawn-sh-at-startup "dms run" spawn-sh-at-startup "wl-paste --watch cliphist store &" spawn-sh-at-startup "nextcloud --background" @@ -382,42 +382,42 @@ binds { // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc. Mod+Space hotkey-overlay-title="Application Launcher" { - spawn "qs" "-c" "dms" "ipc" "call" "spotlight" "toggle"; + spawn "dms" "ipc" "call" "spotlight" "toggle"; } Mod+V hotkey-overlay-title="Clipboard Manager" { - spawn "qs" "-c" "dms" "ipc" "call" "clipboard" "toggle"; + spawn "dms" "ipc" "call" "clipboard" "toggle"; } Mod+M hotkey-overlay-title="Task Manager" { - spawn "qs" "-c" "dms" "ipc" "call" "processlist" "toggle"; + spawn "dms" "ipc" "call" "processlist" "toggle"; } Super+L hotkey-overlay-title="Lock Screen" { - spawn "qs" "-c" "dms" "ipc" "call" "lock" "lock"; + spawn "dms" "ipc" "call" "lock" "lock"; } Mod+Y hotkey-overlay-title="Browse Wallpapers" { - spawn "qs" "-c" "dms" "ipc" "call" "dankdash" "wallpaper"; + spawn "dms" "ipc" "call" "dankdash" "wallpaper"; } XF86AudioRaiseVolume allow-when-locked=true { - spawn "qs" "-c" "dms" "ipc" "call" "audio" "increment" "3"; + spawn "dms" "ipc" "call" "audio" "increment" "3"; } XF86AudioLowerVolume allow-when-locked=true { - spawn "qs" "-c" "dms" "ipc" "call" "audio" "decrement" "3"; + spawn "dms" "ipc" "call" "audio" "decrement" "3"; } XF86AudioMute allow-when-locked=true { - spawn "qs" "-c" "dms" "ipc" "call" "audio" "mute"; + spawn "dms" "ipc" "call" "audio" "mute"; } XF86AudioMicMute allow-when-locked=true { - spawn "qs" "-c" "dms" "ipc" "call" "audio" "micmute"; + spawn "dms" "ipc" "call" "audio" "micmute"; } XF86MonBrightnessUp allow-when-locked=true { - spawn "qs" "-c" "dms" "ipc" "call" "brightness" "increment" "5" ""; + spawn "dms" "ipc" "call" "brightness" "increment" "5" ""; } // You can override the default device for e.g. keyboards by adding the device name to the last param XF86MonBrightnessDown allow-when-locked=true { - spawn "qs" "-c" "dms" "ipc" "call" "brightness" "decrement" "5" ""; + spawn "dms" "ipc" "call" "brightness" "decrement" "5" ""; } // Night mode toggle Mod+Shift+N allow-when-locked=true { - spawn "qs" "-c" "dms" "ipc" "call" "night" "toggle"; + spawn "dms" "ipc" "call" "night" "toggle"; } // Open/close the Overview: a zoomed-out view of workspaces and windows. // You can also move the mouse into the top-left hot corner, diff --git a/guix-config/channels-lock.scm b/guix-config/channels-lock.scm index bfce4c6..fc2bf0f 100644 --- a/guix-config/channels-lock.scm +++ b/guix-config/channels-lock.scm @@ -3,7 +3,7 @@ (url "https://git.guix.gnu.org/guix.git") (branch "master") (commit - "04ad78093a9076c47c16f725dfb0b6a20d6f6676") + "4bfe5cdf144183df08e7ac0e1c1acb7366e24bcf") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" diff --git a/guix-config/system/base-system.scm b/guix-config/system/base-system.scm index 8f12371..69f5747 100644 --- a/guix-config/system/base-system.scm +++ b/guix-config/system/base-system.scm @@ -1,6 +1,7 @@ (define-module (guix-config system base-system) #:use-module (gnu) #:use-module (gnu services dbus) + #:use-module (gnu packages cups) #:use-module (guix) #:export (base-system)) @@ -54,8 +55,11 @@ ;; To configure OpenSSH, pass an 'openssh-configuration' ;; record as a second argument to 'service' below. (service openssh-service-type) - (service cups-service-type) - (service gnome-keyring-service-type) + (service cups-service-type + (cups-configuration + (web-interface? #t) + (extensions + (list cups-filters epson-inkjet-printer-escpr hplip-minimal)))) (service bluetooth-service-type) (service power-profiles-daemon-service-type) (simple-service 'my-polkit-wheel polkit-service-type (list my-polkit-wheel))