From ffef9419c08a21105f8a126157eef0f7880f5f8d Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Thu, 18 Jul 2024 21:46:25 +0400 Subject: [PATCH] no --- config/emacs/emacs.org | 190 +++++++++++++++---------------- hosts/sakotop/configuration.nix | 4 +- modules/desktop/exwm/default.nix | 1 - 3 files changed, 97 insertions(+), 98 deletions(-) diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org index bc9a976a..a72f4763 100644 --- a/config/emacs/emacs.org +++ b/config/emacs/emacs.org @@ -1175,119 +1175,119 @@ Export and then view with emacs :) * EXWM I'm scared #+begin_src emacs-lisp - (when (eq system-type 'gnu/linux) - (display-battery-mode) - (use-package exwm - :config + ;; (when (eq system-type 'gnu/linux) + ;; (display-battery-mode) + ;; (use-package exwm + ;; :config - (defun sakomacs/exwm-init-hook () - ;; background - (call-process-shell-command "feh --bg-fill ~/background.png" nil 0) - (set-frame-parameter (selected-frame)'alpha '(90 . 90)) - ;; (call-process-shell-command "~/.config/polybar/startpolybar" nil 0) - ;; (call-process-shell-command "~/.config/picom/startpicom" nil 0) - ;; startup - ;; (call-process-shell-command "nm-applet" nil 0) - ;; (call-process-shell-command "blueman-applet" nil 0) - ;; (call-process-shell-command "nextcloud" nil 0) - ;; (call-process-shell-command "bitwarden" nil 0) - ;; (call-process-shell-command "flameshot" nil 0) - ) + ;; (defun sakomacs/exwm-init-hook () + ;; ;; background + ;; (call-process-shell-command "feh --bg-fill ~/background.png" nil 0) + ;; (set-frame-parameter (selected-frame)'alpha '(90 . 90)) + ;; ;; (call-process-shell-command "~/.config/polybar/startpolybar" nil 0) + ;; ;; (call-process-shell-command "~/.config/picom/startpicom" nil 0) + ;; ;; startup + ;; ;; (call-process-shell-command "nm-applet" nil 0) + ;; ;; (call-process-shell-command "blueman-applet" nil 0) + ;; ;; (call-process-shell-command "nextcloud" nil 0) + ;; ;; (call-process-shell-command "bitwarden" nil 0) + ;; ;; (call-process-shell-command "flameshot" nil 0) + ;; ) - ;; background - ;; todo turn this info a function - (add-hook 'exwm-init-hook 'sakomacs/exwm-init-hook) - ;; startup - ;; workspaces - (setq exwm-workspace-number 5) + ;; ;; background + ;; ;; todo turn this info a function + ;; (add-hook 'exwm-init-hook 'sakomacs/exwm-init-hook) + ;; ;; startup + ;; ;; workspaces + ;; (setq exwm-workspace-number 5) - (require 'exwm-systemtray) - (exwm-systemtray-enable) + ;; (require 'exwm-systemtray) + ;; (exwm-systemtray-enable) - ;; polybar - (defvar sakomacs/polybar-process nil - "Holds the process of the running Polybar instance, if any") + ;; ;; polybar + ;; (defvar sakomacs/polybar-process nil + ;; "Holds the process of the running Polybar instance, if any") - (server-start) + ;; (server-start) - (defun sakomacs/kill-panel () - (interactive) - (when sakomacs/polybar-process - (ignore-errors - (kill-process sakomacs/polybar-process))) - (setq sakomacs/polybar-process nil)) + ;; (defun sakomacs/kill-panel () + ;; (interactive) + ;; (when sakomacs/polybar-process + ;; (ignore-errors + ;; (kill-process sakomacs/polybar-process))) + ;; (setq sakomacs/polybar-process nil)) - (defun sakomacs/start-panel () - (interactive) - (sakomacs/kill-panel) - (setq sakomacs/polybar-process (start-process-shell-command "polybar" nil "polybar panel"))) + ;; (defun sakomacs/start-panel () + ;; (interactive) + ;; (sakomacs/kill-panel) + ;; (setq sakomacs/polybar-process (start-process-shell-command "polybar" nil "polybar panel"))) - (defun sakomacs/send-polybar-hook (module-name hook-index) - (start-process-shell-command "polybar-msg" nil (format "polybar-msg hook %s %s" module-name hook-index))) + ;; (defun sakomacs/send-polybar-hook (module-name hook-index) + ;; (start-process-shell-command "polybar-msg" nil (format "polybar-msg hook %s %s" module-name hook-index))) - (defun sakomacs/send-polybar-exwm-workspace () - (sakomacs/send-polybar-hook "exwm-workspace" 1)) + ;; (defun sakomacs/send-polybar-exwm-workspace () + ;; (sakomacs/send-polybar-hook "exwm-workspace" 1)) - ;; Update panel indicator when workspace changes - (add-hook 'exwm-workspace-switch-hook #'sakomacs/send-polybar-exwm-workspace) + ;; ;; Update panel indicator when workspace changes + ;; (add-hook 'exwm-workspace-switch-hook #'sakomacs/send-polybar-exwm-workspace) - ;; always use these keys in emacs - (setq exwm-input-prefix-keys - '(?\C-x - ?\C-u - ?\C-h - ?\M-x - ?\M-` - ?\M-& - ?\M-: - ?\C-\M-j ;; Buffer list - ?\C-\ )) ;; Ctrl+Space + ;; ;; always use these keys in emacs + ;; (setq exwm-input-prefix-keys + ;; '(?\C-x + ;; ?\C-u + ;; ?\C-h + ;; ?\M-x + ;; ?\M-` + ;; ?\M-& + ;; ?\M-: + ;; ?\C-\M-j ;; Buffer list + ;; ?\C-\ )) ;; Ctrl+Space - ;; Ctrl+Q will enable the next key to be sent directly - (define-key exwm-mode-map [?\C-q] 'exwm-input-send-next-key) - ;; app launcher and fullscreen - (exwm-input-set-key (kbd "s-SPC") 'counsel-linux-app) - (exwm-input-set-key (kbd "s-f") 'exwm-layout-toggle-fullscreen) - ;; Set up global key bindings. These always work, no matter the input state! - ;; Keep in mind that changing this list after EXWM initializes has no effect. - (setq exwm-input-global-keys - `( - ;; Reset to line-mode (C-c C-k switches to char-mode via exwm-input-release-keyboard) - ([?\s-r] . exwm-reset) + ;; ;; Ctrl+Q will enable the next key to be sent directly + ;; (define-key exwm-mode-map [?\C-q] 'exwm-input-send-next-key) + ;; ;; app launcher and fullscreen + ;; (exwm-input-set-key (kbd "s-SPC") 'counsel-linux-app) + ;; (exwm-input-set-key (kbd "s-f") 'exwm-layout-toggle-fullscreen) + ;; ;; Set up global key bindings. These always work, no matter the input state! + ;; ;; Keep in mind that changing this list after EXWM initializes has no effect. + ;; (setq exwm-input-global-keys + ;; `( + ;; ;; Reset to line-mode (C-c C-k switches to char-mode via exwm-input-release-keyboard) + ;; ([?\s-r] . exwm-reset) - ;; Move between windows - ([s-left] . windmove-left) - ([s-right] . windmove-right) - ([s-up] . windmove-up) - ([s-down] . windmove-down) + ;; ;; Move between windows + ;; ([s-left] . windmove-left) + ;; ([s-right] . windmove-right) + ;; ([s-up] . windmove-up) + ;; ([s-down] . windmove-down) - ;; Launch applications via shell command - ([?\s-&] . (lambda (command) - (interactive (list (read-shell-command "$ "))) - (start-process-shell-command command nil command))) + ;; ;; Launch applications via shell command + ;; ([?\s-&] . (lambda (command) + ;; (interactive (list (read-shell-command "$ "))) + ;; (start-process-shell-command command nil command))) - ;; Switch workspace - ([?\s-w] . exwm-workspace-switch) + ;; ;; Switch workspace + ;; ([?\s-w] . exwm-workspace-switch) - ;; 's-N': Switch to certain workspace with Super (Win) plus a number key (0 - 9) - ,@(mapcar (lambda (i) - `(,(kbd (format "s-%d" i)) . - (lambda () - (interactive) - (exwm-workspace-switch-create ,i)))) - (number-sequence 0 9)))) - ) + ;; ;; 's-N': Switch to certain workspace with Super (Win) plus a number key (0 - 9) + ;; ,@(mapcar (lambda (i) + ;; `(,(kbd (format "s-%d" i)) . + ;; (lambda () + ;; (interactive) + ;; (exwm-workspace-switch-create ,i)))) + ;; (number-sequence 0 9)))) + ;; ) - (use-package desktop-environment - :after exwm - :config (desktop-environment-mode) - :custom - (desktop-environment-brightness-small-increment "2%+") - (desktop-environment-brightness-small-decrement "2%-") - (desktop-environment-brightness-normal-increment "5%+") - (desktop-environment-brightness-normal-decrement "5%-")) - ) + ;; (use-package desktop-environment + ;; :after exwm + ;; :config (desktop-environment-mode) + ;; :custom + ;; (desktop-environment-brightness-small-increment "2%+") + ;; (desktop-environment-brightness-small-decrement "2%-") + ;; (desktop-environment-brightness-normal-increment "5%+") + ;; (desktop-environment-brightness-normal-decrement "5%-")) + ;; ) #+end_src * End #+begin_src elisp diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix index f5dd62b2..08ae98fb 100644 --- a/hosts/sakotop/configuration.nix +++ b/hosts/sakotop/configuration.nix @@ -25,8 +25,8 @@ enable = false; polybar.enable = false; }; - xmonad.enable = false; - exwm.enable = true; + xmonad.enable = true; + exwm.enable = false; picom.enable = true; dunst.enable = true; browsers = { diff --git a/modules/desktop/exwm/default.nix b/modules/desktop/exwm/default.nix index c9f6e546..1ad3bb4b 100644 --- a/modules/desktop/exwm/default.nix +++ b/modules/desktop/exwm/default.nix @@ -49,7 +49,6 @@ in { # ''; extraConfig = pkgs.writeText "emacs-loadscript" '' (require 'exwm-config) - (exwm-config-default) (exwm-init) ''; in