From ca5ee9ed208c851e4d5adb8b1bd91248967d72f4 Mon Sep 17 00:00:00 2001 From: Riley Apeldoorn Date: Fri, 22 Dec 2023 12:26:06 +0100 Subject: [PATCH] Fix swaylock on work machine --- flake.nix | 3 ++- shared/home/gui/sway.nix | 3 ++- shared/home/programs.nix | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index d7bee9e..0bd58a2 100644 --- a/flake.nix +++ b/flake.nix @@ -66,9 +66,10 @@ # Configurations for non-NixOS machines. homeConfigurations = with home-manager.lib; { "dev-lt-63" = homeManagerConfiguration { - extraSpecialArgs = args // { age = args.config.age; }; + extraSpecialArgs = args; pkgs = import nixpkgs { system = "x86_64-linux"; }; modules = [ + agenix.homeManagerModules.default ./system/dev-lt-63/home.nix ./shared/home ]; diff --git a/shared/home/gui/sway.nix b/shared/home/gui/sway.nix index 0fe9462..ae7140f 100644 --- a/shared/home/gui/sway.nix +++ b/shared/home/gui/sway.nix @@ -57,6 +57,7 @@ in with lib; { extraConfig = '' bindsym --release ${mod}+d exec ${sc}/bin/sc + exec "${(import nixpkgs-latest {}).google-chrome}/bin/google-chrome-stable --ozone-platform-hint=auto --enable-features=VaapiVideoDecoder,VaapiVideoEncoder --app=https://calendar.google.com" ''; config = rec { @@ -114,7 +115,7 @@ in with lib; { "${mod}+Alt+a" = "layout toggle stacking splitv"; "${mod}+Alt+s" = "layout toggle tabbed splith"; - "${mod}+Escape" = "exec ${pkgs.swaylock}/bin/swaylock"; + "${mod}+Escape" = if config.isNixos then "exec ${pkgs.swaylock}/bin/swaylock" else "exec swaylock"; "${mod}+Space" = "exec pkill -SIGUSR1 waybar"; "${mod}+Return" = "exec ${terminal}"; diff --git a/shared/home/programs.nix b/shared/home/programs.nix index 6b8c919..5a11b44 100644 --- a/shared/home/programs.nix +++ b/shared/home/programs.nix @@ -3,7 +3,7 @@ # needed to do extra configuration for example, consider putting # the affected programs in their own modules. -{ pkgs, age, ... }: { +{ pkgs, ... }: { home.packages = (with pkgs; [ eva @@ -45,6 +45,4 @@ }; }; - xdg.configFile."deemix/.arl".source = age.secrets."arl".path; - }