From f60c1aaee8f540b2980a32818e2751ccb76cfd7f Mon Sep 17 00:00:00 2001 From: Emmet Date: Thu, 11 Jul 2024 13:17:03 -0500 Subject: [PATCH 1/2] services.emacs.enable doesn't import $PATH --- user/app/doom-emacs/doom.nix | 2 -- user/app/doom-emacs/doom.org | 2 -- user/wm/hyprland/hyprland.nix | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix index 9f3c384..b1544f4 100644 --- a/user/app/doom-emacs/doom.nix +++ b/user/app/doom-emacs/doom.nix @@ -41,8 +41,6 @@ in # End block }; - services.emacs.enable = true; - home.file.".emacs.d/themes/doom-stylix-theme.el".source = config.lib.stylix.colors { template = builtins.readFile ./themes/doom-stylix-theme.el.mustache; extension = ".el"; diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index d8e25a1..eb51346 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -2118,8 +2118,6 @@ in # End block }; - services.emacs.enable = true; - home.file.".emacs.d/themes/doom-stylix-theme.el".source = config.lib.stylix.colors { template = builtins.readFile ./themes/doom-stylix-theme.el.mustache; extension = ".el"; diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 966d8fe..195f532 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -48,6 +48,7 @@ in exec-once = hyprprofile Default + exec-once = emacs --daemon exec-once = pypr exec-once = ydotoold #exec-once = STEAM_FRAME_FORCE_CLOSE=1 steam -silent From 464b511f233977a95815fc023186689c84ae9a7e Mon Sep 17 00:00:00 2001 From: Emmet Date: Thu, 11 Jul 2024 13:17:30 -0500 Subject: [PATCH 2/2] Various hyprland fixes --- user/wm/hyprland/hyprland.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 195f532..2f42f0b 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -153,7 +153,8 @@ in } } - bind=SUPER,SUPER_L,exec,nwggrid-wrapper + bind=SUPER,code:9,exec,nwggrid-wrapper + bind=SUPER,code:66,exec,nwggrid-wrapper bind=SUPER,SPACE,fullscreen,1 bind=SUPERSHIFT,F,fullscreen,0 bind=SUPER,Y,workspaceopt,allfloat @@ -359,7 +360,7 @@ in misc { disable_hyprland_logo = true - mouse_move_enables_dpms = false + mouse_move_enables_dpms = true } decoration { rounding = 8 @@ -413,8 +414,8 @@ in src = fetchFromGitHub { owner = "hyprland-community"; repo = "pyprland"; - rev = "refs/tags/2.3.8"; - hash = "sha256-0YUI2/gJmBoummiHGpq2p2sT25SwCdnsRwfGK2pcm4s="; + rev = "refs/tags/2.4.0"; + hash = "sha256-jK6ap/beiqAtZXVNqPB3zV8R2Kfc3LhqJBvFlWYIfb4="; }; })) (hyprnome.override (oldAttrs: { @@ -619,6 +620,7 @@ in listener { timeout = 7200 # in seconds on-timeout = systemctl suspend + on-resume = hyprctl dispatch dpms on } ''; home.file.".config/hypr/hyprlock.conf".text = ''