update: update from 23.11 to 24.05

savalet · Jun 27, 2024 · a5809a9 · a5809a9
1 parent 72573b5
commit a5809a9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,6 +50,7 @@ @@
           teams-for-linux
           google-chrome
           prismlauncher
+          screen
         ];
       };
@@ Expand Down @@