Skip to content

Commit

Permalink
[chore}: update
Browse files Browse the repository at this point in the history
  • Loading branch information
rxyhn committed Dec 31, 2023
1 parent a63e904 commit 7eb8c42
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 37 deletions.
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion home/modules/programs/git.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{pkgs, ...}: {
{
config,
pkgs,
...
}: {
home.packages = with pkgs; [
zsh-forgit
gitflow
Expand All @@ -9,11 +13,16 @@
enable = true;
userName = "rxyhn";
userEmail = "[email protected]";
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";
Expand Down
8 changes: 7 additions & 1 deletion home/modules/programs/xdg.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let
{pkgs, ...}: let
browser = ["firefox"];
associations = {
"text/html" = browser;
Expand Down Expand Up @@ -36,4 +36,10 @@ in {
createDirectories = true;
};
};

home.packages = [
(pkgs.writeShellScriptBin "xdg-terminal-exec" ''
kitty "$@"
'')
];
}
53 changes: 28 additions & 25 deletions home/modules/windowManager/hyprland/config/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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;
Expand All @@ -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 = ''
Expand Down
2 changes: 1 addition & 1 deletion modules/desktop.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
};
};

environment.variables.NIXOS_OZONE_WL = "1";
# environment.variables.NIXOS_OZONE_WL = "1";

hardware = {
opengl = {
Expand Down

0 comments on commit 7eb8c42

Please sign in to comment.