insects/nix-config
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: format with nixfmt

Browse source
This commit is contained in:
insects 2024-09-22 10:56:40 +02:00
parent 303e982a8e
commit 26ad72592a
47 changed files with 380 additions and 725 deletions
Download patch file Download diff file Expand all files Collapse all files

7
home/features/desktop/1password.nix
View file

@ -1,6 +1 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
_1password-gui
];
}
{ pkgs, ... }: { home.packages = with pkgs; [ _1password-gui ]; }

3
home/features/desktop/alacritty.nix
View file

@ -1,5 +1,4 @@
{ config, lib, ... }:
{
{ config, lib, ... }: {
programs.alacritty = {
enable = true;
settings = {

3
home/features/desktop/default.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{ pkgs, ... }: {
imports = [
./font.nix
./firefox.nix

11
home/features/desktop/firefox.nix
View file

@ -1,9 +1,4 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
fira
];
programs.firefox = {
enable = true;
};
{ pkgs, ... }: {
home.packages = with pkgs; [ fira ];
programs.firefox = { enable = true; };
}

9
home/features/desktop/font.nix
View file

@ -1,10 +1,5 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
recursive
noto-fonts-cjk
noto-fonts-emoji
];
{ pkgs, ... }: {
home.packages = with pkgs; [ recursive noto-fonts-cjk noto-fonts-emoji ];
fontProfiles = {
enable = true;
monospace = {

8
home/features/desktop/games/default.nix
View file

@ -1,7 +1 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
xivlauncher
prismlauncher
];
}
{ pkgs, ... }: { home.packages = with pkgs; [ xivlauncher prismlauncher ]; }

224
home/features/desktop/hyprland/default.nix
View file

@ -1,28 +1,11 @@
{
lib,
config,
pkgs,
...
}:
{
imports = [
../default.nix
../wlr
./swaylock.nix
./swayidle.nix
];
{ lib, config, pkgs, ... }: {
imports = [ ../default.nix ../wlr ./swaylock.nix ./swayidle.nix ];
home.packages = with pkgs; [
grimblast
pamixer
playerctl
];
home.packages = with pkgs; [ grimblast pamixer playerctl ];
wayland.windowManager.hyprland = {
enable = true;
systemd = {
enable = true;
};
systemd = { enable = true; };
settings = {
general = {
@ -32,12 +15,10 @@
};
cursor.inactive_timeout = 4;
device = [
{
name = "royuan-akko-keyboard";
kb_layout = "us_intl";
}
];
device = [{
name = "royuan-akko-keyboard";
kb_layout = "us_intl";
}];
dwindle = {
split_width_multiplier = 1.35;
@ -51,14 +32,8 @@
"ignorezero,^(wofi)$"
];
windowrulev2 =
let
steam = "title:^()$,class:^(steam)$";
in
[
"stayfocused, ${steam}"
"minsize 1 1, ${steam}"
];
windowrulev2 = let steam = "title:^()$,class:^(steam)$";
in [ "stayfocused, ${steam}" "minsize 1 1, ${steam}" ];
decoration = {
active_opacity = 1.0;
@ -109,119 +84,100 @@
];
};
bindm = [
"SUPER,mouse:272,movewindow"
"SUPER,mouse:273,resizewindow"
];
bindm = [ "SUPER,mouse:272,movewindow" "SUPER,mouse:273,resizewindow" ];
bind =
let
terminal = "${pkgs.alacritty}/bin/alacritty";
grimblast = lib.getExe pkgs.grimblast;
workspaces = [
"1"
"2"
"3"
"4"
"5"
];
directions = rec {
left = "l";
right = "r";
up = "u";
down = "d";
h = left;
l = right;
k = up;
j = down;
};
in
[
"SUPER,Return,exec,${terminal}"
"SUPERSHIFT,q,killactive" # exit program
"SUPERSHIFT,e,exit" # exit hyprland
"SUPERSHIFT,r,exec,hyprctl reload" # reload currently running hyprland
bind = let
terminal = "${pkgs.alacritty}/bin/alacritty";
grimblast = lib.getExe pkgs.grimblast;
workspaces = [ "1" "2" "3" "4" "5" ];
directions = rec {
left = "l";
right = "r";
up = "u";
down = "d";
h = left;
l = right;
k = up;
j = down;
};
in [
"SUPER,Return,exec,${terminal}"
"SUPERSHIFT,q,killactive" # exit program
"SUPERSHIFT,e,exit" # exit hyprland
"SUPERSHIFT,r,exec,hyprctl reload" # reload currently running hyprland
"SUPER,s,togglesplit" # horizontal split
"SUPER,f,fullscreen,1" # borderless window
"SUPERSHIFT,f,fullscreen,0" # proper fullscreen
"ALTSHIFT,space,togglefloating" # floating window
"SUPER,s,togglesplit" # horizontal split
"SUPER,f,fullscreen,1" # borderless window
"SUPERSHIFT,f,fullscreen,0" # proper fullscreen
"ALTSHIFT,space,togglefloating" # floating window
"SUPER,minus,splitratio,-0.25" # split gets slightly smaller
"SUPERSHIFT,minus,splitratio,-0.3333333" # split gets smaller
"SUPER,equal,splitratio,0.25" # split gets slightly larger
"SUPERSHIFT,equal,splitratio,0.3333333" # split gets larger
"SUPER,minus,splitratio,-0.25" # split gets slightly smaller
"SUPERSHIFT,minus,splitratio,-0.3333333" # split gets smaller
"SUPER,equal,splitratio,0.25" # split gets slightly larger
"SUPERSHIFT,equal,splitratio,0.3333333" # split gets larger
"SUPER,g,togglegroup" # make a window group
"SUPER,t,lockactivegroup,toggle" # lock/unlock the current group
"SUPER,tab,changegroupactive,f" # switch to next window in group
"SUPERSHIFT,tab,changegroupactive,p" # switch to prev window in group
"SUPER,g,togglegroup" # make a window group
"SUPER,t,lockactivegroup,toggle" # lock/unlock the current group
"SUPER,tab,changegroupactive,f" # switch to next window in group
"SUPERSHIFT,tab,changegroupactive,p" # switch to prev window in group
"SUPER,dead_grave,workspace,previous" # prev workspace
"SUPER,dead_grave,workspace,next" # next workspace
"SUPER,dead_grave,workspace,previous" # prev workspace
"SUPER,dead_grave,workspace,next" # next workspace
"SUPER,u,togglespecialworkspace" # toggle special workspace
"SUPERSHIFT,u,movetoworkspacesilent,special" # move to special workspace
"SUPER,u,togglespecialworkspace" # toggle special workspace
"SUPERSHIFT,u,movetoworkspacesilent,special" # move to special workspace
",Print,exec,${grimblast} --notify --freeze copy area" # screenshot area
"SHIFT,Print,exec,${grimblast} --notify --freeze copy output" # screenshot all
",Print,exec,${grimblast} --notify --freeze copy area" # screenshot area
"SHIFT,Print,exec,${grimblast} --notify --freeze copy output" # screenshot all
",XF86AudioRaiseVolume,exec,pamixer -i 5" # raise volume
",XF86AudioLowerVolume,exec,pamixer -d 5" # lower volume
",XF86AudioPlay,exec,playerctl play-pause" # play/pause
",XF86AudioNext,exec,playerctl next" # next song
",XF86AudioPrev,exec,playerctl previous" # previous song
]
++
# change workspace
(map (n: "SUPER,${n},workspace,name:${n}") workspaces)
++
# move window to workspace
(map (n: "SUPERSHIFT,${n},movetoworkspacesilent,name:${n}") workspaces)
++
# move focus
(lib.mapAttrsToList (key: direction: "SUPER,${key},movefocus,${direction}") directions)
++
# swap windows
(lib.mapAttrsToList (key: direction: "SUPERSHIFT,${key},swapwindow,${direction}") directions)
++
# move windows
(lib.mapAttrsToList (
key: direction: "SUPERCONTROL,${key},movewindoworgroup,${direction}"
) directions)
++
# move monitor focus
(lib.mapAttrsToList (key: direction: "SUPERALT,${key},focusmonitor,${direction}") directions)
++
# move workspace to other monitor
(lib.mapAttrsToList (
key: direction: "SUPERALTSHIFT,${key},movecurrentworkspacetomonitor,${direction}"
) directions)
++
# launcher
(
let
wofi = lib.getExe pkgs.wofi;
in
lib.optionals config.programs.wofi.enable [
"SUPER,Space,exec,${wofi} -S drun -W 20% -H 15%"
"SHIFTSUPER,Space,exec,${wofi} -S run -W 20% -H 15%"
]
);
",XF86AudioRaiseVolume,exec,pamixer -i 5" # raise volume
",XF86AudioLowerVolume,exec,pamixer -d 5" # lower volume
",XF86AudioPlay,exec,playerctl play-pause" # play/pause
",XF86AudioNext,exec,playerctl next" # next song
",XF86AudioPrev,exec,playerctl previous" # previous song
] ++
# change workspace
(map (n: "SUPER,${n},workspace,name:${n}") workspaces) ++
# move window to workspace
(map (n: "SUPERSHIFT,${n},movetoworkspacesilent,name:${n}") workspaces) ++
# move focus
(lib.mapAttrsToList
(key: direction: "SUPER,${key},movefocus,${direction}") directions) ++
# swap windows
(lib.mapAttrsToList
(key: direction: "SUPERSHIFT,${key},swapwindow,${direction}")
directions) ++
# move windows
(lib.mapAttrsToList
(key: direction: "SUPERCONTROL,${key},movewindoworgroup,${direction}")
directions) ++
# move monitor focus
(lib.mapAttrsToList
(key: direction: "SUPERALT,${key},focusmonitor,${direction}")
directions) ++
# move workspace to other monitor
(lib.mapAttrsToList (key: direction:
"SUPERALTSHIFT,${key},movecurrentworkspacetomonitor,${direction}")
directions) ++
# launcher
(let wofi = lib.getExe pkgs.wofi;
in lib.optionals config.programs.wofi.enable [
"SUPER,Space,exec,${wofi} -S drun -W 20% -H 15%"
"SHIFTSUPER,Space,exec,${wofi} -S run -W 20% -H 15%"
]);
monitor = map (
m:
monitor = map (m:
"${m.name},${
if m.enabled then
"${toString m.width}x${toString m.height}@${toString m.refreshRate},${m.position},${m.scale}"
"${toString m.width}x${toString m.height}@${
toString m.refreshRate
},${m.position},${m.scale}"
else
"disable"
}"
) config.monitors;
}") config.monitors;
workspace = map (m: "name:${m.workspace},monitor:${m.name}") (
lib.filter (m: m.enabled && m.workspace != null) config.monitors
);
workspace = map (m: "name:${m.workspace},monitor:${m.name}")
(lib.filter (m: m.enabled && m.workspace != null) config.monitors);
};
};
}

16
home/features/desktop/hyprland/swayidle.nix
View file

@ -1,17 +1,13 @@
{ config, ... }:
let
swaylock = "${config.programs.swaylock.package}/bin/swaylock";
in
{
let swaylock = "${config.programs.swaylock.package}/bin/swaylock";
in {
services.swayidle = {
enable = true;
systemdTarget = "graphical-session.target";
events = [
{
event = "before-sleep";
command = "${swaylock} --daemonize";
}
];
events = [{
event = "before-sleep";
command = "${swaylock} --daemonize";
}];
# timeouts = [
# {
# timeout = 4 * 60;

7
home/features/desktop/hyprland/swaylock.nix
View file

@ -1,10 +1,7 @@
{ pkgs, ... }:
{
{ pkgs, ... }: {
programs.swaylock = {
enable = true;
package = pkgs.swaylock-effects;
settings = {
effect-blur = "20x3";
};
settings = { effect-blur = "20x3"; };
};
}

6
home/features/desktop/irc.nix
View file

@ -1,5 +1 @@
{ pkgs, ... }: {
home.packages = with pkgs; [
quassel
];
}
{ pkgs, ... }: { home.packages = with pkgs; [ quassel ]; }

7
home/features/desktop/obs.nix
View file

@ -1,9 +1,6 @@
{ pkgs, ... }:
{
{ pkgs, ... }: {
programs.obs-studio = {
enable = true;
plugins = with pkgs.obs-studio-plugins; [
obs-tuna
];
plugins = with pkgs.obs-studio-plugins; [ obs-tuna ];
};
}

7
home/features/desktop/vscode.nix
View file

@ -1,6 +1 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
vscode
];
}
{ pkgs, ... }: { home.packages = with pkgs; [ vscode ]; }

17
home/features/desktop/wlr/default.nix
View file

@ -1,10 +1,5 @@
{ pkgs, ... }:
{
imports = [
./mako.nix
./wofi.nix
./waybar.nix
];
{ pkgs, ... }: {
imports = [ ./mako.nix ./wofi.nix ./waybar.nix ];
home.packages = with pkgs; [
wf-recorder
@ -19,12 +14,6 @@
xdg.portal = {
enable = true;
extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
config = {
common = {
default = [
"wlr"
];
};
};
config = { common = { default = [ "wlr" ]; }; };
};
}

3
home/features/desktop/wlr/mako.nix
View file

@ -1,5 +1,4 @@
{ config, lib, ... }:
{
{ config, lib, ... }: {
services.mako = {
enable = true;
font = lib.mkForce "${config.fontProfiles.regular.family} 12";

136
home/features/desktop/wlr/waybar.nix
View file

@ -1,10 +1,6 @@
{ config, pkgs, ... }:
{
{ config, pkgs, ... }: {
# additional deps for cava support
home.packages = with pkgs; [
iniparser
fftw
];
home.packages = with pkgs; [ iniparser fftw ];
systemd.user.services.waybar = {
Unit.StartLimitBurst = 30;
@ -21,40 +17,19 @@
margin-top = 10;
margin-left = 20;
margin-right = 20;
modules-left = [
"hyprland/workspaces"
"hyprland/language"
];
modules-left = [ "hyprland/workspaces" "hyprland/language" ];
modules-center = [
"cpu"
"clock"
"memory"
];
modules-center = [ "cpu" "clock" "memory" ];
modules-right = [
"mpris"
"network"
"pulseaudio"
"battery"
"tray"
];
modules-right = [ "mpris" "network" "pulseaudio" "battery" "tray" ];
cpu = {
format = "CPU {usage}%";
};
cpu = { format = "CPU {usage}%"; };
memory = {
format = "MEM {}%";
};
memory = { format = "MEM {}%"; };
tray = {
spacing = 10;
};
tray = { spacing = 10; };
pulseaudio = {
format = "AUD {volume}%";
};
pulseaudio = { format = "AUD {volume}%"; };
network = {
format = "NET {ipaddr}";
@ -74,63 +49,60 @@
};
};
style =
let
inherit (config.lib.stylix.colors) withHashtag;
in
''
* {
font-family: ${config.fontProfiles.bitmap.family}, ${config.fontProfiles.monospace.family};
font-size: 11pt;
padding: 0;
}
style = let inherit (config.lib.stylix.colors) withHashtag;
in ''
* {
font-family: ${config.fontProfiles.bitmap.family}, ${config.fontProfiles.monospace.family};
font-size: 11pt;
padding: 0;
}
window#waybar {
padding: 0;
border-radius: 0.5em;
}
window#waybar {
padding: 0;
border-radius: 0.5em;
}
#workspaces {
transition: background-color .5s, color .5s;
}
#workspaces {
transition: background-color .5s, color .5s;
}
#workspaces button {
padding: 0 6px;
}
#workspaces button {
padding: 0 6px;
}
#workspaces button.active,
#workspaces button.focused {
background-color: ${withHashtag.base05};
color: ${withHashtag.base00};
}
#workspaces button.active,
#workspaces button.focused {
background-color: ${withHashtag.base05};
color: ${withHashtag.base00};
}
#cpu,
#memory {
color: ${withHashtag.base04};
}
#cpu,
#memory {
color: ${withHashtag.base04};
}
#mpris {
font-size: 10pt;
margin-right: 6px;
}
#mpris {
font-size: 10pt;
margin-right: 6px;
}
#tray {
padding: 0 5px;
background-color: ${withHashtag.base02};
}
#tray {
padding: 0 5px;
background-color: ${withHashtag.base02};
}
#pulseaudio {
color: ${withHashtag.base0D};
}
#pulseaudio {
color: ${withHashtag.base0D};
}
#network {
color: ${withHashtag.base0C};
}
#network {
color: ${withHashtag.base0C};
}
#language {
color: ${withHashtag.base02};
margin-left: 10px;
}
'';
#language {
color: ${withHashtag.base02};
margin-left: 10px;
}
'';
};
}

3
home/features/desktop/wlr/wofi.nix
View file

@ -1,5 +1,4 @@
{ config, lib, ... }:
{
{ config, lib, ... }: {
programs.wofi = {
enable = true;
settings = {