style: let nixpkgs-fmt run over everything
This commit is contained in:
parent
67e495dc4f
commit
99389a2022
25 changed files with 152 additions and 145 deletions
|
|
@ -102,12 +102,13 @@
|
||||||
|
|
||||||
"$mod" = "SUPER";
|
"$mod" = "SUPER";
|
||||||
|
|
||||||
bind = let
|
bind =
|
||||||
|
let
|
||||||
alacritty = lib.getExe pkgs.alacritty;
|
alacritty = lib.getExe pkgs.alacritty;
|
||||||
hyprshot = lib.getExe pkgs.hyprshot;
|
hyprshot = lib.getExe pkgs.hyprshot;
|
||||||
wofi = lib.getExe pkgs.wofi;
|
wofi = lib.getExe pkgs.wofi;
|
||||||
swaylock = lib.getExe pkgs.swaylock;
|
swaylock = lib.getExe pkgs.swaylock;
|
||||||
workspaces = ["1" "2" "3" "4" "5" "6" "7" "8" "9"];
|
workspaces = [ "1" "2" "3" "4" "5" "6" "7" "8" "9" ];
|
||||||
in
|
in
|
||||||
[
|
[
|
||||||
# Main binds
|
# Main binds
|
||||||
|
|
@ -160,10 +161,12 @@
|
||||||
++ (map (n: "$mod,${n},workspace,${n}") workspaces)
|
++ (map (n: "$mod,${n},workspace,${n}") workspaces)
|
||||||
++ (map (n: "$mod SHIFT,${n},movetoworkspacesilent,${n}") workspaces);
|
++ (map (n: "$mod SHIFT,${n},movetoworkspacesilent,${n}") workspaces);
|
||||||
|
|
||||||
bindel = let
|
bindel =
|
||||||
|
let
|
||||||
brightnessctl = lib.getExe' pkgs.brightnessctl "brightnessctl";
|
brightnessctl = lib.getExe' pkgs.brightnessctl "brightnessctl";
|
||||||
wpctl = lib.getExe' pkgs.wireplumber "wpctl";
|
wpctl = lib.getExe' pkgs.wireplumber "wpctl";
|
||||||
in [
|
in
|
||||||
|
[
|
||||||
", XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+"
|
", XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+"
|
||||||
", XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
", XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||||
" ,XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
" ,XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||||
|
|
@ -171,10 +174,12 @@
|
||||||
", XF86MonBrightnessDown,exec, ${brightnessctl} s 5%-"
|
", XF86MonBrightnessDown,exec, ${brightnessctl} s 5%-"
|
||||||
];
|
];
|
||||||
|
|
||||||
bindl = let
|
bindl =
|
||||||
|
let
|
||||||
playerctl = lib.getExe' pkgs.playerctl "playerctl";
|
playerctl = lib.getExe' pkgs.playerctl "playerctl";
|
||||||
swaylock = lib.getExe pkgs.swaylock;
|
swaylock = lib.getExe pkgs.swaylock;
|
||||||
in [
|
in
|
||||||
|
[
|
||||||
", XF86AudioPrev, exec, ${playerctl} previous"
|
", XF86AudioPrev, exec, ${playerctl} previous"
|
||||||
", XF86AudioPlay, exec, ${playerctl} play-pause"
|
", XF86AudioPlay, exec, ${playerctl} play-pause"
|
||||||
", XF86AudioNext, exec, ${playerctl} next"
|
", XF86AudioNext, exec, ${playerctl} next"
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,6 @@
|
||||||
services.gnome-keyring = {
|
services.gnome-keyring = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
components = ["secrets" "pkcs11" "ssh"];
|
components = [ "secrets" "pkcs11" "ssh" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -3,35 +3,35 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
color="1e1e2e";
|
color = "1e1e2e";
|
||||||
bs-hl-color="f5e0dc";
|
bs-hl-color = "f5e0dc";
|
||||||
caps-lock-bs-hl-color="f5e0dc";
|
caps-lock-bs-hl-color = "f5e0dc";
|
||||||
caps-lock-key-hl-color="a6e3a1";
|
caps-lock-key-hl-color = "a6e3a1";
|
||||||
inside-color="00000000";
|
inside-color = "00000000";
|
||||||
inside-clear-color="00000000";
|
inside-clear-color = "00000000";
|
||||||
inside-caps-lock-color="00000000";
|
inside-caps-lock-color = "00000000";
|
||||||
inside-ver-color="00000000";
|
inside-ver-color = "00000000";
|
||||||
inside-wrong-color="00000000";
|
inside-wrong-color = "00000000";
|
||||||
key-hl-color="a6e3a1";
|
key-hl-color = "a6e3a1";
|
||||||
layout-bg-color="00000000";
|
layout-bg-color = "00000000";
|
||||||
layout-border-color="00000000";
|
layout-border-color = "00000000";
|
||||||
layout-text-color="cdd6f4";
|
layout-text-color = "cdd6f4";
|
||||||
line-color="00000000";
|
line-color = "00000000";
|
||||||
line-clear-color="00000000";
|
line-clear-color = "00000000";
|
||||||
line-caps-lock-color="00000000";
|
line-caps-lock-color = "00000000";
|
||||||
line-ver-color="00000000";
|
line-ver-color = "00000000";
|
||||||
line-wrong-color="00000000";
|
line-wrong-color = "00000000";
|
||||||
ring-color="b4befe";
|
ring-color = "b4befe";
|
||||||
ring-clear-color="f5e0dc";
|
ring-clear-color = "f5e0dc";
|
||||||
ring-caps-lock-color="fab387";
|
ring-caps-lock-color = "fab387";
|
||||||
ring-ver-color="89b4fa";
|
ring-ver-color = "89b4fa";
|
||||||
ring-wrong-color="eba0ac";
|
ring-wrong-color = "eba0ac";
|
||||||
separator-color="00000000";
|
separator-color = "00000000";
|
||||||
text-color="cdd6f4";
|
text-color = "cdd6f4";
|
||||||
text-clear-color="f5e0dc";
|
text-clear-color = "f5e0dc";
|
||||||
text-caps-lock-color="fab387";
|
text-caps-lock-color = "fab387";
|
||||||
text-ver-color="89b4fa";
|
text-ver-color = "89b4fa";
|
||||||
text-wrong-color="eba0ac";
|
text-wrong-color = "eba0ac";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -4,45 +4,45 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
style = ''
|
style = ''
|
||||||
window {
|
window {
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
border: 1px solid #88c0d0;
|
border: 1px solid #88c0d0;
|
||||||
background-color: #2e3440;
|
background-color: #2e3440;
|
||||||
}
|
}
|
||||||
|
|
||||||
#input {
|
#input {
|
||||||
margin: 5px;
|
margin: 5px;
|
||||||
border: none;
|
border: none;
|
||||||
color: #d8dee9;
|
color: #d8dee9;
|
||||||
background-color: #3b4252;
|
background-color: #3b4252;
|
||||||
}
|
}
|
||||||
|
|
||||||
#inner-box {
|
#inner-box {
|
||||||
margin: 5px;
|
margin: 5px;
|
||||||
border: none;
|
border: none;
|
||||||
background-color: #2e3440;
|
background-color: #2e3440;
|
||||||
}
|
}
|
||||||
|
|
||||||
#outer-box {
|
#outer-box {
|
||||||
margin: 5px;
|
margin: 5px;
|
||||||
border: none;
|
border: none;
|
||||||
background-color: #2e3440;
|
background-color: #2e3440;
|
||||||
}
|
}
|
||||||
|
|
||||||
#scroll {
|
#scroll {
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
border: none;
|
border: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
#text {
|
#text {
|
||||||
margin: 5px;
|
margin: 5px;
|
||||||
border: none;
|
border: none;
|
||||||
color: #d8dee9;
|
color: #d8dee9;
|
||||||
}
|
}
|
||||||
|
|
||||||
#entry:selected {
|
#entry:selected {
|
||||||
background-color: #3b4252;
|
background-color: #3b4252;
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, ...}:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
services.fprintd = {
|
services.fprintd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
|
||||||
|
|
@ -14,19 +15,20 @@
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-label/nix-root";
|
{
|
||||||
|
device = "/dev/disk/by-label/nix-root";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-label/EFI";
|
{
|
||||||
|
device = "/dev/disk/by-label/EFI";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = [ "fmask=0077" "dmask=0077" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[ { device = "/dev/disk/by-label/swap"; }
|
[{ device = "/dev/disk/by-label/swap"; }];
|
||||||
];
|
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
|
|
||||||
|
|
@ -15,5 +15,5 @@
|
||||||
TimeoutStopSec = 10;
|
TimeoutStopSec = 10;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
Loading…
Reference in a new issue