From 20b984a01709973e01dafa7ad77d6e83dbbfd4cd Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:18:00 +0400 Subject: [PATCH 1/8] adf --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c9eeeddb..327a1eda 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ # load stuff { - description = "horrible dotfiles for amazing distro"; + description = "Sako's NixOS Configuration"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; # nixpkgs stable branch From baf40b3c1386503ec6c7b469818de0e3290c7972 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:24:14 +0400 Subject: [PATCH 2/8] (fix) Use self instead of outputs in specialArgs --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 327a1eda..4b7fdc0d 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,7 @@ nixosConfigurations = { sakotop = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; + specialArgs = {inherit inputs self;}; modules = [ ./default.nix ./hosts/sakotop/configuration.nix @@ -72,14 +72,14 @@ ]; }; sakopc = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; + specialArgs = {inherit inputs self;}; modules = [ ./default.nix ./hosts/sakopc/configuration.nix ]; }; #sakoserver = nixpkgs.lib.nixosSystem { - # specialArgs = {inherit inputs outputs;}; + # specialArgs = {inherit inputs self;}; # modules = [ # ./default.nix # ./hosts/sakoserver/configuration.nix @@ -88,7 +88,7 @@ sakowsl = nixpkgs.lib.nixosSystem { # because theres no hardware-configuration.nix system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; + specialArgs = {inherit inputs self;}; modules = [ {nix.registry.nixpkgs.flake = nixpkgs;} ./hosts/sakowsl/configuration.nix From 82650e701ce0ce22b4a9d7f9de2cbd57e633bc54 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:47:41 +0400 Subject: [PATCH 3/8] Revert "asdf" This reverts commit 0345ce173683809134964b70128eeed17bcf0c17. --- config/emacs/emacs.org | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org index 0c01bc21..67810040 100644 --- a/config/emacs/emacs.org +++ b/config/emacs/emacs.org @@ -1295,11 +1295,7 @@ I'm scared (string-prefix-p "sun-awt-X11-" exwm-instance-name) (string= "gimp" exwm-instance-name)) (exwm-workspace-rename-buffer exwm-title)))) - ;; floating - (add-hook 'exwm-floating-setup-hook - (lambda () - (toggle-frame-tab-bar) ;; No tab bars on floating frames - (exwm-layout-hide-mode-line)) + ;; always use these keys in emacs (setq exwm-input-prefix-keys '(?\C-x From c75502573139ba9b3c462d36ea4453d981c83a8c Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Tue, 30 Jul 2024 04:09:10 +0400 Subject: [PATCH 4/8] (feat) change exwm opacity to 90 --- config/emacs/emacs.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org index 67810040..dd83529f 100644 --- a/config/emacs/emacs.org +++ b/config/emacs/emacs.org @@ -1218,8 +1218,8 @@ I'm scared (when (eq system-type 'gnu/linux) (use-package exwm :config - (set-frame-parameter nil 'alpha '(85 . 85)) - (add-to-list 'default-frame-alist '(alpha . (85 . 85))) + (set-frame-parameter nil 'alpha '(90 . 90)) + (add-to-list 'default-frame-alist '(alpha . (90 . 90))) (defun sakomacs/exwm-init-hook () ;; background From dfa465de0523eafb5404224db2ddb95393eaa378 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Tue, 30 Jul 2024 04:12:38 +0400 Subject: [PATCH 5/8] (fix) exwm-stimulation-keys --- config/emacs/emacs.org | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org index dd83529f..ac2f5760 100644 --- a/config/emacs/emacs.org +++ b/config/emacs/emacs.org @@ -1309,11 +1309,11 @@ I'm scared ?\C-\ )) ;; Ctrl+Space (setq exwm-input-stimulation-keys - '( + `( ;; cut/paste. - ([?\C-w] . [?\C-x]) - ([?\M-w] . [?\C-c]) - ([?\C-y] . [?\C-v]))) + ( ,(kbd "C-w") . ,(kbd "C-x")) + (,(kbd "M-w") . ,(kbd "C-c")) + (,(kbd "C-y" . ,(kbd "C-v"))))) ;; Ctrl+/3Q will enable the next key to be sent directly From 0c5397922f5ce45e671baae4a7b19fb474f2cf6c Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Tue, 30 Jul 2024 04:14:31 +0400 Subject: [PATCH 6/8] (feat) add kill-current-buffer keybind --- config/emacs/emacs.org | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org index ac2f5760..0738997b 100644 --- a/config/emacs/emacs.org +++ b/config/emacs/emacs.org @@ -1322,6 +1322,10 @@ I'm scared (exwm-input-set-key (kbd "s-SPC") 'app-launcher-run-app) (exwm-input-set-key (kbd "s-f") 'exwm-layout-toggle-fullscreen) (exwm-input-set-key (kbd "s-") 'vterm) + + ;; kill apps + (exwm-input-set-key (kbd "s-q") #'kill-current-buffer) + ;; 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 From 701990de9769e2164d6ce3f419a15fc8bfd354fe Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Tue, 30 Jul 2024 04:16:45 +0400 Subject: [PATCH 7/8] (hotfix) inherit outputs for now --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 4b7fdc0d..327a1eda 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,7 @@ nixosConfigurations = { sakotop = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs self;}; + specialArgs = {inherit inputs outputs;}; modules = [ ./default.nix ./hosts/sakotop/configuration.nix @@ -72,14 +72,14 @@ ]; }; sakopc = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs self;}; + specialArgs = {inherit inputs outputs;}; modules = [ ./default.nix ./hosts/sakopc/configuration.nix ]; }; #sakoserver = nixpkgs.lib.nixosSystem { - # specialArgs = {inherit inputs self;}; + # specialArgs = {inherit inputs outputs;}; # modules = [ # ./default.nix # ./hosts/sakoserver/configuration.nix @@ -88,7 +88,7 @@ sakowsl = nixpkgs.lib.nixosSystem { # because theres no hardware-configuration.nix system = "x86_64-linux"; - specialArgs = {inherit inputs self;}; + specialArgs = {inherit inputs outputs;}; modules = [ {nix.registry.nixpkgs.flake = nixpkgs;} ./hosts/sakowsl/configuration.nix From bcbd913ea699a087cdf64e507f3ef7bf5755725a Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Tue, 30 Jul 2024 04:20:12 +0400 Subject: [PATCH 8/8] (bug) Revert "(fix) exwm-stimulation-keys" This reverts commit dfa465de0523eafb5404224db2ddb95393eaa378. --- config/emacs/emacs.org | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org index 0738997b..6fcb1139 100644 --- a/config/emacs/emacs.org +++ b/config/emacs/emacs.org @@ -1309,11 +1309,11 @@ I'm scared ?\C-\ )) ;; Ctrl+Space (setq exwm-input-stimulation-keys - `( + '( ;; cut/paste. - ( ,(kbd "C-w") . ,(kbd "C-x")) - (,(kbd "M-w") . ,(kbd "C-c")) - (,(kbd "C-y" . ,(kbd "C-v"))))) + ([?\C-w] . [?\C-x]) + ([?\M-w] . [?\C-c]) + ([?\C-y] . [?\C-v]))) ;; Ctrl+/3Q will enable the next key to be sent directly