reidlab/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fonts and hyprland

Browse source
This commit is contained in:
Reid 2024-05-06 20:21:00 -07:00
parent 34e16f9ccf
commit abc75f79f8
6 changed files with 51 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

70
flake.lock generated
View file

@ -137,26 +137,26 @@
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang_2",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"systems": "systems_3", "systems": "systems_3",
"wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1714084064, "lastModified": 1715027791,
"narHash": "sha256-WUEFYyOzgWOr6pK2/1fCohUUF77wuj1zIeP8jvPL0LU=", "narHash": "sha256-9wO+A4oOWpf0WtJ/iIzxy1mwXXfWuKHPW+E3wmsCI0k=",
"owner": "hyprwm", "ref": "refs/heads/main",
"repo": "Hyprland", "rev": "0c446ec5f4c39599ea97cb703dd3ac7718fb9169",
"rev": "1d40af64d352bd5a87c7d53a52707fc5cfc6940e", "revCount": 4621,
"type": "github" "submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
}, },
"original": { "original": {
"owner": "hyprwm", "submodules": true,
"repo": "Hyprland", "type": "git",
"type": "github" "url": "https://github.com/hyprwm/Hyprland"
} }
}, },
"hyprland-catppuccin": { "hyprland-catppuccin": {
@ -179,19 +179,21 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"xdph",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"hyprland", "hyprland",
"xdph",
"systems" "systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1691753796, "lastModified": 1714869498,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -340,11 +342,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713989318, "lastModified": 1714755542,
"narHash": "sha256-WSsEQQxZQ+bsAWRhi1iXvP8sxgRyNtY3X1V3CfFdP5Q=", "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "1cfe2d26a82ce794fd33ec06fa022e68501c5a45", "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,11 +423,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1713714899, "lastModified": 1714253743,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -671,29 +673,9 @@
"type": "github" "type": "github"
} }
}, },
"wlroots": {
"flake": false,
"locked": {
"lastModified": 1713731601,
"narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=",
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": "hyprland-protocols",
"hyprland",
"hyprland-protocols"
],
"hyprlang": [ "hyprlang": [
"hyprland", "hyprland",
"hyprlang" "hyprlang"
@ -708,11 +690,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713724432, "lastModified": 1714060055,
"narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=", "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "9ace6f969ce495185df34cc6254fb9d297765478", "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -12,7 +12,7 @@
waybar.url = "github:Alexays/Waybar"; waybar.url = "github:Alexays/Waybar";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
hyprlock.url = "github:hyprwm/hyprlock"; hyprlock.url = "github:hyprwm/hyprlock";
hypridle.url = "github:hyprwm/hypridle"; hypridle.url = "github:hyprwm/hypridle";
hyprpaper.url = "github:hyprwm/hyprpaper"; hyprpaper.url = "github:hyprwm/hyprpaper";

6
modules/desktop/fonts.nix
View file

@ -45,19 +45,19 @@ in {
package = pkgs.cozette; package = pkgs.cozette;
family = "CozetteVector"; family = "CozetteVector";
size = 10; size = 13;
}; };
monospaceBitmap = mkFontOption "bitmap monospace" { monospaceBitmap = mkFontOption "bitmap monospace" {
package = pkgs.cozette; package = pkgs.cozette;
family = "Cozette"; family = "Cozette";
size = 10; size = 13;
}; };
emoji = mkFontOption "emoji" { emoji = mkFontOption "emoji" {
package = pkgs.twitter-color-emoji; package = pkgs.twitter-color-emoji;
family = "Twitter Color Emoji"; family = "Twitter Color Emoji";
size = 10; # not applicable, but whatever size = 13; # not applicable, but whatever
}; };
}; };
}; };

24
modules/desktop/hyprland.nix
View file

