diff --git a/flake.lock b/flake.lock index 80e4922..e9d3426 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749237914, - "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=", + "lastModified": 1750005367, + "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", + "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3", "type": "github" }, "original": { diff --git a/nate-work/modules/home-manager/home.nix b/nate-work/modules/home-manager/home.nix index 64b1a6d..b86083d 100644 --- a/nate-work/modules/home-manager/home.nix +++ b/nate-work/modules/home-manager/home.nix @@ -78,7 +78,10 @@ lsp-ai python3 cmake - + claude-code + # proto + protobuf + protoc-gen-dart # Go stuff go delve @@ -124,6 +127,7 @@ fd fzf lsd + lsof ripgrep tre-command gtop diff --git a/nate-work/modules/hypr/hypr_home.nix b/nate-work/modules/hypr/hypr_home.nix index 59ff37a..4af8133 100644 --- a/nate-work/modules/hypr/hypr_home.nix +++ b/nate-work/modules/hypr/hypr_home.nix @@ -13,7 +13,8 @@ in config = lib.mkIf config.hyprhome.enable { wayland.windowManager.hyprland.enable = true; # enable Hyprland - # wayland.windowManager.hyprland.package = hyprland; # enable Hyprland + # wayland.windowManager.hyprland.package = null; # enable Hyprland + # wayland.windowManager.hyprland.portalPackage = null; # enable Hyprland wayland.windowManager.hyprland.settings = { "$mod" = "Super"; "$terminal" = "ghostty"; @@ -22,6 +23,11 @@ in # Autostart exec-once = [ + ###Start dbus ### + # Starting it early may help with app launch times + "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" + "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" + # "swaylock -C ~/.config/swaylock/boot-config" "swaybg -i ~/.config/hypr/va_background.png" "nwg-panel" @@ -211,6 +217,7 @@ in # force_introspection = 2; }; }; + # import variables wayland.windowManager.hyprland.systemd.variables = ["--all"]; home.pointerCursor = { @@ -254,6 +261,9 @@ in pavucontrol syncthingtray tailscale-systray + # include portals here for flatpak + xdg-desktop-portal-hyprland + xdg-desktop-portal-gtk ] config.hyprhome.homePackages ]; diff --git a/nate-work/modules/hypr/hyprland.nix b/nate-work/modules/hypr/hyprland.nix index 4a59455..3bd8781 100644 --- a/nate-work/modules/hypr/hyprland.nix +++ b/nate-work/modules/hypr/hyprland.nix @@ -21,6 +21,7 @@ in catppuccin.flavor = "macchiato"; catppuccin.accent = "lavender"; programs.hyprland.enable = true; + programs.hyprland.withUWSM = true; # programs.hyprland.package = unstable.hyprland; # programs.hyprland.portalPackage = pkgs.xdg-desktop-portal-hyprland; # programs.steam.enable = true; @@ -68,15 +69,15 @@ in }; xdg.portal = { enable = true; - xdgOpenUsePortal = true; + # wlr.enable = true; config = { - common.default = [ "gtk" ]; - hyprland.default = [ "hyprland" "gtk" ]; + common = { + default = [ "hyprland" "gtk" ]; + }; }; extraPortals = with pkgs; [ xdg-desktop-portal-hyprland xdg-desktop-portal-gtk - xdg-desktop-portal-wlr ]; };