diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix index 9e5001e..cba0846 100644 --- a/hosts/MONSTER/default.nix +++ b/hosts/MONSTER/default.nix @@ -68,6 +68,7 @@ hid-fanatecff.enable = true; enableAllFirmware = true; + sane.enable = true; bluetooth = { enable = true; powerOnBoot = true; @@ -98,6 +99,8 @@ users.users.${username} = { isNormalUser = true; extraGroups = [ + "scanner" + "lp" "networkmanager" "audio" "video" diff --git a/modules/home-manager/desktops/hyprland/default.nix b/modules/home-manager/desktops/hyprland/default.nix index 8b4bf0b..1ef72d3 100644 --- a/modules/home-manager/desktops/hyprland/default.nix +++ b/modules/home-manager/desktops/hyprland/default.nix @@ -24,16 +24,6 @@ "gnome-keyring-daemon --start --components=secrets" "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" ]; - general = { - layout = "master"; - resize_on_border = true; - }; - master = { - orientation = "center"; - new_is_master = true; - always_center_master = true; - mfact = 0.4; - }; input = { accel_profile = "flat"; kb_layout = "cc1-thea"; @@ -73,14 +63,12 @@ "float,class:^(zenity)$" ]; - xwayland.force_zero_scaling = true; misc = { layers_hog_keyboard_focus = false; disable_splash_rendering = true; disable_hyprland_logo = true; background_color = "rgb(000000)"; force_default_wallpaper = 0; - vrr = 2; }; layerrule = [ "blur, anyrun" diff --git a/modules/home-manager/packages/default.nix b/modules/home-manager/packages/default.nix index 22cab0f..bdebee1 100644 --- a/modules/home-manager/packages/default.nix +++ b/modules/home-manager/packages/default.nix @@ -7,8 +7,6 @@ lorri vulnix - matugen # TODO - # browsers chromium brave @@ -42,6 +40,8 @@ audacity pinta kdePackages.kdenlive + losslesscut-bin + shotcut blender-hip # development diff --git a/modules/home-manager/programs/git.nix b/modules/home-manager/programs/git.nix index 15a608b..f6632d9 100644 --- a/modules/home-manager/programs/git.nix +++ b/modules/home-manager/programs/git.nix @@ -8,6 +8,7 @@ }; extraConfig = { pull.rebase = true; + init.defaultBranch = "main"; merge = { tool = "nvim-mergetool"; conflictstyle = "diff3"; diff --git a/modules/nixos/hardware/fv43u.nix b/modules/nixos/hardware/fv43u.nix index e30d2d6..ee4e071 100644 --- a/modules/nixos/hardware/fv43u.nix +++ b/modules/nixos/hardware/fv43u.nix @@ -19,10 +19,21 @@ in hardware.gbmonctl.enable = true; boot.kernelParams = [ "video=3840x2160@144" ]; - home-manager.users.${username}.wayland.windowManager.hyprland.settings.monitor = [ - "DP-1,highrr,0x0,1" - "DP-1,addreserved,300,0,0,0" - ]; + home-manager.users.${username}.wayland.windowManager.hyprland.settings = { + general.layout = "master"; + master = { + orientation = "center"; + new_is_master = true; + always_center_master = true; + mfact = 0.4; + }; + monitor = [ + "DP-1,highrr,0x0,1" + "DP-1,addreserved,340,0,0,0" + ]; + xwayland.force_zero_scaling = true; + misc.vrr = 2; # VA suffers from VRR flicker + }; programs.steam.gamescopeSession = { env = {