mirror of
https://github.com/Swarsel/.dotfiles.git
synced 2025-12-06 09:07:21 +01:00
fix: small env related inaccuracies
Some checks failed
Flake check / Check flake (push) Has been cancelled
Some checks failed
Flake check / Check flake (push) Has been cancelled
This commit is contained in:
parent
5229a4c480
commit
6ea3851e72
18 changed files with 1415 additions and 1310 deletions
|
|
@ -7,15 +7,15 @@
|
|||
wordlist.enable = true;
|
||||
sessionVariables = {
|
||||
NIXOS_OZONE_WL = "1";
|
||||
SWARSEL_LO_RES = config.swarselsystems.lowResolution;
|
||||
SWARSEL_HI_RES = config.swarselsystems.highResolution;
|
||||
GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with pkgs.gst_all_1; [
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
gst-plugins-ugly
|
||||
gst-libav
|
||||
]);
|
||||
} // (lib.optionalAttrs (!config.swarselsystems.isPublic) {
|
||||
GITHUB_NOTIFICATION_TOKEN_PATH = config.sops.secrets.github-notifications-token.path;
|
||||
});
|
||||
} // (lib.optionalAttrs (!config.swarselsystems.isPublic) { });
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
initial_session.command = "sway";
|
||||
# initial_session.command = "sway";
|
||||
initial_session.command = "uwsm start -- sway-uwsm.desktop";
|
||||
default_session.command = ''
|
||||
${pkgs.tuigreet}/bin/tuigreet \
|
||||
--time \
|
||||
|
|
@ -16,8 +17,8 @@
|
|||
};
|
||||
};
|
||||
|
||||
environment.etc."greetd/environments".text = ''
|
||||
sway
|
||||
'';
|
||||
# environment.etc."greetd/environments".text = ''
|
||||
# sway
|
||||
# '';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,9 +59,9 @@ in
|
|||
Settings = {
|
||||
AutoConnect = true;
|
||||
};
|
||||
DriverQuirks = {
|
||||
UseDefaultInterface = true;
|
||||
};
|
||||
# DriverQuirks = {
|
||||
# UseDefaultInterface = true;
|
||||
# };
|
||||
};
|
||||
};
|
||||
nftables.enable = lib.mkDefault true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
let
|
||||
inherit (config.swarselsystems) mainUser;
|
||||
in
|
||||
{
|
||||
options.swarselmodules.sway = lib.mkEnableOption "sway config";
|
||||
config = lib.mkIf config.swarselmodules.sway {
|
||||
|
|
@ -10,15 +13,7 @@
|
|||
gtk = true;
|
||||
};
|
||||
|
||||
extraSessionCommands = ''
|
||||
export XDG_SESSION_DESKTOP=sway
|
||||
export SDL_VIDEODRIVER=wayland
|
||||
export QT_QPA_PLATFORM=wayland-egl
|
||||
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
||||
export QT_QPA_PLATFORM_PLUGIN_PATH="${pkgs.libsForQt5.qt5.qtbase.bin}/lib/qt-${pkgs.libsForQt5.qt5.qtbase.version}/plugins";
|
||||
export MOZ_ENABLE_WAYLAND=1
|
||||
export MOZ_DISABLE_RDD_SANDBOX=1
|
||||
'';
|
||||
inherit (config.home-manager.users.${mainUser}.wayland.windowManager.sway) extraSessionCommands;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
19
modules/nixos/client/uwsm.nix
Normal file
19
modules/nixos/client/uwsm.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ lib, config, ... }:
|
||||
let
|
||||
moduleName = "uwsm";
|
||||
in
|
||||
{
|
||||
options.swarselmodules.${moduleName} = lib.mkEnableOption "${moduleName} settings";
|
||||
config = lib.mkIf config.swarselmodules.${moduleName} {
|
||||
programs.uwsm = {
|
||||
enable = true;
|
||||
waylandCompositors = {
|
||||
sway = {
|
||||
prettyName = "Sway";
|
||||
comment = "Sway compositor managed by UWSM";
|
||||
binPath = "/run/current-system/sw/bin/sway";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -83,18 +83,6 @@ in
|
|||
};
|
||||
|
||||
programs = {
|
||||
zsh.shellInit = ''
|
||||
export VSPHERE_USER="$(cat ${config.sops.secrets.vcuser.path})"
|
||||
export VSPHERE_PW="$(cat ${config.sops.secrets.vcpw.path})"
|
||||
export GOVC_USERNAME="$(cat ${config.sops.secrets.govcuser.path})"
|
||||
export GOVC_PASSWORD="$(cat ${config.sops.secrets.govcpw.path})"
|
||||
export GOVC_URL="$(cat ${config.sops.secrets.govcurl.path})"
|
||||
export GOVC_DATACENTER="$(cat ${config.sops.secrets.govcdc.path})"
|
||||
export GOVC_DATASTORE="$(cat ${config.sops.secrets.govcds.path})"
|
||||
export GOVC_HOST="$(cat ${config.sops.secrets.govchost.path})"
|
||||
export GOVC_RESOURCE_POOL="$(cat ${config.sops.secrets.govcpool.path})"
|
||||
export GOVC_NETWORK="$(cat ${config.sops.secrets.govcnetwork.path})"
|
||||
'';
|
||||
|
||||
browserpass.enable = true;
|
||||
_1password.enable = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue