diff --git a/dots/.config/hypr/hyprland.conf.nix b/dots/.config/hypr/hyprland.conf.nix index fc571e3..ad20077 100644 --- a/dots/.config/hypr/hyprland.conf.nix +++ b/dots/.config/hypr/hyprland.conf.nix @@ -275,13 +275,13 @@ in { allow_session_lock_restore = ${boolToString hypr.misc.allowSessionLockRestore} background_color = ${toString hypr.misc.backgroundColor} close_special_on_empty = ${boolToString hypr.misc.closeSpecialOnEmpty} - #on_focus_under_fullscreen = ${toString hypr.misc.onFocusUnderFullscreen} + new_window_takes_over_fullscreen = ${toString hypr.misc.newWindowTakesOverFullscreen} exit_window_retains_fullscreen = ${boolToString hypr.misc.exitWindowRetainsFullscreen} initial_workspace_tracking = ${toString hypr.misc.initialWorkspaceTracking} middle_click_paste = ${boolToString hypr.misc.middleClickPaste} render_unfocused_fps = ${toString hypr.misc.renderUnfocusedFps} disable_xdg_env_checks = ${boolToString hypr.misc.disableXdgEnvChecks} - disable_hyprland_qtutils_check = ${boolToString hypr.misc.disableHyprlandQtutilsCheck} + disable_hyprland_guiutils_check = ${boolToString hypr.misc.disableHyprlandGuiUtilsCheck} lockdead_screen_delay = ${toString hypr.misc.lockdeadScreenDelay} enable_anr_dialog = ${boolToString hypr.misc.enableAnrDialog} anr_missed_pings = ${toString hypr.misc.anrMissedPings} diff --git a/flake.lock b/flake.lock index 10acabe..b1dd779 100644 --- a/flake.lock +++ b/flake.lock @@ -73,32 +73,32 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764398914, + "narHash": "sha256-YPrpwlVQidzQlMh0OnquaJR+58rKe9YNnuRis293Ilo=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "d0c5fdc48db6f19471b8adc954eca09194e68036", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1763334038, - "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", + "lastModified": 1764406085, + "narHash": "sha256-CYbMp8hwuOf4umokSNp+t1s4Hjd4vxXq4S5CD+xvgNs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", + "rev": "9561691c9f450fad7c3526916e1c4f44be0d1192", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 84518c3..e2dcfa1 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,9 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/lib/hyprland/standard-options.nix b/lib/hyprland/standard-options.nix index 22352ed..05b3827 100644 --- a/lib/hyprland/standard-options.nix +++ b/lib/hyprland/standard-options.nix @@ -1,7 +1,7 @@ {lib, ...}: let inherit (lib) mkOption types; - # v0.52.0 + # v0.52.1 vec2 = types.submodule { options = { x = mkOption {type = types.int;}; @@ -1064,7 +1064,7 @@ in { type = types.bool; default = true; }; - onFocusUnderFullscreen = mkOption { + newWindowTakesOverFullscreen = mkOption { description = "if there is a fullscreen or maximized window, decide whether a tiled window requested to focus should replace it, stay behind or disable the fullscreen/maximized state. 0 - ignore focus request (keep focus on fullscreen window), 1 - takes over, 2 - unfullscreen/unmaximize [0/1/2]"; type = types.ints.between 0 2; default = 2; @@ -1094,7 +1094,7 @@ in { type = types.bool; default = false; }; - disableHyprlandQtutilsCheck = mkOption { + disableHyprlandGuiUtilsCheck = mkOption { description = "disable the warning if hyprland-qtutils is not installed"; type = types.bool; default = false; diff --git a/modules/apps/visual/default.nix b/modules/apps/visual/default.nix index 269c132..dbdf7fd 100644 --- a/modules/apps/visual/default.nix +++ b/modules/apps/visual/default.nix @@ -27,7 +27,7 @@ in { }; environment.systemPackages = with pkgs; [ - bitwarden + bitwarden-desktop blender gnome-calculator inkscape diff --git a/modules/boot/greeter/greetd.nix b/modules/boot/greeter/greetd.nix index 5bd3a40..535e95f 100644 --- a/modules/boot/greeter/greetd.nix +++ b/modules/boot/greeter/greetd.nix @@ -17,7 +17,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - greetd.tuigreet + tuigreet ]; services.greetd = { @@ -25,7 +25,7 @@ in { settings = { default_session = { user = homeCfg.username; - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session --greeting 'Please authenticate to continue' --asterisks --asterisks-char '*' --theme 'border=74;text=cyan;prompt=green;time=cyan;action=cyan;button=cyan;container=black;input=238' --cmd ${cfg.session}"; + command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --remember-session --greeting 'Please authenticate to continue' --asterisks --asterisks-char '*' --theme 'border=74;text=cyan;prompt=green;time=cyan;action=cyan;button=cyan;container=black;input=238' --cmd ${cfg.session}"; }; }; }; diff --git a/modules/network/syncthing.nix b/modules/network/syncthing.nix index 2e58f1f..fb30c75 100644 --- a/modules/network/syncthing.nix +++ b/modules/network/syncthing.nix @@ -57,7 +57,13 @@ in { id = "programmingFolder"; path = "/home/${username}/Programming"; devices = ["artemis" "terra" "solis"]; - # TODO 25.11 add ignore + ignorePatterns = [ + "node_modules" + ".venv" + "venv" + "dist-newstyle" + "constipated-koala/storage" + ]; }; }; }; diff --git a/modules/users/default.nix b/modules/users/default.nix index b87ffcd..607f935 100644 --- a/modules/users/default.nix +++ b/modules/users/default.nix @@ -31,15 +31,17 @@ in { gh.enable = true; git = { - extraConfig = { + enable = true; + settings = { init = { defaultBranch = "main"; }; - }; - enable = true; - userName = "KoenDR06"; - userEmail = "koen.de.ruiter@hotmail.com"; + user = { + name = "KoenDR06"; + email = "koen.de.ruiter@hotmail.com"; + }; + }; }; }; }; diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix index b4df6d3..9b2b3a5 100644 --- a/modules/wm/hyprland/default.nix +++ b/modules/wm/hyprland/default.nix @@ -116,7 +116,7 @@ in { misc = { forceDefaultWallpaper = 0; keyPressEnablesDPMS = true; - onFocusUnderFullscreen = 2; + newWindowTakesOverFullscreen = 2; enableSwallow = true; swallowRegex = "^kitty$"; @@ -183,8 +183,8 @@ in { }; }; - services.logind.extraConfig = '' - HandlePowerKey=ignore - ''; + services.logind.settings.Login = { + HandlePowerKey = "ignore"; + }; }; }