diff --git a/flake.lock b/flake.lock index 5d1f97f7..0b9a192e 100644 --- a/flake.lock +++ b/flake.lock @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1698684516, - "narHash": "sha256-x+6yy526dR75HBmTJvbrzN+sXINVL26yN5TY75Dgpwk=", + "lastModified": 1703987863, + "narHash": "sha256-MHhAk74uk0qHVwSkLCcXLXMe4478M2oZEFPXwjSoo2E=", "owner": "hyprwm", "repo": "hyprpicker", - "rev": "b6130e3901ed5c6d423f168705929e555608d870", + "rev": "2ef703474fb96e97e03e66e8820f213359f29382", "type": "github" }, "original": { @@ -540,11 +540,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1703898959, - "narHash": "sha256-vBevlls+e3lS1hUlTVyp1SDIo0HBfYQljywP6qpHCpo=", + "lastModified": 1703985810, + "narHash": "sha256-YCj4cY0mhCDDpj/wB1/XrytN91ZvFObEwphjynbjQks=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "b67907fb7e477aceb16f87058df6daa53db1449c", + "rev": "874827d328715132aef0dffbaf5b3012e2872bb4", "type": "github" }, "original": { @@ -721,11 +721,11 @@ }, "nur": { "locked": { - "lastModified": 1703985536, - "narHash": "sha256-wUpJ1D6z7boe+hj4ZMYGZibmApF1ciL0R296cGRfERg=", + "lastModified": 1703986790, + "narHash": "sha256-tdefw1jsvuQ3b2Ujce7RXchF1JCvkBUHaKqrSfXBiaE=", "owner": "nix-community", "repo": "NUR", - "rev": "095f3462691861ac39f3b42e77f8f5bba56bfa88", + "rev": "d3aae6da4d1546ffe8ee461076ddf79c8aeef142", "type": "github" }, "original": { diff --git a/home/modules/programs/git.nix b/home/modules/programs/git.nix index f7278026..2c902906 100644 --- a/home/modules/programs/git.nix +++ b/home/modules/programs/git.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + config, + pkgs, + ... +}: { home.packages = with pkgs; [ zsh-forgit gitflow @@ -9,11 +13,16 @@ enable = true; userName = "rxyhn"; userEmail = "rxyhn.dev@gmail.com"; + signing = { + key = "${config.home.homeDirectory}/.ssh/id_ed25519"; + signByDefault = true; + }; extraConfig = { init = {defaultBranch = "main";}; delta = {line-numbers = true;}; branch.autosetupmerge = "true"; + gpg.format = "ssh"; push.default = "current"; merge.stat = "true"; core.whitespace = "fix,-indent-with-non-tab,trailing-space,cr-at-eol"; diff --git a/home/modules/programs/xdg.nix b/home/modules/programs/xdg.nix index 8b84c9e6..bb303d68 100644 --- a/home/modules/programs/xdg.nix +++ b/home/modules/programs/xdg.nix @@ -1,4 +1,4 @@ -let +{pkgs, ...}: let browser = ["firefox"]; associations = { "text/html" = browser; @@ -36,4 +36,10 @@ in { createDirectories = true; }; }; + + home.packages = [ + (pkgs.writeShellScriptBin "xdg-terminal-exec" '' + kitty "$@" + '') + ]; } diff --git a/home/modules/windowManager/hyprland/config/default.nix b/home/modules/windowManager/hyprland/config/default.nix index 480171f4..31f79927 100644 --- a/home/modules/windowManager/hyprland/config/default.nix +++ b/home/modules/windowManager/hyprland/config/default.nix @@ -11,45 +11,32 @@ "hyprctl setcursor ${pointer.name} ${toString pointer.size}" ]; - input = { - kb_layout = "us"; - - follow_mouse = 1; - touchpad = { - natural_scroll = true; - }; - - sensitivity = 0; - }; - general = { + border_size = 2; gaps_in = 5; gaps_out = 5; - border_size = 1; - - "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; "col.inactive_border" = "rgba(595959aa)"; - + "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; layout = "dwindle"; - allow_tearing = false; }; decoration = { rounding = 8; + drop_shadow = false; + shadow_ignore_window = true; blur = { enabled = true; size = 8; passes = 4; + new_optimizations = true; + xray = true; }; - - drop_shadow = false; - shadow_ignore_window = true; }; animations = { enabled = true; - # first_launch_animation = false; + first_launch_animation = false; bezier = [ "smoothOut, 0.36, 0, 0.66, -0.56" @@ -68,6 +55,16 @@ ]; }; + input = { + kb_layout = "us"; + follow_mouse = 1; + sensitivity = 0; + accel_profile = "flat"; + touchpad = { + natural_scroll = true; + }; + }; + dwindle = { pseudotile = true; preserve_split = true; @@ -77,18 +74,24 @@ new_is_master = true; }; + gestures = { + workspace_swipe = true; + workspace_swipe_forever = true; + }; + misc = { disable_autoreload = true; + disable_splash_rendering = true; + disable_hyprland_logo = true; + force_hypr_chan = true; force_default_wallpaper = 0; animate_mouse_windowdragging = false; - }; - - gestures = { - workspace_swipe = true; - # workspace_swipe_forever = true; + vfr = true; + vrr = 1; }; xwayland.force_zero_scaling = true; + debug.disable_logs = false; }; wayland.windowManager.hyprland.extraConfig = '' diff --git a/modules/desktop.nix b/modules/desktop.nix index a0d38986..b5c5f9fd 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -35,7 +35,7 @@ }; }; - environment.variables.NIXOS_OZONE_WL = "1"; + # environment.variables.NIXOS_OZONE_WL = "1"; hardware = { opengl = {