diff --git a/flake.lock b/flake.lock index d1d16b2..dfc747e 100644 --- a/flake.lock +++ b/flake.lock @@ -7,32 +7,32 @@ ] }, "locked": { - "lastModified": 1779506708, - "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", + "lastModified": 1779726825, + "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", + "rev": "b179bde238977f7d4454fc770b1a727eaf55111c", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1779102034, - "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=", + "lastModified": 1779971959, + "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433", + "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9ce8384..014dfb2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "System Configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-26.05"; home-manager = { - url = "github:nix-community/home-manager?ref=release-25.11"; + url = "github:nix-community/home-manager?ref=release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { diff --git a/home-manager/features/development/typescript.nix b/home-manager/features/development/typescript.nix index 16a9cbf..38e2451 100644 --- a/home-manager/features/development/typescript.nix +++ b/home-manager/features/development/typescript.nix @@ -1,9 +1,9 @@ { pkgs, ... }: { home.packages = with pkgs; [ - vtsls # Language Server + vtsls # Language Server eslint # Linter - nodePackages.prettier # Formatter + prettier # Formatter tailwindcss-language-server # Language server for tailwind CSS ]; } diff --git a/home-manager/features/eww/default.nix b/home-manager/features/eww/default.nix index f80bd60..b624b02 100644 --- a/home-manager/features/eww/default.nix +++ b/home-manager/features/eww/default.nix @@ -10,6 +10,7 @@ programs.eww = { enable = true; - configDir = ./config; + yuckConfig = "${./config}"; + scssConfig = "${./config}"; }; } diff --git a/home-manager/features/hyprland.nix b/home-manager/features/hyprland.nix index 6f4e8a0..78c2088 100644 --- a/home-manager/features/hyprland.nix +++ b/home-manager/features/hyprland.nix @@ -18,11 +18,16 @@ wayland.windowManager.hyprland = { enable = true; + + # TODO: Switch to the newer LUA config? + configType = "hyprlang"; + plugins = [ # https://github.com/outfoxxed/hy3 pkgs.hyprlandPlugins.hy3 # https://github.com/shezdy/hyprsplit - pkgs.hyprlandPlugins.hyprsplit + # TODO: Fails to build + # pkgs.hyprlandPlugins.hyprsplit ]; # Disable systemd because it conflicts with UWSM diff --git a/home-manager/features/linux-desktop.nix b/home-manager/features/linux-desktop.nix index f139e7e..4d03bf8 100644 --- a/home-manager/features/linux-desktop.nix +++ b/home-manager/features/linux-desktop.nix @@ -71,8 +71,12 @@ in gtk3.extraConfig = { gtk-application-prefer-dark-theme = true; }; - gtk4.extraConfig = { - gtk-application-prefer-dark-theme = true; + gtk4 = { + # Don't use GTK4 themes. See https://stopthemingmy.app/ + theme = null; + extraConfig = { + gtk-application-prefer-dark-theme = true; + }; }; }; diff --git a/home-manager/features/neovim/default.nix b/home-manager/features/neovim/default.nix index a2c90f7..252d72e 100644 --- a/home-manager/features/neovim/default.nix +++ b/home-manager/features/neovim/default.nix @@ -6,6 +6,8 @@ vimAlias = true; defaultEditor = true; withNodeJs = true; + withRuby = false; # New default as of 26.05, needs explicit change since original config is old. + withPython3 = false; # New default as of 26.05, needs explicit change since original config is old. extraPackages = with pkgs; [ gcc # For treesitter complation diff --git a/home-manager/features/shell.nix b/home-manager/features/shell.nix index 98fcdd6..05e1218 100644 --- a/home-manager/features/shell.nix +++ b/home-manager/features/shell.nix @@ -14,7 +14,6 @@ # System htop btop - neofetch psmisc # fuser, killal, pstree # Archives diff --git a/system/features/android-dev.nix b/system/features/android-dev.nix index 73bdbd9..da49daa 100644 --- a/system/features/android-dev.nix +++ b/system/features/android-dev.nix @@ -1,5 +1,4 @@ { ... }: { - programs.adb.enable = true; users.users.drew.extraGroups = [ "adbusers" ]; } diff --git a/system/features/gui.nix b/system/features/gui.nix index 5db2c3c..a88e7bd 100644 --- a/system/features/gui.nix +++ b/system/features/gui.nix @@ -16,7 +16,6 @@ }; services.displayManager.gdm = { enable = true; - wayland = true; }; # services.displayManager.ly.enable = true; diff --git a/system/hosts/altair/configuration.nix b/system/hosts/altair/configuration.nix index 56a5489..8eafc93 100644 --- a/system/hosts/altair/configuration.nix +++ b/system/hosts/altair/configuration.nix @@ -17,7 +17,8 @@ # Enable networking networking.networkmanager.enable = true; # Disable wpa-supplicant to avoid conflicts with network manager. - networking.wireless.enable = false; + # Appears this is not needed as of 26.05 + # networking.wireless.enable = false; # Set your time zone. time.timeZone = "America/Los_Angeles";