From d5cf98310f2fea93a541a00315c8fb5a54be8077 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 4 Nov 2024 21:07:01 +0100 Subject: [PATCH 1/8] Add `ement.el` (matrix client) --- packages/emacs/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index 7baa25f..9ed79db 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -89,6 +89,7 @@ let kind-icon ef-themes indent-bars + ement ]) ++ (with nongnuPackages; [ eat From e23c78fdb5778b6454b9773a44de1abc06a24f95 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 4 Nov 2024 21:07:23 +0100 Subject: [PATCH 2/8] Disable `logseq` --- hosts/kirk/default.nix | 1 - hosts/picard/default.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix index 272dd30..e2321fa 100644 --- a/hosts/kirk/default.nix +++ b/hosts/kirk/default.nix @@ -73,7 +73,6 @@ "imv" "catppuccin" "libreoffice" - "logseq" "emacs" ]; extraGroups = [ ]; diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index c5773d4..0fa47b5 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -90,7 +90,6 @@ "zathura" "imv" "libreoffice" - "logseq" "emacs" "vial" ]; From bd8e6a0715fe66fd87efb54d226b0e80de673522 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 4 Nov 2024 21:07:33 +0100 Subject: [PATCH 3/8] Fix ddcci workaround on `picard` --- hosts/picard/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 0fa47b5..60677ff 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -35,7 +35,7 @@ "hass-poweroff" "forgejo-runners" "teamviewer" - "macos-ventura" + # "macos-ventura" "sunshine" "mount-sisko" "adb" @@ -127,10 +127,15 @@ ]; systemd.services.ddcci = { - serviceConfig.Type = "oneshot"; script = '' echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device ''; + wantedBy = [ "graphical.target" ]; + restartIfChanged = false; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; }; boot.loader.efi.canTouchEfiVariables = true; From 115aa92dddb7d6236466106d6edbd5db76d102c3 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 4 Nov 2024 21:10:56 +0100 Subject: [PATCH 4/8] Workaround for when atuind is not well stopped --- hmModules/shell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index 048a65f..c5d9af0 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -49,7 +49,7 @@ WantedBy = [ "default.target" ]; }; Service = { - # ExecStartPre = "${lib.getExe' pkgs.toybox "rm"} -f ${config.programs.atuin.settings.daemon.socket_path}"; + ExecStartPre = "${lib.getExe' pkgs.toybox "rm"} -f ${config.programs.atuin.settings.daemon.socket_path}"; ExecStart = "${lib.getExe pkgs.atuin} daemon"; }; }; From f30f235f195559ec1a44de7dc61ebfff53ad907f Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 4 Nov 2024 21:11:57 +0100 Subject: [PATCH 5/8] Disable VI mode for Fish --- hmModules/shell/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index c5d9af0..fb10d92 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -83,7 +83,8 @@ ]; shellInit = '' - fish_vi_key_bindings + # fish_vi_key_bindings + fish_default_key_bindings '' + lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) '' export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path}) From 9dea0100c937ef5c540652ad314dc929f733e153 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 4 Nov 2024 21:13:30 +0100 Subject: [PATCH 6/8] Disable zellij and Emacs Notmuch instead of aerc --- hmModules/hyprland/hyprland.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hmModules/hyprland/hyprland.conf b/hmModules/hyprland/hyprland.conf index 473e740..068a65f 100644 --- a/hmModules/hyprland/hyprland.conf +++ b/hmModules/hyprland/hyprland.conf @@ -30,9 +30,10 @@ windowrulev2 = workspace 9, class:^(Spotify)$ windowrulev2 = float, title:^(floating)$ bind = $mod, b, exec, firefox -bind = $mod, t, exec, footclient $SHELL -C "zellij" +# bind = $mod, t, exec, footclient $SHELL -C "zellij" +bind = $mod, t, exec, footclient $SHELL bind = $mod, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)" -bind = $mod, m, exec, footclient $SHELL -C "aerc" +bind = $mod, m, exec, emacsclient -c --eval '(notmuch-search "tag:new")' bind = $mod, d, exec, fuzzel --background-color=253559cc --border-radius=5 --border-width=0 bind = $mod, s, exec, screenshot.sh bind = $mod, n, exec, logseq From 939f79f04d4fc9cad5eaa764d01f70f1dd274f45 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 4 Nov 2024 21:13:58 +0100 Subject: [PATCH 7/8] Force search.json recreation --- hmModules/firefox/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hmModules/firefox/default.nix b/hmModules/firefox/default.nix index 43d60a3..bb04ac5 100644 --- a/hmModules/firefox/default.nix +++ b/hmModules/firefox/default.nix @@ -62,6 +62,7 @@ in ]; }; profiles.default = { + search.force = true; search.default = "DuckDuckGo"; search.engines = { "Searx" = { From dd626c2fc05b4d108cee10edbdd84b32614ef407 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 4 Nov 2024 21:19:55 +0100 Subject: [PATCH 8/8] Formatting --- hmModules/emacs/default.nix | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/hmModules/emacs/default.nix b/hmModules/emacs/default.nix index e8bdebf..54ff7dc 100644 --- a/hmModules/emacs/default.nix +++ b/hmModules/emacs/default.nix @@ -51,23 +51,23 @@ in en_US-large it_IT ]); - home.activation = { - cloneCcrEmacsFlake = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - PATH=$PATH:${ - lib.makeBinPath ( - with pkgs; - [ - git - openssh - ] - ) - } - if [ ! -d "$HOME/.config/emacs" ]; then - mkdir "$HOME/.config/emacs" - $DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/emacs/init.el" "$HOME/.config/emacs/init.el" - $DRY_RUN_CMD ln -s "$HOME/.config/emacs" "$HOME/emacs" - fi - $DRY_RUN_CMD ln -sfn ${treesitGrammars} "$HOME/.config/emacs/tree-sitter" + home.activation.cloneCcrEmacsFlake = + let + path = lib.makeBinPath ( + with pkgs; + [ + git + openssh + ] + ); + in + lib.hm.dag.entryAfter [ "writeBoundary" ] '' + PATH=$PATH:${path} + if [ ! -d "$HOME/.config/emacs" ]; then + mkdir "$HOME/.config/emacs" + $DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/emacs/init.el" "$HOME/.config/emacs/init.el" + $DRY_RUN_CMD ln -s "$HOME/.config/emacs" "$HOME/emacs" + fi + $DRY_RUN_CMD ln -sfn ${treesitGrammars} "$HOME/.config/emacs/tree-sitter" ''; - }; }