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
10
flake.nix
10
flake.nix
|
|
@ -3,14 +3,14 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
|
|
||||||
catppuccin.url = "github:catppuccin/nix";
|
catppuccin.url = "github:catppuccin/nix";
|
||||||
|
|
||||||
agenix.url = "github:ryantm/agenix";
|
agenix.url = "github:ryantm/agenix";
|
||||||
|
|
@ -30,11 +30,11 @@
|
||||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
|
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixos-hardware, agenix, spicetify-nix, nix-index-database, lix-module, ... } @ inputs: {
|
outputs = { self, nixpkgs, nixos-hardware, agenix, spicetify-nix, nix-index-database, lix-module, ... } @ inputs: {
|
||||||
nixosConfigurations.rhea-laptop = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.rhea-laptop = nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
inherit spicetify-nix;
|
inherit spicetify-nix;
|
||||||
inherit agenix;
|
inherit agenix;
|
||||||
|
|
|
||||||
|
|
@ -3,4 +3,4 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
catppuccin.enable = true;
|
catppuccin.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
services.blueman-applet.enable = true;
|
services.blueman-applet.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
|
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit spicetify-nix;
|
inherit spicetify-nix;
|
||||||
inherit agenix;
|
inherit agenix;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -4,4 +4,4 @@
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
nix-direnv.enable = true;
|
nix-direnv.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,4 +5,4 @@
|
||||||
|
|
||||||
preset = "Gracefu's Edits";
|
preset = "Gracefu's Edits";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -102,13 +102,14 @@
|
||||||
|
|
||||||
"$mod" = "SUPER";
|
"$mod" = "SUPER";
|
||||||
|
|
||||||
bind = let
|
bind =
|
||||||
alacritty = lib.getExe pkgs.alacritty;
|
let
|
||||||
hyprshot = lib.getExe pkgs.hyprshot;
|
alacritty = lib.getExe pkgs.alacritty;
|
||||||
wofi = lib.getExe pkgs.wofi;
|
hyprshot = lib.getExe pkgs.hyprshot;
|
||||||
swaylock = lib.getExe pkgs.swaylock;
|
wofi = lib.getExe pkgs.wofi;
|
||||||
workspaces = ["1" "2" "3" "4" "5" "6" "7" "8" "9"];
|
swaylock = lib.getExe pkgs.swaylock;
|
||||||
in
|
workspaces = [ "1" "2" "3" "4" "5" "6" "7" "8" "9" ];
|
||||||
|
in
|
||||||
[
|
[
|
||||||
# Main binds
|
# Main binds
|
||||||
"$mod SHIFT,M,exit,"
|
"$mod SHIFT,M,exit,"
|
||||||
|
|
@ -160,27 +161,31 @@
|
||||||
++ (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 =
|
||||||
brightnessctl = lib.getExe' pkgs.brightnessctl "brightnessctl";
|
let
|
||||||
wpctl = lib.getExe' pkgs.wireplumber "wpctl";
|
brightnessctl = lib.getExe' pkgs.brightnessctl "brightnessctl";
|
||||||
in [
|
wpctl = lib.getExe' pkgs.wireplumber "wpctl";
|
||||||
", XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+"
|
in
|
||||||
", XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
[
|
||||||
" ,XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
", XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+"
|
||||||
", XF86MonBrightnessUp,exec, ${brightnessctl} s 5%+"
|
", XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||||
", XF86MonBrightnessDown,exec, ${brightnessctl} s 5%-"
|
" ,XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||||
];
|
", XF86MonBrightnessUp,exec, ${brightnessctl} s 5%+"
|
||||||
|
", XF86MonBrightnessDown,exec, ${brightnessctl} s 5%-"
|
||||||
|
];
|
||||||
|
|
||||||
bindl = let
|
bindl =
|
||||||
playerctl = lib.getExe' pkgs.playerctl "playerctl";
|
let
|
||||||
swaylock = lib.getExe pkgs.swaylock;
|
playerctl = lib.getExe' pkgs.playerctl "playerctl";
|
||||||
in [
|
swaylock = lib.getExe pkgs.swaylock;
|
||||||
", XF86AudioPrev, exec, ${playerctl} previous"
|
in
|
||||||
", XF86AudioPlay, exec, ${playerctl} play-pause"
|
[
|
||||||
", XF86AudioNext, exec, ${playerctl} next"
|
", XF86AudioPrev, exec, ${playerctl} previous"
|
||||||
", switch:on:Lid Switch, exec, ${swaylock}"
|
", XF86AudioPlay, exec, ${playerctl} play-pause"
|
||||||
", switch:on:Lid Switch, exec, systemctl suspend"
|
", XF86AudioNext, exec, ${playerctl} next"
|
||||||
];
|
", switch:on:Lid Switch, exec, ${swaylock}"
|
||||||
|
", switch:on:Lid Switch, exec, systemctl suspend"
|
||||||
|
];
|
||||||
|
|
||||||
bindm = [
|
bindm = [
|
||||||
"$mod, mouse:272, movewindow"
|
"$mod, mouse:272, movewindow"
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,6 @@
|
||||||
services.gnome-keyring = {
|
services.gnome-keyring = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
components = ["secrets" "pkcs11" "ssh"];
|
components = [ "secrets" "pkcs11" "ssh" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,18 @@
|
||||||
{ inputs, pkgs, config, spicetify-nix, ... }:
|
{ inputs, pkgs, config, spicetify-nix, ... }:
|
||||||
{
|
{
|
||||||
programs.spicetify =
|
programs.spicetify =
|
||||||
let
|
let
|
||||||
spicePkgs = spicetify-nix.legacyPackages.${pkgs.system};
|
spicePkgs = spicetify-nix.legacyPackages.${pkgs.system};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
enabledExtensions = with spicePkgs.extensions; [
|
enabledExtensions = with spicePkgs.extensions; [
|
||||||
shuffle
|
shuffle
|
||||||
trashbin
|
trashbin
|
||||||
featureShuffle
|
featureShuffle
|
||||||
history
|
history
|
||||||
oneko
|
oneko
|
||||||
];
|
];
|
||||||
theme = spicePkgs.themes.text;
|
theme = spicePkgs.themes.text;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,4 +27,4 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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,4 +4,4 @@
|
||||||
automount = true;
|
automount = true;
|
||||||
notify = true;
|
notify = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
autocd = true;
|
autocd = true;
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
os-update = "nh os switch /home/rhea/nix-config/";
|
os-update = "nh os switch /home/rhea/nix-config/";
|
||||||
|
|
@ -104,7 +104,7 @@
|
||||||
time = {
|
time = {
|
||||||
disabled = false;
|
disabled = false;
|
||||||
format = ''\[[$time]($style)\]'';
|
format = ''\[[$time]($style)\]'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,4 +5,4 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
services.blueman.enable = true;
|
services.blueman.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,10 +55,10 @@
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
NIXOS_OZONE_WL = "1";
|
NIXOS_OZONE_WL = "1";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable Flakes
|
# Enable Flakes
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,4 +13,4 @@
|
||||||
./diskservices.nix
|
./diskservices.nix
|
||||||
./bluetooth.nix
|
./bluetooth.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
services.gvfs.enable = true;
|
services.gvfs.enable = true;
|
||||||
services.udisks2.enable = true;
|
services.udisks2.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
environment.pathsToLink = [ "/share/zsh" ];
|
environment.pathsToLink = [ "/share/zsh" ];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
allowedUDPPorts = [ 51820 ]; # Clients and peers can use the same port, see listenport
|
allowedUDPPorts = [ 51820 ]; # Clients and peers can use the same port, see listenport
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,17 +3,17 @@
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
|
|
||||||
systemd = {
|
systemd = {
|
||||||
user.services.polkit-gnome-authentication-agent-1 = {
|
user.services.polkit-gnome-authentication-agent-1 = {
|
||||||
description = "polkit-gnome-authentication-agent-1";
|
description = "polkit-gnome-authentication-agent-1";
|
||||||
wantedBy = [ "graphical-session.target" ];
|
wantedBy = [ "graphical-session.target" ];
|
||||||
wants = [ "graphical-session.target" ];
|
wants = [ "graphical-session.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
|
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
RestartSec = 1;
|
RestartSec = 1;
|
||||||
TimeoutStopSec = 10;
|
TimeoutStopSec = 10;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
}
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -2,4 +2,4 @@
|
||||||
services.power-profiles-daemon = {
|
services.power-profiles-daemon = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@ in
|
||||||
"sign_etwas.age".publicKeys = [ rhea-laptop ];
|
"sign_etwas.age".publicKeys = [ rhea-laptop ];
|
||||||
"fbda_wg_priv_key.age".publicKeys = [ rhea-laptop ];
|
"fbda_wg_priv_key.age".publicKeys = [ rhea-laptop ];
|
||||||
"fbda_wg_psk.age".publicKeys = [ rhea-laptop ];
|
"fbda_wg_psk.age".publicKeys = [ rhea-laptop ];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue