blue/nixconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove hyprland extraConfig option and move all to nixified settings option

Browse source
This commit is contained in:
Gabriella Bere 2024-09-01 11:27:38 +01:00
parent 11cb74ce0d
commit 667d5fd2eb
5 changed files with 55 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
home-manager/home.nix
View file

@ -18,8 +18,8 @@
# States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed # States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed
home.stateVersion = "24.05"; home.stateVersion = "24.05";
services.pass-secret-service.enable = true; # for use with protonmail-bridge # services.pass-secret-service.enable = true; # for use with protonmail-bridge
# services.gnome-keyring.enable = true; # should be easier for protonmail-bridge services.gnome-keyring.enable = true; # should be easier for protonmail-bridge
# Cursor configuration that I hope to one day understand, currently has a scaling issue but thats probably my fault # Cursor configuration that I hope to one day understand, currently has a scaling issue but thats probably my fault
home.pointerCursor = home.pointerCursor =

21
home-manager/hyprland.nix
View file

@ -5,20 +5,18 @@
enable = true; enable = true;
package = pkgs.hyprland; package = pkgs.hyprland;
xwayland.enable = true; xwayland.enable = true;
# Autostart using systemd # Autostart using systemd
systemd.enable = true; systemd.enable = true;
extraConfig = '' settings = {
exec-once = waybar
exec-once = swaync monitor =
[
"eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor
"DP-3, 1920x1080@119.98, -1280x-1080, auto" # left external monitor
"DP-2, 1920x1080@119.98, 640x-1080, auto" # right external monitor
];
# Monitor settings
monitor = eDP-2, 2560x1600@165, 0x0, auto # main laptop monitor
monitor = DP-3, 1920x1080@119.98, -1280x-1080, auto # left external monitor
monitor = DP-2, 1920x1080@119.98, 640x-1080, auto # right external monitor
'';
};
# Hyprland configuration
wayland.windowManager.hyprland.settings = {
"$mod" = "SUPER"; "$mod" = "SUPER";
input = { kb_layout = "gb"; }; input = { kb_layout = "gb"; };
bindm = [ bindm = [
@ -62,4 +60,5 @@
force_zero_scaling = true; force_zero_scaling = true;
}; };
}; };
};
} }

1
home-manager/swaync.nix
View file

@ -1,5 +1,6 @@
{config, pkgs, ...}: {config, pkgs, ...}:
{ {
# Enables swaync and automatically includes systemd user service to auto-start on login, this cannot be disabled so I am using it instead of hyprland exec-once otherwise home-manager complains that the service failed to start
services.swaync = { services.swaync = {
enable = true; enable = true;
style = '' style = ''

2
home-manager/waybar.nix
View file

@ -2,7 +2,7 @@
{ {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
systemd.enable = false; systemd.enable = true; # using these instead of exec-once beacuse SOME packages (swaync) dont let you disable them
settings = { settings = {
mainBar = { mainBar = {
layer = "top"; layer = "top";

4
hosts/gabbielaptop/configuration.nix
View file

@ -138,9 +138,11 @@
programs.steam.remotePlay.openFirewall = true; programs.steam.remotePlay.openFirewall = true;
# This desperately needs moving to home.nix but the home-manager module is not yet available # This desperately needs moving to home.nix but the home-manager module is not yet available
services.protonmail-bridge = { services.protonmail-bridge = {
enable = true; enable = true;
path = [ pkgs.pass-secret-service ] path = [ pkgs.gnome-keyring ];
logLevel = "debug";
}; };
# protonmail daemon config # protonmail daemon config