This commit is contained in:
Sam 2024-06-13 14:36:34 +01:00
parent 3eb837c371
commit 108f9b7028
5 changed files with 49 additions and 5 deletions

View File

@ -11,7 +11,6 @@
./common/optional/git.nix
./common/optional/sops.nix
./common/optional/syncthing.nix
./common/optional/desktop/hyprland
];

View File

@ -1,4 +1,4 @@
{ pkgs, outputs, ... }:
{ pkgs, outputs, config, ... }:
{
home.username = "sam";
@ -54,6 +54,27 @@
qt.style.name = "adwaita-dark";
qt.style.package = pkgs.adwaita-qt;
# TODO configure x11 to look in .config/x11
#home.file."${config.xdg.configHome}/x11/xinitrc" = {
home.file.".xinitrc" = {
recursive = true;
text = ''
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
eval $(dbus-launch --exit-with-session --sh-syntax)
fi
systemctl --user import-environment DISPLAY XAUTHORITY
if command -v dbus-update-activation-environment >/dev/null 2>&1; then
dbus-update-activation-environment DISPLAY XAUTHORITY
fi
export XSESSION_PID="$$"
exec dwm
'';
};
home.sessionVariables = {
EDITOR = "nvim";
TERMINAL = "alacritty";

View File

@ -0,0 +1,25 @@
{ pkgs, ... }:
{
services = {
libinput.enable = true;
xserver = {
enable = true;
xkb.layout = "gb";
displayManager.startx.enable = true;
autorun = false;
windowManager.dwm = {
enable = true;
package = pkgs.dwm.overrideAttrs {
src = pkgs.fetchFromGitea {
domain = "git.bitlab21.com";
owner = "sam";
repo = "dwm";
rev = "011c32e72e45b124ad6ab5c8185945cd2e637270";
sha256 = "sha256-rFiGTynYPEDav7ydokkRAHpT2zPFtz+Hn9lZbufEOEg=";
};
};
};
};
};
}

View File

@ -1,4 +1,4 @@
{ inputs, config, lib, pkgs, outputs,... }:
{ inputs, config, lib, pkgs, outputs, ... }:
let
# Disko setup
fsType = "btrfs"; # one of ext4 or btrfs. Use btrfs if using impermanence
@ -28,9 +28,8 @@ in
# Import optional options
../common/optional/persistence.nix
../common/optional/pipewire.nix
../common/optional/hyprland.nix
../common/optional/displayManager/sddm.nix
../common/optional/openssh.nix
../common/optional/dwm.nix
];