diff --git a/.envrc b/.envrc index 6de8a8a..1e30148 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1,5 @@ source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0=" -use devenv \ No newline at end of file +use devenv + +export PROMPT=""$PROMPT diff --git a/configs/hyprland/mine/dunst/dunstrc b/configs/hyprland/mine/dunst/dunstrc new file mode 100644 index 0000000..5ee5a9c --- /dev/null +++ b/configs/hyprland/mine/dunst/dunstrc @@ -0,0 +1,77 @@ +[global] + monitor = 0 + follow = mouse + geometry = "0x0-30+20" + indicate_hidden = yes + shrink = no + transparency = 0 + notification_height = 0 + separator_height = 2 + padding = 8 + horizontal_padding = 8 + frame_width = 3 + frame_color = "#aaaaaa" + separator_color = auto + sort = yes + idle_threshold = 120 + font = Fira Code 10 + line_height = 0 + markup = full + format = "%s\n%b" + alignment = center + show_age_threshold = 60 + word_wrap = yes + ellipsize = middle + ignore_newline = no + stack_duplicates = true + hide_duplicate_count = false + show_indicators = yes + icon_position = left + max_icon_size = 32 + # icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ + sticky_history = yes + history_length = 20 + dmenu = /usr/bin/dmenu -p dunst: + browser = /usr/bin/brave + always_run_script = true + title = Dunst + class = Dunst + startup_notification = true + verbosity = mesg + corner_radius = 5 + mouse_left_click = do_action + mouse_middle_click = close_all + mouse_right_click = close_current + +[experimental] + per_monitor_dpi = false + +[shortcuts] + close = ctrl+space + close_all = ctrl+shift+space + history = ctrl+grave + context = ctrl+shift+period + +[urgency_low] + # IMPORTANT: colors have to be defined in quotation marks. + # Otherwise the "#" and following would be interpreted as a comment. + background = "#2b2b2b" + foreground = "#ffffff" + timeout = 5 + # Icon for notifications with low urgency, uncomment to enable + # icon = /home/brodie/.config/dunst/normal.png + +[urgency_normal] + background = "#2b2b2b" + foreground = "#ffffff" + timeout = 5 + # Icon for notifications with normal urgency, uncomment to enable + # icon = /home/brodie/.config/dunst/normal.png + +[urgency_critical] + background = "#900000" + foreground = "#ffffff" + frame_color = "#ff0000" + timeout = 5 + # Icon for notifications with critical urgency, uncomment to enable + # icon = /home/brodie/.config/dunst/critical.png diff --git a/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf b/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf index 63e0884..12a3d03 100644 --- a/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf +++ b/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf @@ -1,5 +1,5 @@ exec-once = lxqt-policykit-agent -exec-once = dunst --startup_notification +exec-once = dunst --config $HOME/.config/dunstrc --startup_notification exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = swww-daemon exec-once = hypridle diff --git a/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf b/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf index 2f7904c..bb0e3f2 100644 --- a/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf +++ b/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf @@ -1,5 +1,6 @@ $mainMod = SUPER +# bind = $mainMod, tab, overview, toggle # # We've defined $term, $editor and so on in includes.conf. bind = $mainMod, W, exec, $browser diff --git a/configs/hyprland/mine/hypr/hyprland.d/monitors.conf b/configs/hyprland/mine/hypr/hyprland.d/monitors.conf deleted file mode 100644 index 20a38e6..0000000 --- a/configs/hyprland/mine/hypr/hyprland.d/monitors.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Generated by nwg-displays on 2024-09-06 at 12:05:04. Do not edit manually. - -monitor=eDP-1,2256x1504@60.0,4176x1381,1.0 -monitor=DP-9,1920x1080@60.0,5186x301,1.0 -monitor=DP-10,1920x1080@60.0,3266x301,1.0 diff --git a/configs/hyprland/mine/hypr/hyprland.d/monitors.conf b/configs/hyprland/mine/hypr/hyprland.d/monitors.conf new file mode 120000 index 0000000..f0eb2ef --- /dev/null +++ b/configs/hyprland/mine/hypr/hyprland.d/monitors.conf @@ -0,0 +1 @@ +../monitors.conf \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/monitors.conf b/configs/hyprland/mine/hypr/monitors.conf new file mode 100644 index 0000000..8af33c7 --- /dev/null +++ b/configs/hyprland/mine/hypr/monitors.conf @@ -0,0 +1,5 @@ +monitor=eDP-1,2256x1504@60.0,4176x1381,1.0 + +# External Monitors +monitor=DP-9,1920x1080@60.0,5186x301,1.0 +monitor=DP-10,1920x1080@60.0,3266x301,1.0 diff --git a/configs/hyprland/mine/hypr/hyprland.conf b/configs/hyprland/mine/hypr/syn_hyprland.conf similarity index 57% rename from configs/hyprland/mine/hypr/hyprland.conf rename to configs/hyprland/mine/hypr/syn_hyprland.conf index 1aee73d..ea7fee2 100644 --- a/configs/hyprland/mine/hypr/hyprland.conf +++ b/configs/hyprland/mine/hypr/syn_hyprland.conf @@ -1,2 +1,2 @@ source = ~/.config/hypr/hyprland.d/*.conf - +debug:enable_stdout_logs = true \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/workspaces.conf b/configs/hyprland/mine/hypr/workspaces.conf deleted file mode 100644 index e69de29..0000000 diff --git a/hosts/cloaky.nix b/hosts/cloaky.nix deleted file mode 100644 index 928d95c..0000000 --- a/hosts/cloaky.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs, ... }: -{ - - nix = { - enable = true; - package = pkgs.nix; - extraOptions = '' - experimental-features = nix-command flakes - !include ./extra.conf - ''; - }; - programs.home-manager.enable = true; - home.packages = with pkgs; [ - cloudflared - nvd - deno - ollama - go - ]; - home.shellAliases = { - cat = "bat"; - }; - home.sessionPath = [ - "$HOME/.local/bin" - ]; - home.sessionVariables = { - OLLAMA_HOST = "http://bigbox1.lab.internal:11434"; - }; -} diff --git a/modules/nixos/desktop/hyprland/common.nix b/modules/nixos/desktop/hyprland/common.nix index cea85b9..e05d47f 100644 --- a/modules/nixos/desktop/hyprland/common.nix +++ b/modules/nixos/desktop/hyprland/common.nix @@ -7,12 +7,12 @@ in config = lib.mkIf cfg.enabled { programs.hyprland = { enable = true; - package = hyprpkgs.hyprland; - portalPackage = hyprpkgs.xdg-desktop-portal-hyprland; + # package = hyprpkgs.hyprland; + portalPackage = pkgs.xdg-desktop-portal-hyprland; xwayland.enable = true; systemd.setPath.enable = true; }; - xdg.portal.extraPortals = [ hyprpkgs.xdg-desktop-portal-hyprland ]; + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; services.hypridle.enable = true; environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/desktop/hyprland/mine.nix b/modules/nixos/desktop/hyprland/mine.nix index 97e6473..e86b482 100644 --- a/modules/nixos/desktop/hyprland/mine.nix +++ b/modules/nixos/desktop/hyprland/mine.nix @@ -4,9 +4,18 @@ let in { config = lib.mkIf (cfg.enabled && !cfg.useNWG) { - home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland.plugins = [ - inputs.hyprspace.packages.${pkgs.system}.Hyprspace - ]; + home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland = { + enable = true; + xwayland.enable = true; + # package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + # plugins = [ + # inputs.hyprspace.packages.${pkgs.system}.Hyprspace + # ]; + extraConfig = '' + source = ~/.config/hypr/hyprland.d/*.conf + debug:enable_stdout_logs = true + ''; + }; programs.hyprlock.enable = true; environment.systemPackages = with pkgs; [ # general utilities @@ -26,18 +35,22 @@ in nwg-bar # logout window ]; system.userActivationScripts.hyprlandMineConfig.text = '' - rm "$HOME/.config/hypr" + rm -f "$HOME/.config/hypr" if [[ ! -h "$HOME/.config/hypr" ]]; then ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr" fi - rm "$HOME/.config/waybar" + rm -f "$HOME/.config/waybar" if [[ ! -h "$HOME/.config/waybar" ]]; then ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar" fi - rm "$HOME/.config/nwg-bar" + rm -f "$HOME/.config/nwg-bar" if [[ ! -h "$HOME/.config/nwg-bar" ]]; then ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/nwg-bar" "$HOME/.config/nwg-bar" fi + rm -f "$HOME/.config/dunst" + if [[ ! -h "$HOME/.config/dunst" ]]; then + ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/dunst" "$HOME/.config/nwg-bar" + fi ''; }; }