From a74ddd2ee854d2334184139bb6783fa3c025a123 Mon Sep 17 00:00:00 2001 From: ponymushama Date: Tue, 23 Jul 2024 16:41:06 +0800 Subject: [PATCH] disable emac 2 --- user/app/ranger/rifle.conf | 4 ++-- user/wm/hyprland/hyprland.nix | 12 +----------- .../hyprprofiles/profiles/Bard/start-hook.sh | 5 ++--- .../hyprprofiles/profiles/Default/start-hook.sh | 5 ++--- .../hyprprofiles/profiles/Gamdev/start-hook.sh | 5 ++--- .../hyprprofiles/profiles/Teaching/start-hook.sh | 5 ++--- .../hyprprofiles/profiles/Tech/start-hook.sh | 5 ++--- user/wm/xmonad/startup.sh | 5 ++--- user/wm/xmonad/xmonad.hs | 2 +- 9 files changed, 16 insertions(+), 32 deletions(-) diff --git a/user/app/ranger/rifle.conf b/user/app/ranger/rifle.conf index b61237f..4a18cad 100644 --- a/user/app/ranger/rifle.conf +++ b/user/app/ranger/rifle.conf @@ -65,8 +65,8 @@ ext x?html?, has w3m, terminal = w3m "$@" # Misc #------------------------------------------- # Define the "editor" for text files as first action -ext org, has emacsclient, X, flag f = emacsclient -c "$@" -mime ^text, has emacsclient, X, flag f = emacsclient -c "$@" +ext org, has nvim, X, flag f = nvim -c "$@" +mime ^text, has nvim, X, flag f = nvim -c "$@" ext 1 = man "$1" ext s[wmf]c, has zsnes, X = zsnes "$1" diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 8543e60..2c6fb33 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -48,7 +48,6 @@ in exec-once = hyprprofile Default - exec-once = emacs --daemon exec-once = pypr exec-once = ydotoold #exec-once = STEAM_FRAME_FORCE_CLOSE=1 steam -silent @@ -513,15 +512,7 @@ in #!/bin/sh if pgrep -x nixos-rebuild > /dev/null || pgrep -x home-manager > /dev/null || pgrep -x kdenlive > /dev/null || pgrep -x FL64.exe > /dev/null || pgrep -x blender > /dev/null || pgrep -x flatpak > /dev/null; then echo "Shouldn't suspend"; sleep 10; else echo "Should suspend"; systemctl suspend; fi - '') - (pkgs.makeDesktopItem { - name = "emacsclientnewframe"; - desktopName = "Emacs Client New Frame"; - exec = "emacsclient -c -a emacs"; - terminal = false; - icon = "emacs"; - type = "Application"; - })]) + '')]) ++ (with pkgs-hyprland; [ hyprlock ]) ++ (with pkgs-nwg-dock-hyprland; [ @@ -572,7 +563,6 @@ in home.file.".config/nwg-dock-pinned".text = '' nwggrid Alacritty - emacsclientnewframe qutebrowser brave-browser librewolf diff --git a/user/wm/hyprland/hyprprofiles/profiles/Bard/start-hook.sh b/user/wm/hyprland/hyprprofiles/profiles/Bard/start-hook.sh index 25ac77f..95e58fc 100755 --- a/user/wm/hyprland/hyprprofiles/profiles/Bard/start-hook.sh +++ b/user/wm/hyprland/hyprprofiles/profiles/Bard/start-hook.sh @@ -1,5 +1,4 @@ #!/bin/sh -hyprctl keyword unbind SUPER,S; -hyprctl keyword bind SUPER,S,exec,container-open Bard; -emacsclient --eval '(org-roam-switch-db "Bard.p" t)' +hyprctl keyword unbind SUPER,S +hyprctl keyword bind SUPER,S,exec,container-open Bard diff --git a/user/wm/hyprland/hyprprofiles/profiles/Default/start-hook.sh b/user/wm/hyprland/hyprprofiles/profiles/Default/start-hook.sh index bd7f4c9..28ffd30 100755 --- a/user/wm/hyprland/hyprprofiles/profiles/Default/start-hook.sh +++ b/user/wm/hyprland/hyprprofiles/profiles/Default/start-hook.sh @@ -1,5 +1,4 @@ #!/bin/sh -hyprctl keyword unbind SUPER,S; -hyprctl keyword bind SUPER,S,exec,qutebrowser; -emacsclient --eval '(org-roam-switch-db "Personal.p" t)' +hyprctl keyword unbind SUPER,S +hyprctl keyword bind SUPER,S,exec,qutebrowser diff --git a/user/wm/hyprland/hyprprofiles/profiles/Gamdev/start-hook.sh b/user/wm/hyprland/hyprprofiles/profiles/Gamdev/start-hook.sh index 8360bda..b20a6e4 100755 --- a/user/wm/hyprland/hyprprofiles/profiles/Gamdev/start-hook.sh +++ b/user/wm/hyprland/hyprprofiles/profiles/Gamdev/start-hook.sh @@ -1,5 +1,4 @@ #!/bin/sh -hyprctl keyword unbind SUPER,S; -hyprctl keyword bind SUPER,S,exec,container-open Gamedev; -emacsclient --eval '(org-roam-switch-db "Gamedev.s" t)' +hyprctl keyword unbind SUPER,S +hyprctl keyword bind SUPER,S,exec,container-open Gamedev diff --git a/user/wm/hyprland/hyprprofiles/profiles/Teaching/start-hook.sh b/user/wm/hyprland/hyprprofiles/profiles/Teaching/start-hook.sh index ada48d4..208888b 100755 --- a/user/wm/hyprland/hyprprofiles/profiles/Teaching/start-hook.sh +++ b/user/wm/hyprland/hyprprofiles/profiles/Teaching/start-hook.sh @@ -1,5 +1,4 @@ #!/bin/sh -hyprctl keyword unbind SUPER,S; -hyprctl keyword bind SUPER,S,exec,container-open Teaching; -emacsclient --eval '(org-roam-switch-db "Teaching.p" t)' +hyprctl keyword unbind SUPER,S +hyprctl keyword bind SUPER,S,exec,container-open Teaching diff --git a/user/wm/hyprland/hyprprofiles/profiles/Tech/start-hook.sh b/user/wm/hyprland/hyprprofiles/profiles/Tech/start-hook.sh index e79d406..6248d0f 100755 --- a/user/wm/hyprland/hyprprofiles/profiles/Tech/start-hook.sh +++ b/user/wm/hyprland/hyprprofiles/profiles/Tech/start-hook.sh @@ -1,5 +1,4 @@ #!/bin/sh -hyprctl keyword unbind SUPER,S; -hyprctl keyword bind SUPER,S,exec,container-open Tech; -emacsclient --eval '(org-roam-switch-db "Producer.p\/LibrePhoenix.p" t)' +hyprctl keyword unbind SUPER,S +hyprctl keyword bind SUPER,S,exec,container-open Tech diff --git a/user/wm/xmonad/startup.sh b/user/wm/xmonad/startup.sh index 3995843..94e95d7 100755 --- a/user/wm/xmonad/startup.sh +++ b/user/wm/xmonad/startup.sh @@ -10,9 +10,9 @@ killall xmobar killall nm-applet # Launch necessary desktop applications -autorandr; +autorandr picom --animations --animation-window-mass 1 --animation-for-open-window zoom --animation-stiffness 200 --experimental-backends && # requires picom-pijulius -xset r rate 350 50 & + xset r rate 350 50 & setxkbmap -option caps:escape & ~/.fehbg-stylix & ~/.config/xmobar/xmobar-st-check.sh & @@ -21,6 +21,5 @@ alttab -w 1 -t 240x160 -i 64x64 -sc 1 -bg $colorBg -fg $colorFg -frame $colorSec nm-applet & GOMAXPROCS=1 syncthing --no-browser & protonmail-bridge --noninteractive & -emacs --daemon & gnome-keyring-daemon --daemonize --login & gnome-keyring-daemon --start --components=secrets & diff --git a/user/wm/xmonad/xmonad.hs b/user/wm/xmonad/xmonad.hs index db64d50..c711811 100644 --- a/user/wm/xmonad/xmonad.hs +++ b/user/wm/xmonad/xmonad.hs @@ -191,7 +191,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = -- launch a terminal ((modm, xK_Return), spawn $ XMonad.terminal conf), - -- launch emacsclient + -- launch editor ((modm, xK_a), spawn mySpawnEditor), -- launch browser