From 3d4e2102b3499b3bbaaf415f320b717d1fb9e657 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Dec 2024 18:45:56 +0000 Subject: [PATCH] Fixing arrakis --- home/arrakis/default.nix | 2 +- home/arrakis/monitors.nix | 24 +++++++++++++++ home/common/programs/desktop/default.nix | 5 ++++ home/common/programs/git/default.nix | 3 ++ home/common/programs/hyprland/default.nix | 36 ++++++++++++++++------- home/common/programs/kitty.nix | 7 +++-- home/common/programs/rust.nix | 5 ++-- home/common/programs/zsh.nix | 1 + home/desktop/default.nix | 10 ++++++- home/desktop/monitors.nix | 32 ++++++++++++++++++++ 10 files changed, 108 insertions(+), 17 deletions(-) create mode 100644 home/arrakis/monitors.nix create mode 100644 home/desktop/monitors.nix diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index 686dd93..a70a0dc 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -21,6 +21,7 @@ ../common/features/colorscheme.nix ../common/features/xdg.nix ../common/features/bluetooth.nix + ./monitors.nix ]; home.sessionVariables = { @@ -31,7 +32,6 @@ }; wayland.windowManager.hyprland.settings = { - monitor = [ "eDP-1, preferred, 0x1080, 1, bitdepth, 8" ]; windowrulev2 = [ "float, class:thunar" "move cursor -50% -50%, class:thunar" diff --git a/home/arrakis/monitors.nix b/home/arrakis/monitors.nix new file mode 100644 index 0000000..8c3943a --- /dev/null +++ b/home/arrakis/monitors.nix @@ -0,0 +1,24 @@ +{ + inputs, + pkgs, + config, + ... +}: +let + wallpaper1 = pkgs.fetchurl { + url = "https://4kwallpapers.com/images/wallpapers/abstract-design-3840x2160-17068.jpg"; + hash = "sha256-F/XE/ETwzYwtbQWXY78c2AJc8xe2mRunB8Q9/c2F7kY="; + }; +in +{ + wayland.windowManager.hyprland.settings = { + monitor = [ + "eDP-1, preferred, 0x0, 1, bitdepth, 8" + ]; + }; + + services.hyprpaper.settings.preload = [ (builtins.toString wallpaper1) ]; + services.hyprpaper.settings.wallpaper = [ + "eDP-1,${builtins.toString wallpaper1}" + ]; +} diff --git a/home/common/programs/desktop/default.nix b/home/common/programs/desktop/default.nix index d4e049a..0b7ca9f 100644 --- a/home/common/programs/desktop/default.nix +++ b/home/common/programs/desktop/default.nix @@ -19,6 +19,11 @@ zathura lxappearance + # networking + networkmanagerapplet + mtr + dnsutils + # communication slack zoom-us diff --git a/home/common/programs/git/default.nix b/home/common/programs/git/default.nix index 50b3ade..74da270 100644 --- a/home/common/programs/git/default.nix +++ b/home/common/programs/git/default.nix @@ -30,6 +30,9 @@ w = "commit -am 'wip'"; }; extraConfig = { + init = { + defaultBranch = "main"; + }; core = { editor = "nvim"; pager = "delta"; diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index d5fe280..5c01c85 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -31,9 +31,10 @@ in new_optimizations = "on"; }; - drop_shadow = "yes"; - shadow_range = 2; - shadow_render_power = 1; + # shadow = { + # range = 2; + # render_power = 4; + # }; }; input = { @@ -54,14 +55,19 @@ in }; general = { - gaps_in = 2; + border_size = 0; + gaps_in = 4; gaps_out = 0; }; - monitor = [ - "eDP-1, 1920x1080, 0x0, 1" - "DP-1, 1920x1080, auto, 1, mirror, eDP-1" - ]; + misc = { + disable_hyprland_logo = true; + disable_splash_rendering = true; + }; + + xwayland = { + force_zero_scaling = true; + }; animations = { bezier = "easeOutQuad, 0.5, 1, 0.89, 1"; @@ -79,14 +85,15 @@ in dwindle = { preserve_split = "yes"; - no_gaps_when_only = true; }; + master = { orientation = "center"; - no_gaps_when_only = true; }; env = [ + "GDK_SCALE, 2" + "XCURSOR_SIZE, 32" "HYPRCURSOR_THEME, rose-pine-hyprcursor" "HYPRCURSOR_SIZE, 24" ]; @@ -94,6 +101,7 @@ in "exec-once" = [ "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "hyprpanel" + "nm-applet" ]; windowrulev2 = [ @@ -180,4 +188,12 @@ in ]; }; }; + + services.hyprpaper = { + enable = true; + settings = { + ipc = "on"; + splash = false; + }; + }; } diff --git a/home/common/programs/kitty.nix b/home/common/programs/kitty.nix index ff52139..138b363 100644 --- a/home/common/programs/kitty.nix +++ b/home/common/programs/kitty.nix @@ -1,9 +1,11 @@ -{ config, pkgs, ... }: { +{ config, pkgs, ... }: +{ programs.kitty = { enable = true; settings = { confirm_os_window_close = 0; enable_audio_bell = false; + cursor_trail = 1; enabled_layouts = "tall, grid, fat, splits"; @@ -18,8 +20,7 @@ tab_bar_edge = "bottom"; tab_bar_style = "powerline"; tab_powerline_style = "slanted"; - tab_title_template = - "{title}{' :{}'.format(num_windows) if num_windows > 1 else ''}"; + tab_title_template = "{title}{' :{}'.format(num_windows) if num_windows > 1 else ''}"; # keys kitty_mod = "alt"; diff --git a/home/common/programs/rust.nix b/home/common/programs/rust.nix index 1875b56..de63c03 100644 --- a/home/common/programs/rust.nix +++ b/home/common/programs/rust.nix @@ -4,14 +4,15 @@ rustup bacon mprocs + ra-multiplex ]; home.sessionPath = [ "\${CARGO_HOME:-~/.cargo}/bin" ]; systemd.user.services.ra-multiplex = { Service = { - ExecStart = "/home/naps62/.cargo/bin/ra-multiplex server"; + ExecStart = "${pkgs.ra-multiplex}/bin/ra-multiplex server"; }; - Install.WantedBy = [ "multi-user.target" ]; + Install.WantedBy = [ "default.target" ]; }; } diff --git a/home/common/programs/zsh.nix b/home/common/programs/zsh.nix index aca117c..a5d540d 100644 --- a/home/common/programs/zsh.nix +++ b/home/common/programs/zsh.nix @@ -93,6 +93,7 @@ procs eza asdf-vm + fd ]; home.sessionPath = [ diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 686dd93..fc55265 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -21,6 +21,7 @@ ../common/features/colorscheme.nix ../common/features/xdg.nix ../common/features/bluetooth.nix + ./monitors.nix ]; home.sessionVariables = { @@ -31,11 +32,18 @@ }; wayland.windowManager.hyprland.settings = { - monitor = [ "eDP-1, preferred, 0x1080, 1, bitdepth, 8" ]; windowrulev2 = [ + # thunar "float, class:thunar" "move cursor -50% -50%, class:thunar" "size 800 600, class:thunar" + + # ethui-dev + "workspace 1, class:ethui" + "float, class:ethui" + "size 800 800, class:ethui" + "move 100%-800 100%-800, class:ethui" + "noinitialfocus, class:ethui" ]; }; diff --git a/home/desktop/monitors.nix b/home/desktop/monitors.nix new file mode 100644 index 0000000..e60af61 --- /dev/null +++ b/home/desktop/monitors.nix @@ -0,0 +1,32 @@ +{ + inputs, + pkgs, + config, + ... +}: +let + wallpaper1 = pkgs.fetchurl { + url = "https://4kwallpapers.com/images/wallpapers/abstract-design-3840x2160-17068.jpg"; + hash = "sha256-F/XE/ETwzYwtbQWXY78c2AJc8xe2mRunB8Q9/c2F7kY="; + }; +in +{ + wayland.windowManager.hyprland.settings = { + monitor = [ + "DP-1, preferred, 0x0, auto, bitdepth, 8" + "HDMI-A-1, preferred, 2560x0, auto, bitdepth, 8" + ]; + workspace = [ + "1, monitor=HDMI-A-1" + "2, monitor=DP-1" + "3, monitor=DP-1" + "4, monitor=DP-1" + ]; + }; + + services.hyprpaper.settings.preload = [ (builtins.toString wallpaper1) ]; + services.hyprpaper.settings.wallpaper = [ + "DP-1,${builtins.toString wallpaper1}" + "HDMI-A-1,${builtins.toString wallpaper1}" + ]; +}