diff --git a/flake.lock b/flake.lock index 5b546e6..f304f0b 100644 --- a/flake.lock +++ b/flake.lock @@ -631,11 +631,11 @@ "nvchad-starter": { "flake": false, "locked": { - "lastModified": 1743438570, - "narHash": "sha256-SlFmoG8ykQH6gm0740WAIEXGXbT3UcB+ZqAtQwxxSJg=", + "lastModified": 1744008260, + "narHash": "sha256-sVHQwQj0b7S1XkLC7hmAagkm3P52WZ3qc+R+uVp2ffw=", "owner": "naps62", "repo": "nvchad-starter", - "rev": "e7943fd98169ba8e44ecf0b9de910ea1e83e582b", + "rev": "22d1ce956639b15bca0f1a2094e286d8863b135b", "type": "github" }, "original": { diff --git a/home/common/programs/kitty.nix b/home/common/programs/kitty.nix deleted file mode 100644 index 066e182..0000000 --- a/home/common/programs/kitty.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ 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"; - - # font - font_family = "FiraCode Nerd Font Mono"; - bold_font = "FiraCode Nerd Font Mono Bold"; - italic_font = "VictorMono Nerd Font Mono Oblique"; - bold_italic_font = "VictorMono Nerd Font Mono Bold Oblique"; - disable_ligatures = "cursor"; - - # tab-style - tab_bar_edge = "bottom"; - tab_bar_style = "powerline"; - tab_powerline_style = "slanted"; - tab_title_template = "{title}{' :{}'.format(num_windows) if num_windows > 1 else ''}"; - - # keys - kitty_mod = "alt"; - }; - - keybindings = { - "kitty_mod+t" = "new_tab_with_cwd"; - "kitty_mod+enter" = "new_window_with_cwd"; - "kitty_mod+r" = "set_tab_title"; - - "kitty_mod+u" = "previous_tab"; - "kitty_mod+i" = "next_tab"; - - "ctrl+shift+l" = "next_layout"; - "ctrl+shift+left" = "resize_window narrower"; - "ctrl+shift+right" = "resize_window right"; - - "ctrl+shift+0x27" = "change_font_size all +2.0"; - "ctrl+shift+minus" = "change_font_size all -2.0"; - "ctrl+shift+backspace" = "change_font_size all 0"; - - "kitty_mod+h" = "neighboring_window left"; - "kitty_mod+j" = "neighboring_window down"; - "kitty_mod+k" = "neighboring_window up"; - "kitty_mod+l" = "neighboring_window right"; - }; - }; -} diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 90a88ef..26822a1 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -13,7 +13,6 @@ ../common/programs/default.nix ../common/programs/desktop ../common/programs/hyprland - ../common/programs/kitty.nix ../common/programs/ghostty.nix ../common/programs/syncthing.nix ../common/programs/gpg.nix @@ -38,10 +37,9 @@ "move 100%-800 100%-800, class:ethui" "noinitialfocus, class:ethui" - "workspace 1 silent, class:bevy-.*" + "workspace 3 silent, class:bevy-.*" "noinitialfocus, class:bevy-.*" - "float, class:bevy-.*" - "size 800 800, class:bevy-.*" + "fullscreen, class:bevy-.*" ]; env = [ @@ -93,8 +91,6 @@ }; }; - programs.kitty.settings.font_size = 12; - home = { username = lib.mkDefault "naps62"; stateVersion = lib.mkDefault "24.05"; diff --git a/home/desktop/monitors.nix b/home/desktop/monitors.nix index e60af61..e997e66 100644 --- a/home/desktop/monitors.nix +++ b/home/desktop/monitors.nix @@ -6,27 +6,42 @@ }: let wallpaper1 = pkgs.fetchurl { - url = "https://4kwallpapers.com/images/wallpapers/abstract-design-3840x2160-17068.jpg"; - hash = "sha256-F/XE/ETwzYwtbQWXY78c2AJc8xe2mRunB8Q9/c2F7kY="; + url = "https://images.hdqwalls.com/download/black-red-square-rectangle-rq-3840x2160.jpg"; + hash = "sha256-ZWJKHHye6Ukjd+v4bwmidJim4z+6woM8e7n3bExf6kc="; + }; + wallpaper2 = pkgs.fetchurl { + url = "https://images.hdqwalls.com/download/metals-shapes-abstract-8k-8c-3840x2160.jpg"; + hash = "sha256-EYG89NfMjylnNXNFtmEYYjEFq/j22ORvnw/OTcY0BVs="; + }; + wallpaper-vertical = pkgs.fetchurl { + url = "https://images.hdqwalls.com/download/horizon-zero-dawn-abstract-m2-2160x3840.jpg"; + hash = "sha256-zwMnHigZhqeDSrtpyxC0hpn8p9Z7bI8tXx/uNxhSa60="; }; in { wayland.windowManager.hyprland.settings = { monitor = [ - "DP-1, preferred, 0x0, auto, bitdepth, 8" - "HDMI-A-1, preferred, 2560x0, auto, bitdepth, 8" + # monitor, res, position, scale, transform, rotation + "HDMI-A-1, 3840x2160, 0x1620, 1.333333" + "DP-3, 3840x2160, 0x0, 1.333333" + "DP-2, 3840x2160, 2880x0, 1.333333, transform, 1" ]; workspace = [ - "1, monitor=HDMI-A-1" - "2, monitor=DP-1" - "3, monitor=DP-1" - "4, monitor=DP-1" + "1, monitor=DP-3" + "2, monitor=DP-2" + "3, monitor=HDMI-A-1" + "4, monitor=DP-3" ]; }; - services.hyprpaper.settings.preload = [ (builtins.toString wallpaper1) ]; + services.hyprpaper.settings.preload = [ + (builtins.toString wallpaper1) + (builtins.toString wallpaper2) + (builtins.toString wallpaper-vertical) + ]; services.hyprpaper.settings.wallpaper = [ - "DP-1,${builtins.toString wallpaper1}" "HDMI-A-1,${builtins.toString wallpaper1}" + "DP-3,${builtins.toString wallpaper2}" + "DP-2,${builtins.toString wallpaper-vertical}" ]; } diff --git a/home/trantor/default.nix b/home/trantor/default.nix index af2e15b..df54310 100644 --- a/home/trantor/default.nix +++ b/home/trantor/default.nix @@ -13,7 +13,6 @@ ../common/programs/default.nix ../common/programs/desktop ../common/programs/hyprland - ../common/programs/kitty.nix ../common/programs/syncthing.nix ../common/features/xdg.nix ../common/features/bluetooth.nix @@ -35,8 +34,6 @@ ]; }; - programs.kitty.settings.font_size = 12; - home = { username = lib.mkDefault "naps62"; stateVersion = lib.mkDefault "24.05";