diff --git a/flake.lock b/flake.lock index d0c9d44..02c1fe8 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1745352209, - "narHash": "sha256-u3vJEzi6zxgG59KXjMR5koERsdKT5nd1OEKCpr6zgn8=", + "lastModified": 1745598511, + "narHash": "sha256-GWYB7PngGwTJrp7gr0w6E5nnvwiblPvN2kjRCQw3ZEg=", "owner": "catppuccin", "repo": "nix", - "rev": "6268e50dbb0ac9375e110560395b5dc199e4dfb8", + "rev": "199cb288a85b15ed203089804c024ae5b3eacd7c", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1745557122, + "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745234285, - "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745279238, - "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", + "lastModified": 1748810746, + "narHash": "sha256-1na8blYvU1F6HLwx/aFjrhUqpqZ0SCsnqqW9n2vXvok=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", + "rev": "78d9f40fd6941a1543ffc3ed358e19c69961d3c1", "type": "github" }, "original": { @@ -110,11 +110,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1745234285, - "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745419524, - "narHash": "sha256-oDRzqjH44hOEvJAyA1A+pCp01+rkjEvW1+AXCCvEYNE=", + "lastModified": 1745869500, + "narHash": "sha256-F32jQbtWw73KSWaXBktWe9Z7dMWXeBd65j+X+dhjcQM=", "owner": "nix-community", "repo": "NUR", - "rev": "a5724250ee4c962f1fbfe992061e296955277961", + "rev": "11d18746af0de63402502d986bbb0f68a724e9c0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 64d1036..e57bd87 100644 --- a/flake.nix +++ b/flake.nix @@ -72,7 +72,7 @@ home-manager.users.nate = { imports = [ ./nate-work/modules/home-manager/home.nix - catppuccin.homeManagerModules.catppuccin + catppuccin.homeModules.catppuccin ]; }; home-manager.extraSpecialArgs = { diff --git a/nate-work/dotfiles/helix/config.toml b/nate-work/dotfiles/helix/config.toml index 498f7c1..cee2413 100644 --- a/nate-work/dotfiles/helix/config.toml +++ b/nate-work/dotfiles/helix/config.toml @@ -8,6 +8,7 @@ n = "move_char_left" # Maps the 'a' key to the move_char_left command i = "move_visual_line_down" e = "move_visual_line_up" o = "move_char_right" +"S-tab" = "jump_backward" I = "page_down" E = "page_up" diff --git a/nate-work/modules/hypr/hypr_home.nix b/nate-work/modules/hypr/hypr_home.nix index e1ecc07..59ff37a 100644 --- a/nate-work/modules/hypr/hypr_home.nix +++ b/nate-work/modules/hypr/hypr_home.nix @@ -189,15 +189,27 @@ in # allow_dumb_copy = true; }; misc = { - vfr = true; + # Revert to true when nvidia damage tracking works + vfr = 0; force_default_wallpaper = 0; disable_hyprland_logo = true; }; render = { - explicit_sync = 1; - explicit_sync_kms = 1; + # Revert to ex_sync = 1 and remove sync_kms when nvidia is fixed + explicit_sync = 2; + explicit_sync_kms = 0; direct_scanout = "no"; }; + ## + ## delete when nvidia damage tracking works (debug & opengl) + ## + debug = { + damage_tracking = 0; + }; + opengl = { + nvidia_anti_flicker = 0; + # force_introspection = 2; + }; }; wayland.windowManager.hyprland.systemd.variables = ["--all"]; diff --git a/nate-work/nixos/hardware-configuration.nix b/nate-work/nixos/hardware-configuration.nix index f7be557..669d98f 100644 --- a/nate-work/nixos/hardware-configuration.nix +++ b/nate-work/nixos/hardware-configuration.nix @@ -10,7 +10,7 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; - boot.kernelParams = [ "acpi_backlight=native" ]; + boot.kernelParams = [ "acpi_backlight=native" "snd_seq_midi.output_buffer_size=131072" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ];