diff --git a/flake.lock b/flake.lock index 988ebdf..86634c1 100644 --- a/flake.lock +++ b/flake.lock @@ -7,32 +7,32 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1716061101, - "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", + "lastModified": 1719426051, + "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", + "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9094842..e04c316 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "savalet's dotfiles"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; - home-manager.url = "github:nix-community/home-manager/release-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/default.nix b/home/default.nix index 3361b06..1291f62 100644 --- a/home/default.nix +++ b/home/default.nix @@ -50,6 +50,7 @@ teams-for-linux google-chrome prismlauncher + screen ]; }; diff --git a/home/hyprland/src/hyprland.conf b/home/hyprland/src/hyprland.conf index 1086c5b..cf2877b 100644 --- a/home/hyprland/src/hyprland.conf +++ b/home/hyprland/src/hyprland.conf @@ -55,11 +55,7 @@ general { border_size = 2 col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg col.inactive_border = rgba(595959aa) - layout = dwindle - - no_cursor_warps = true - } decoration { @@ -113,7 +109,6 @@ dwindle { } master { - new_is_master = true orientation = right mfact = 0.55 new_on_top = true diff --git a/pluton/default.nix b/pluton/default.nix index 35ab260..b19e00d 100644 --- a/pluton/default.nix +++ b/pluton/default.nix @@ -9,7 +9,6 @@ services.pcscd.enable = true; programs.gnupg.agent = { enable = true; - pinentryFlavor = "curses"; enableSSHSupport = true; }; @@ -67,8 +66,8 @@ # Configure keymap in X11 services.xserver = { - layout = "us"; - xkbVariant = "alt-intl"; + xkb.layout = "us"; + xkb.variant = "alt-intl"; }; # Configure console keymap