From 2bbce7ec6c5fb9a6c26e697dffbd1f1e26297d77 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Wed, 13 Mar 2024 22:49:01 +0000 Subject: [PATCH] idk --- hosts/common/default.nix | 1 - hosts/sidon/configuration.nix | 10 ++++++++++ users/configs/desktop/hyprland/default.nix | 3 ++- users/configs/desktop/hyprland/sidon.conf | 5 ++++- users/configs/desktop/waybar/config.json | 4 ++++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/hosts/common/default.nix b/hosts/common/default.nix index c68d6f7..159902d 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -24,7 +24,6 @@ in { # Use the systemd-boot EFI boot loader. boot.kernelPackages = pkgs.linuxPackages_latest; - boot.loader.systemd-boot.enable = lib.mkDefault true; boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; # nix flakes compatibility diff --git a/hosts/sidon/configuration.nix b/hosts/sidon/configuration.nix index 805bb0a..2d96e80 100644 --- a/hosts/sidon/configuration.nix +++ b/hosts/sidon/configuration.nix @@ -25,6 +25,16 @@ ''; }; + boot.loader.systemd-boot.enable = false; + boot.loader.grub = { + enable = true; + device = "nodev"; + useOSProber = true; + efiSupport = true; + }; + + time.hardwareClockInLocalTime = true; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; security.pam.u2f = { diff --git a/users/configs/desktop/hyprland/default.nix b/users/configs/desktop/hyprland/default.nix index e4a31cb..9dd2b06 100644 --- a/users/configs/desktop/hyprland/default.nix +++ b/users/configs/desktop/hyprland/default.nix @@ -144,7 +144,6 @@ in { sensitivity = -0.5 } - misc { disable_hyprland_logo = true } @@ -165,6 +164,8 @@ in { bind = $mainMod, D, exec, tofi-drun --drun-launch=true bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" + bind = $mainMod SHIFT, P, exit + # Move focus with mainMod + vim keys bind = $mainMod, H, movefocus, l bind = $mainMod, L, movefocus, r diff --git a/users/configs/desktop/hyprland/sidon.conf b/users/configs/desktop/hyprland/sidon.conf index 1e26a0a..db27764 100644 --- a/users/configs/desktop/hyprland/sidon.conf +++ b/users/configs/desktop/hyprland/sidon.conf @@ -1,4 +1,7 @@ -monitor=,preferred,auto,1.25 +monitor=HDMI-A-2,3840x2160@60.0,3072x0,1.25 +monitor=DP-2,3840x2160@59.997002,0x0,1.25 + +workspace=1,monitor:DP-2 $mainMod = CTRL + SHIFT + ALT diff --git a/users/configs/desktop/waybar/config.json b/users/configs/desktop/waybar/config.json index da4cdda..91fcb01 100644 --- a/users/configs/desktop/waybar/config.json +++ b/users/configs/desktop/waybar/config.json @@ -55,6 +55,10 @@ "urgent": "", "active": "", "default": "" + }, + "persistent-workspaces": { + "DP-2": ["sidebar"], + "HDMI-A-2": [2,3,4,5,6] } }, "clock": {