diff --git a/flake.lock b/flake.lock index 0fb31fb..347528e 100644 --- a/flake.lock +++ b/flake.lock @@ -764,26 +764,23 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", "systems": "systems_3", - "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1714837352, - "narHash": "sha256-UxpPPS5uiyE4FDO3trfJObOm6sE7jnkVguHH6IdkQqs=", - "ref": "refs/tags/v0.40.0", - "rev": "cba1ade848feac44b2eda677503900639581c3f4", - "revCount": 4606, + "lastModified": 1716316196, + "narHash": "sha256-ynu+Ii1PTtnz4YdjP2CJbnxaie9aETNAds9lwDzeQus=", + "ref": "refs/heads/main", + "rev": "e419ef1873de01b0762f7f1a411994170a4d8cab", + "revCount": 4723, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "ref": "refs/tags/v0.40.0", "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -818,10 +815,12 @@ "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, @@ -1584,29 +1583,9 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713731601, - "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" diff --git a/flake.nix b/flake.nix index 653e1fc..79a3101 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,8 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; hyprland.url = - "git+https://github.com/hyprwm/Hyprland?ref=refs/tags/v0.40.0&submodules=1"; + # "git+https://github.com/hyprwm/Hyprland?ref=refs/tags/v0.40.0&submodules=1"; + "git+https://github.com/hyprwm/Hyprland?submodules=1"; hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index b64a77b..849a539 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -10,7 +10,7 @@ settings = { substituters = [ "https://hyprland.cachix.org" ]; trusted-public-keys = [ - # "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; # enable flakes experimental-features = [ "nix-command" "flakes" ]; @@ -55,7 +55,6 @@ foot.enable = true; fish.enable = true; stylix.enable = true; - helix.enable = true; nh.enable = true; waybar.enable = true; spicetify.enable = true; diff --git a/modules/editors/helix.nix b/modules/editors/helix.nix index 8e9771c..2e6918b 100644 --- a/modules/editors/helix.nix +++ b/modules/editors/helix.nix @@ -1,10 +1,10 @@ { config, lib, pkgs, ... }: with lib; let - cfg = config.modules.programs.helix; + cfg = config.modules.editors.helix; username = config.modules.other.system.username; in { - options.modules.programs.helix.enable = mkEnableOption "helix"; + options.modules.editors.helix.enable = mkEnableOption "helix"; config = mkIf cfg.enable { home-manager.users.${username} = { diff --git a/modules/editors/kakoune.nix b/modules/editors/kakoune.nix index 45e789c..7e6173b 100644 --- a/modules/editors/kakoune.nix +++ b/modules/editors/kakoune.nix @@ -1,11 +1,11 @@ { config, lib, pkgs, ... }: with lib; let - cfg = config.modules.programs.kakoune; + cfg = config.modules.editors.kakoune; username = config.modules.other.system.username; # inherit (inputs.kakoune.packages.${pkgs.system}) kakoun; in { - options.modules.programs.kakoune.enable = mkEnableOption "kakoune"; + options.modules.editors.kakoune.enable = mkEnableOption "kakoune"; config = mkIf cfg.enable { home-manager.users.${username} = { diff --git a/modules/gui/default.nix b/modules/gui/default.nix index 0cdf222..4ccc5fd 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -13,7 +13,6 @@ _: { ./rofi.nix ./kitty.nix ./vivado.nix - ./firefox.nix ./steam.nix ./waybar.nix ./schizofox.nix diff --git a/modules/tui/default.nix b/modules/tui/default.nix index 79e26f1..6acc448 100644 --- a/modules/tui/default.nix +++ b/modules/tui/default.nix @@ -1,10 +1,3 @@ _: { - imports = [ - ./btop.nix - ./helix.nix - ./neovim.nix - ./newsboat.nix - ./ncmpcpp.nix - ./yazi.nix - ]; + imports = [ ./btop.nix ./neovim.nix ./newsboat.nix ./ncmpcpp.nix ./yazi.nix ]; } diff --git a/modules/wms/wayland/variables.nix b/modules/wms/wayland/variables.nix index edd364a..8d70786 100644 --- a/modules/wms/wayland/variables.nix +++ b/modules/wms/wayland/variables.nix @@ -5,49 +5,50 @@ let hyprland = config.modules.wms.wayland.hyprland; in { options.modules.wms.wayland.enable = mkEnableOption "wayland"; - options.modules.wms.wayland.hyprland.enable = mkEnableOption "hyprland"; - config = mkIf cfg.enable lib.mkMerge [ - { - environment.variables = { - NIXOS_OZONE_WL = "1"; - __GL_GSYNC_ALLOWED = "0"; - __GL_VRR_ALLOWED = "0"; - # _JAVA_AWT_WM_NONEREPARENTING = "1"; - # SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh"; - DISABLE_QT5_COMPAT = "0"; - GDK_BACKEND = "wayland,x11"; - ANKI_WAYLAND = "1"; - DIRENV_LOG_FORMAT = ""; - WLR_DRM_NO_ATOMIC = "1"; - QT_AUTO_SCREEN_SCALE_FACTOR = "1"; - QT_QPA_PLATFORM = "wayland;xcb"; - DISABLE_QT_COMPAT = "0"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - MOZ_ENABLE_WAYLAND = "1"; - WLR_BACKEND = "vulkan"; - WLR_RENDERER = "vulkan"; - XDG_SESSION_TYPE = "wayland"; - SDL_VIDEODRIVER = "wayland"; - CLUTTER_BACKEND = "wayland"; - # WLR_DRM_DEVICES = "/dev/dri/card1:/dev/dri/card0"; - }; - } - # Session variables for Hyprland - (lib.mkIf (hyprland.enable) { - environment.variables = { - LIBVA_DRIVER_NAME = "nvidia"; - GTK_USE_PORTAL = "1"; - NIXOS_XDG_OPEN_USE_PORTAL = "1"; - XDG_CURRENT_DESKTOP = "Hyprland"; - XDG_SESSION_DESKTOP = "Hyprland"; - SDL_VIDEODRIVER = "wayland"; - # GDK_BACKEND = "wayland"; - WLR_RENDERER_ALLOW_SOFTWARE = "1"; - QT_QPA_PLATFORM = "wayland"; - # Needed anymore? - LIBSEAT_BACKEND = "logind"; - # WLR_NO_HARDWARE_CURSORS = "1"; - }; - }) - ]; + # options.modules.wms.wayland.hyprland.enable = mkEnableOption "hyprland"; + config = mkIf cfg.enable { + # lib.mkMerge [ + # { + environment.variables = { + NIXOS_OZONE_WL = "1"; + __GL_GSYNC_ALLOWED = "0"; + __GL_VRR_ALLOWED = "0"; + # _JAVA_AWT_WM_NONEREPARENTING = "1"; + # SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh"; + DISABLE_QT5_COMPAT = "0"; + GDK_BACKEND = "wayland,x11"; + ANKI_WAYLAND = "1"; + DIRENV_LOG_FORMAT = ""; + WLR_DRM_NO_ATOMIC = "1"; + QT_AUTO_SCREEN_SCALE_FACTOR = "1"; + QT_QPA_PLATFORM = "wayland;xcb"; + DISABLE_QT_COMPAT = "0"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + MOZ_ENABLE_WAYLAND = "1"; + WLR_BACKEND = "vulkan"; + WLR_RENDERER = "vulkan"; + XDG_SESSION_TYPE = "wayland"; + SDL_VIDEODRIVER = "wayland"; + CLUTTER_BACKEND = "wayland"; + # WLR_DRM_DEVICES = "/dev/dri/card1:/dev/dri/card0"; + # }; + # } + # Session variables for Hyprland + # (lib.mkIf (hyprland.enable) { + # environment.variables = { + LIBVA_DRIVER_NAME = "nvidia"; + GTK_USE_PORTAL = "1"; + NIXOS_XDG_OPEN_USE_PORTAL = "1"; + XDG_CURRENT_DESKTOP = "Hyprland"; + XDG_SESSION_DESKTOP = "Hyprland"; + # GDK_BACKEND = "wayland"; + WLR_RENDERER_ALLOW_SOFTWARE = "1"; + # QT_QPA_PLATFORM = "wayland"; + # Needed anymore? + LIBSEAT_BACKEND = "logind"; + # WLR_NO_HARDWARE_CURSORS = "1"; + }; + # }) + # ]; + }; } diff --git a/options/common/gpu/nvidia.nix b/options/common/gpu/nvidia.nix index d8b068d..a843b83 100644 --- a/options/common/gpu/nvidia.nix +++ b/options/common/gpu/nvidia.nix @@ -1,8 +1,4 @@ -{ pkgs, config, inputs, ... }: -let - # pkgs-unstable = - # inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}; -in { +{ pkgs, config, inputs, ... }: { services.xserver.videoDrivers = [ "nvidia" ]; hardware.opengl = { enable = true; @@ -16,7 +12,14 @@ in { powerManagement.enable = false; powerManagement.finegrained = false; nvidiaSettings = false; - package = config.boot.kernelPackages.nvidiaPackages.beta; + # package = config.boot.kernelPackages.nvidiaPackages.beta; + package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + version = "555.42.02"; + sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk="; + openSha256 = "sha256-3/eI1VsBzuZ3Y6RZmt3Q5HrzI2saPTqUNs6zPh5zy6w="; + settingsSha256 = ""; + persistencedSha256 = ""; + }; }; }