diff --git a/config.nix b/config.nix index fca270d..a5f07d0 100644 --- a/config.nix +++ b/config.nix @@ -22,19 +22,6 @@ lib: { default = {}; }; - hyprland_assignments = lib.mkOption { - type = lib.types.attrs; - description = "A list of Hyprland assignments to set up window rules."; - default = { - "$terminal" = "alacritty"; - "$fileManager" = "nautilus --new-window"; - "$browser" = "chromium --new-window --ozone-platform=wayland"; - "$music" = "spotify"; - "$passwordManager" = "1password"; - "$messenger" = "signal-desktop"; - "$webapp" = "$browser --app"; - }; - }; quick_app_bindings = lib.mkOption { type = lib.types.listOf lib.types.str; description = "A list of single keystroke key bindings to launch common apps."; diff --git a/modules/home-manager/hyprland/configuration.nix b/modules/home-manager/hyprland/configuration.nix index 3066782..0864723 100644 --- a/modules/home-manager/hyprland/configuration.nix +++ b/modules/home-manager/hyprland/configuration.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: let cfg = config.omarchy; @@ -12,7 +13,16 @@ in { ./looknfeel.nix ./windows.nix ]; - wayland.windowManager.hyprland.settings = cfg.hyprland_assignments // { + wayland.windowManager.hyprland.settings = { + # Default applications + "$terminal" = lib.mkDefault "alacritty"; + "$fileManager" = lib.mkDefault "nautilus --new-window"; + "$browser" = lib.mkDefault "chromium --new-window --ozone-platform=wayland"; + "$music" = lib.mkDefault "spotify"; + "$passwordManager" = lib.mkDefault "1password"; + "$messenger" = lib.mkDefault "signal-desktop"; + "$webapp" = lib.mkDefault "$browser --app"; + # Environment variables env = [ "GDK_SCALE,2" # Change to 1 if on a 1x display diff --git a/modules/home-manager/vscode.nix b/modules/home-manager/vscode.nix index 67ed231..722ca7f 100644 --- a/modules/home-manager/vscode.nix +++ b/modules/home-manager/vscode.nix @@ -13,7 +13,6 @@ in { userSettings = { "workbench.colorTheme" = theme.vscode_theme; - # "workbench.colorTheme" = "Everforest Dark"; "vim.useCtrlKeys" = false; "editor.minimap.enabled" = false; } diff --git a/modules/themes.nix b/modules/themes.nix index 5abb596..8bce256 100644 --- a/modules/themes.nix +++ b/modules/themes.nix @@ -113,7 +113,7 @@ primary_variant = "#7fb4ca"; secondary = "#957fb8"; accent = "#938aa9"; - + # Status colors success = "#76946a"; warning = "#c0a36e";