Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos

flake.lock

@@ -1154,16 +1154,16 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1704290814,
-        "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
+        "lastModified": 1718437845,
+        "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
+        "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.05",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -15,7 +15,7 @@
     master.url = "github:nixos/nixpkgs";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
-    stable.url = "github:nixos/nixpkgs/nixos-23.05";
+    stable.url = "github:nixos/nixpkgs/nixos-24.05";
     nur.url = "github:nix-community/NUR";
     nix-index-database.url = "github:Mic92/nix-index-database";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";

modules/programs/hyprland/_config.nix

@@ -47,11 +47,13 @@ in
       col.active_border = rgba(1affffee)
       col.inactive_border = rgba(595959aa)
 
-      cursor_inactive_timeout = 1
-
       layout = dwindle
   }
 
+  cursor {
+      inactive_timeout = 1
+  }
+
   decoration {
       # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
@@ -161,7 +163,8 @@ in
   bind = $mainMod       , D      , exec , hyprctl keyword general:layout dwindle
   bind = $mainMod       , M      , exec , hyprctl keyword general:layout master
   bind = $mainMod       , R      , exec , rofi -show combi
-  bind = $mainMod       , RETURN , exec , systemctl --user is-active --quiet foot && footclient --no-wait || foot
+  # bind = $mainMod       , RETURN , exec , systemctl --user is-active --quiet foot && footclient --no-wait || foot
+  bind = $mainMod       , RETURN , exec , kitty
 
   # XF86 keys
   binde = , XF86AudioLowerVolume  , exec , pamixer -d 5
@@ -224,6 +227,10 @@ in
   # Toggle waybar
   bindr = $mainMod , SUPER_L , exec , pkill -USR1 waybar
 
+  # Lid open/close
+  bindl=,switch:on:Lid Switch,exec,monitors="$(hyprctl monitors | grep -c '^Monitor')" && hyprctl keyword monitor "eDP-1, disable" && [ "$monitors" = 1 ] && loginctl lock-session
+  bindl=,switch:off:Lid Switch,exec, hyprctl keyword monitor "eDP-1, prefered, auto"
+
   # Extra Config
   ${cfg.extraConfig}
 ''

modules/programs/hyprland/default.nix

@@ -48,7 +48,8 @@ in
       ];
       programs = {
         wallpaper.enable = true;
-        foot.enable = true;
+        # foot.enable = true;
+        kitty.enable = true;
         rofi.enable = true;
       };
       wallpapers.enable = true;

modules/programs/jetbrains/ideavimrc

@@ -4,12 +4,15 @@ let mapleader=" "
 """ Plugins  --------------------------------
 set surround
 set commentary
+set NERDTree
 
 """ Common settings -------------------------
 set showmode
 set so=5
 set incsearch
 set nu
+set relativenumber
+set number
 
 """ Which-Key
 set which-key
@@ -36,6 +39,8 @@ let g:WhichKeyDesc_extract_field = '<leader>ef Extract field'
 map <leader>ef <Action>(IntroduceField)
 let g:WhichKeyDesc_extract_parameter = '<leader>ep Extract parameter'
 map <leader>ep <Action>(IntroduceParameter)
+let g:WhichKeyDesc_extract_method = '<leader>em Extract method'
+map <leader>em <Action>(ExtractMethod)
 
 let g:WhichKeyDesc_rename = '<leader>r Rename'
 map <leader>r <Action>(RenameElement)
@@ -46,8 +51,10 @@ map [b <Action>(PreviousTab)
 let g:WhichKeyDesc_next_buffer = ']b Next buffer'
 map ]b <Action>(NextTab)
 
-let g:WhichKeyDesc_prev_error = 'gI Goto Implementation'
+let g:WhichKeyDesc_goto_impl = 'gI Goto implementation'
 map gI <Action>(GotoImplementation)
+let g:WhichKeyDesc_goto_type = 'gt Goto type declaration'
+map gt <Action>(GotoTypeDeclaration)
 
 "" Other
 let g:WhichKeyDesc_terminal = '<leader>t Terminal'

modules/programs/python.nix

@@ -10,7 +10,7 @@ let
 
   cfg = config.my.programs.python;
 
-  pythonVersions = map (version: "3${toString version}") (range 8 11);
+  pythonVersions = map (version: "3${toString version}") (range 8 13);
   enabledVersions = filterAttrs (_: value: value.enable) cfg.versions;
 
   pythonPackages = version: attrNames pkgs."python${version}Packages";