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 85fed93 commit 2d95883
Show file tree
Hide file tree
Showing 16 changed files with 70 additions and 107 deletions.
12 changes: 6 additions & 6 deletions flake.lock

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

2 changes: 1 addition & 1 deletion home/modules/programs/firefox.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
config,
pkgs,
inputs,
...
}: let
firefox-gnome-theme = inputs.self.packages.${pkgs.system}.firefox-gnome-theme;
in {
home.sessionVariables = {BROWSER = "firefox";};
programs.firefox = {
enable = true;
profiles = {
Expand Down
6 changes: 1 addition & 5 deletions home/modules/programs/git.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{pkgs, ...}: {
home.packages = with pkgs; [
zsh-forgit
gitflow
Expand Down
4 changes: 0 additions & 4 deletions home/modules/programs/kitty.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
programs.kitty = {
enable = true;
shellIntegration.enableZshIntegration = true;
Expand Down
6 changes: 1 addition & 5 deletions home/modules/programs/media.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
pkgs,
config,
...
}: {
{pkgs, ...}: {
home.packages = with pkgs; [
pavucontrol
playerctl
Expand Down
6 changes: 1 addition & 5 deletions home/modules/programs/vscode.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{pkgs, ...}: {
programs.vscode = {
enable = true;

Expand Down
6 changes: 1 addition & 5 deletions home/modules/programs/xdg.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: let
let
browser = ["firefox"];
associations = {
"text/html" = browser;
Expand Down
5 changes: 1 addition & 4 deletions home/modules/windowManager/hyprland/config/binds.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{config, ...}: let
let
workspaces = builtins.concatLists (builtins.genList (
x: let
ws = let
Expand Down Expand Up @@ -45,9 +45,6 @@ in {

"$mod, bracketleft, workspace, m-1"
"$mod, bracketright, workspace, m+1"

"$mod SHIFT, bracketleft, focusmonitor, l"
"$mod SHIFT, bracketright, focusmonitor, r"
]
++ workspaces;

Expand Down
84 changes: 40 additions & 44 deletions home/modules/windowManager/hyprland/config/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,92 +7,88 @@
wayland.windowManager.hyprland.settings = let
pointer = config.home.pointerCursor;
in {
env = [
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
];

exec-once = [
"hyprctl setcursor ${pointer.name} ${toString pointer.size}"
];

input = {
kb_layout = "us";

follow_mouse = 1;
touchpad = {
natural_scroll = true;
};

sensitivity = 0;
};

general = {
gaps_in = 5;
gaps_out = 5;
border_size = 1;
"col.active_border" = "rgba(88888888)";
"col.inactive_border" = "rgba(00000088)";

allow_tearing = true;
"col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
"col.inactive_border" = "rgba(595959aa)";

layout = "dwindle";

allow_tearing = false;
};

decoration = {
rounding = 16;
rounding = 8;
blur = {
enabled = true;
brightness = 1.0;
contrast = 1.0;
noise = 0.02;

passes = 3;
size = 10;
size = 8;
passes = 4;
};

drop_shadow = true;
drop_shadow = false;
shadow_ignore_window = true;
shadow_offset = "0 2";
shadow_range = 20;
shadow_render_power = 3;
"col.shadow" = "rgba(00000055)";
};

animations = {
enabled = true;
animation = [
"border, 1, 2, default"
"fade, 1, 4, default"
"windows, 1, 3, default, popin 80%"
"workspaces, 1, 2, default, slide"
];
};

group = {
groupbar = {
font_size = 16;
gradients = false;
};
# first_launch_animation = false;

"col.active_border" = "rgba(33 ccffee)";
"col.inactive_border" = "rgba(595959 aa)";
};
bezier = [
"smoothOut, 0.36, 0, 0.66, -0.56"
"smoothIn, 0.25, 1, 0.5, 1"
"overshot, 0.4,0.8,0.2,1.2"
];

input = {
kb_layout = "us";
animation = [
"windows, 1, 4, overshot, slide"
"windowsOut, 1, 4, smoothOut, slide"
"border,1,10,default"

follow_mouse = 1;
accel_profile = "flat";
touchpad.scroll_factor = 0.1;
"fade, 1, 10, smoothIn"
"fadeDim, 1, 10, smoothIn"
"workspaces,1,4,overshot,slidevert"
];
};

dwindle = {
pseudotile = true;
preserve_split = true;
};

master = {
new_is_master = true;
};

misc = {
disable_autoreload = true;
force_default_wallpaper = 0;
animate_mouse_windowdragging = false;
vrr = 1;
};

gestures = {
workspace_swipe = true;
workspace_swipe_forever = true;
# workspace_swipe_forever = true;
};

xwayland.force_zero_scaling = true;

debug.disable_logs = false;
};

wayland.windowManager.hyprland.extraConfig = ''
Expand Down
6 changes: 2 additions & 4 deletions home/modules/windowManager/hyprland/config/rules.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{config, ...}: {
{
wayland.windowManager.hyprland.settings = {
layerrule = let
layers = "^(bar|gtk-layer-shell)$";
in [
layerrule = [
"blur, ^(gtk-layer-shell)$"
"blur, bar"
"blur, notifications"
Expand Down
1 change: 0 additions & 1 deletion home/modules/windowManager/hyprland/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
inputs,
lib,
pkgs,
...
}: {
Expand Down
1 change: 0 additions & 1 deletion home/profiles/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
self,
inputs,
withSystem,
module_args,
Expand Down
10 changes: 8 additions & 2 deletions hosts/yuki/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
config,
lib,
pkgs,
self,
...
}: let
MHz = x: x * 1000;
Expand Down Expand Up @@ -30,7 +29,14 @@ in {

loader = {
efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
grub = {
enable = true;
device = "nodev";
efiSupport = true;
useOSProber = true;
configurationLimit = 3;
gfxmodeEfi = "1920x1080";
};
};
};

Expand Down
4 changes: 1 addition & 3 deletions modules/desktop.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
pkgs,
lib,
self,
inputs,
...
}: {
fonts = {
Expand Down Expand Up @@ -31,7 +29,7 @@
"Iosevka Nerd Font"
"Noto Color Emoji"
];
sansSerif = ["Lexend" "Noto Color Emoji"];
sansSerif = ["Dosis" "Noto Color Emoji"];
serif = ["Noto Serif" "Noto Color Emoji"];
emoji = ["Noto Color Emoji"];
};
Expand Down
18 changes: 6 additions & 12 deletions modules/network.nix
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
{
config,
pkgs,
lib,
...
}: {
environment.systemPackages = with pkgs; [speedtest-cli bandwhich];
networking = {
networkmanager = {
enable = true;
dns = "systemd-resolved";
wifi.powersave = true;
wifi = {
macAddress = "random";
powersave = true;
};
};
};

services = {
avahi = {
enable = true;
nssmdns4 = true;
publish = {
enable = true;
domain = true;
userServices = true;
};
};

openssh = {
enable = true;
settings.UseDns = true;
Expand Down
6 changes: 1 addition & 5 deletions pkgs/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
systems = ["x86_64-linux"];

perSystem = {
pkgs,
inputs',
...
}: {
perSystem = {pkgs, ...}: {
packages = {
firefox-gnome-theme = pkgs.callPackage ./firefox-gnome-theme {};
};
Expand Down

0 comments on commit 2d95883

Please sign in to comment.