@ -62,8 +62,14 @@ in {
"$mod, Q, killactive, " "$mod, Q, killactive, "
"$mod, V, togglefloating, " "$mod, V, togglefloating, "
"$mod, P, pseudo, " "$mod, P, pseudo, " # dwindle
"$mod, J, togglesplit, " "$mod, J, togglesplit, " # dwindle
# move focus with mod + arrow keys
"$mod, left, movefocus, l"
"$mod, right, movefocus, r"
"$mod, up, movefocus, u"
"$mod, down, movefocus, d"
# scroll through workspaces with mod + scroll # scroll through workspaces with mod + scroll
"$mod, mouse_down, workspace, e+1" "$mod, mouse_down, workspace, e+1"
@ -89,12 +95,13 @@ in {
kb_layout = "us"; kb_layout = "us";
follow_mouse = 1; follow_mouse = 1;
sensitivity = 0; # -1.0 - 1.0, 0 means no modification
}; };
monitor= [ monitor= [
"DVI-D-1, 1920x1080@60, 0x0, 1" "DVI-D-1, 1920x1080@60, 0x0, 1"
"DP-2, 1920x1080@60, 1920x0, 1" "DP-2, 1920x1080@60, 1920x0, 1"
# "DP-2, modeline 712.75 3840 4160 4576 5312 2160 2163 2168 2237 -hsync +vsync, 1920x0, 1, bitdepth, 10"
]; ];
exec-once = [ "${lib.getExe pkgs.networkmanagerapplet}" ]; exec-once = [ "${lib.getExe pkgs.networkmanagerapplet}" ];
@ -143,6 +150,10 @@ in {
"workspace 4, class:vesktop" "workspace 4, class:vesktop"
]; ];
layerrule = [
"animation slide, notifications"
];
blurls = [ blurls = [
"gtk-layer-shell" # nwg-drawer "gtk-layer-shell" # nwg-drawer
"waybar" "waybar"
@ -159,8 +170,8 @@ in {
}; };
drop_shadow = false; drop_shadow = false;
#shadow_range = 4; #shadow_range = 30;
#shadow_render_power = true; #shadow_render_power = 3;
}; };
animations = { animations = {
@ -181,8 +192,7 @@ in {
}; };
dwindle = { dwindle = {
pseudotile = "yes"; pseudotile = "yes"; # master swtich for pseudotiling. enabling is mod + P in the keybinds section
preserve_split = "yes"; preserve_split = "yes";
}; };

4
modules/desktop/waybar.nix
View file

@ -26,7 +26,7 @@ in {
mainBar = { mainBar = {
layer = "top"; layer = "top";
position = "top"; position = "top";
#spacing = 4; spacing = 4;
height = 30; height = 30;
margin-top = 6; margin-top = 6;
margin-left = 6; margin-left = 6;
@ -116,7 +116,7 @@ in {
rewrite = { rewrite = {
"(.*) — Mozilla Firefox" = "$1"; # the dash here is SLIGHTLY different. Wow "(.*) — Mozilla Firefox" = "$1"; # the dash here is SLIGHTLY different. Wow
"(.*) - Visual Studio Code" = "$1"; "(.*) - Visual Studio Code" = "$1";
#"(.*\\.nix\\s.*)" = ""; "(.*\\.nix\\s.*)" = " $1";
"(\\S+\\.html\\s.*)" = " $1"; "(\\S+\\.html\\s.*)" = " $1";
"(\\S+\\.css\\s.*)" = " $1"; "(\\S+\\.css\\s.*)" = " $1";
"(\\S+\\.js\\s.*)" = " $1"; "(\\S+\\.js\\s.*)" = " $1";

4
modules/software/editors/vscode.nix
View file

@ -30,10 +30,10 @@ in {
enableUpdateCheck = false; enableUpdateCheck = false;
userSettings = with config.modules.desktop.fonts.fonts; { userSettings = with config.modules.desktop.fonts.fonts; {
"editor.fontFamily" = "'${monospace.family}', monospace"; "editor.fontFamily" = "'${monospace.family}', monospace";
"editor.fontSize" = monospace.size + 3; # needed?? "editor.fontSize" = monospace.size;
"terminal.integrated.fontFamily" = "\"${monospace.family}\""; "terminal.integrated.fontFamily" = "\"${monospace.family}\"";
"terminal.integrated.fontSize" = monospace.size + 3; # needed?? "terminal.integrated.fontSize" = monospace.size;
"telemetry.telemetryLevel" = "off"; "telemetry.telemetryLevel" = "off";