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 = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
|
||||
|
||||
catppuccin.url = "github:catppuccin/nix";
|
||||
|
||||
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";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixos-hardware, agenix, spicetify-nix, nix-index-database, lix-module, ... } @ inputs: {
|
||||
nixosConfigurations.rhea-laptop = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
inherit spicetify-nix;
|
||||
inherit agenix;
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@
|
|||
enable = true;
|
||||
catppuccin.enable = true;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
services.blueman-applet.enable = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
|
||||
extraSpecialArgs = {
|
||||
extraSpecialArgs = {
|
||||
inherit spicetify-nix;
|
||||
inherit agenix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@
|
|||
enableZshIntegration = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@
|
|||
|
||||
preset = "Gracefu's Edits";
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,13 +102,14 @@
|
|||
|
||||
"$mod" = "SUPER";
|
||||
|
||||
bind = let
|
||||
alacritty = lib.getExe pkgs.alacritty;
|
||||
hyprshot = lib.getExe pkgs.hyprshot;
|
||||
wofi = lib.getExe pkgs.wofi;
|
||||
swaylock = lib.getExe pkgs.swaylock;
|
||||
workspaces = ["1" "2" "3" "4" "5" "6" "7" "8" "9"];
|
||||
in
|
||||
bind =
|
||||
let
|
||||
alacritty = lib.getExe pkgs.alacritty;
|
||||
hyprshot = lib.getExe pkgs.hyprshot;
|
||||
wofi = lib.getExe pkgs.wofi;
|
||||
swaylock = lib.getExe pkgs.swaylock;
|
||||
workspaces = [ "1" "2" "3" "4" "5" "6" "7" "8" "9" ];
|
||||
in
|
||||
[
|
||||
# Main binds
|
||||
"$mod SHIFT,M,exit,"
|
||||
|
|
@ -160,27 +161,31 @@
|
|||
++ (map (n: "$mod,${n},workspace,${n}") workspaces)
|
||||
++ (map (n: "$mod SHIFT,${n},movetoworkspacesilent,${n}") workspaces);
|
||||
|
||||
bindel = let
|
||||
brightnessctl = lib.getExe' pkgs.brightnessctl "brightnessctl";
|
||||
wpctl = lib.getExe' pkgs.wireplumber "wpctl";
|
||||
in [
|
||||
", XF86AudioRaiseVolume, 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"
|
||||
", XF86MonBrightnessUp,exec, ${brightnessctl} s 5%+"
|
||||
", XF86MonBrightnessDown,exec, ${brightnessctl} s 5%-"
|
||||
];
|
||||
bindel =
|
||||
let
|
||||
brightnessctl = lib.getExe' pkgs.brightnessctl "brightnessctl";
|
||||
wpctl = lib.getExe' pkgs.wireplumber "wpctl";
|
||||
in
|
||||
[
|
||||
", XF86AudioRaiseVolume, 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"
|
||||
", XF86MonBrightnessUp,exec, ${brightnessctl} s 5%+"
|
||||
", XF86MonBrightnessDown,exec, ${brightnessctl} s 5%-"
|
||||
];
|
||||
|
||||
bindl = let
|
||||
playerctl = lib.getExe' pkgs.playerctl "playerctl";
|
||||
swaylock = lib.getExe pkgs.swaylock;
|
||||
in [
|
||||
", XF86AudioPrev, exec, ${playerctl} previous"
|
||||
", XF86AudioPlay, exec, ${playerctl} play-pause"
|
||||
", XF86AudioNext, exec, ${playerctl} next"
|
||||
", switch:on:Lid Switch, exec, ${swaylock}"
|
||||
", switch:on:Lid Switch, exec, systemctl suspend"
|
||||
];
|
||||
bindl =
|
||||
let
|
||||
playerctl = lib.getExe' pkgs.playerctl "playerctl";
|
||||
swaylock = lib.getExe pkgs.swaylock;
|
||||
in
|
||||
[
|
||||
", XF86AudioPrev, exec, ${playerctl} previous"
|
||||
", XF86AudioPlay, exec, ${playerctl} play-pause"
|
||||
", XF86AudioNext, exec, ${playerctl} next"
|
||||
", switch:on:Lid Switch, exec, ${swaylock}"
|
||||
", switch:on:Lid Switch, exec, systemctl suspend"
|
||||
];
|
||||
|
||||
bindm = [
|
||||
"$mod, mouse:272, movewindow"
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
services.gnome-keyring = {
|
||||
enable = true;
|
||||
|
||||
components = ["secrets" "pkcs11" "ssh"];
|
||||
components = [ "secrets" "pkcs11" "ssh" ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ inputs, pkgs, config, spicetify-nix, ... }:
|
||||
{
|
||||
programs.spicetify =
|
||||
let
|
||||
spicePkgs = spicetify-nix.legacyPackages.${pkgs.system};
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
enabledExtensions = with spicePkgs.extensions; [
|
||||
shuffle
|
||||
trashbin
|
||||
featureShuffle
|
||||
history
|
||||
oneko
|
||||
];
|
||||
theme = spicePkgs.themes.text;
|
||||
};
|
||||
}
|
||||
let
|
||||
spicePkgs = spicetify-nix.legacyPackages.${pkgs.system};
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
enabledExtensions = with spicePkgs.extensions; [
|
||||
shuffle
|
||||
trashbin
|
||||
featureShuffle
|
||||
history
|
||||
oneko
|
||||
];
|
||||
theme = spicePkgs.themes.text;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,4 +27,4 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,35 +3,35 @@
|
|||
enable = true;
|
||||
|
||||
settings = {
|
||||
color="1e1e2e";
|
||||
bs-hl-color="f5e0dc";
|
||||
caps-lock-bs-hl-color="f5e0dc";
|
||||
caps-lock-key-hl-color="a6e3a1";
|
||||
inside-color="00000000";
|
||||
inside-clear-color="00000000";
|
||||
inside-caps-lock-color="00000000";
|
||||
inside-ver-color="00000000";
|
||||
inside-wrong-color="00000000";
|
||||
key-hl-color="a6e3a1";
|
||||
layout-bg-color="00000000";
|
||||
layout-border-color="00000000";
|
||||
layout-text-color="cdd6f4";
|
||||
line-color="00000000";
|
||||
line-clear-color="00000000";
|
||||
line-caps-lock-color="00000000";
|
||||
line-ver-color="00000000";
|
||||
line-wrong-color="00000000";
|
||||
ring-color="b4befe";
|
||||
ring-clear-color="f5e0dc";
|
||||
ring-caps-lock-color="fab387";
|
||||
ring-ver-color="89b4fa";
|
||||
ring-wrong-color="eba0ac";
|
||||
separator-color="00000000";
|
||||
text-color="cdd6f4";
|
||||
text-clear-color="f5e0dc";
|
||||
text-caps-lock-color="fab387";
|
||||
text-ver-color="89b4fa";
|
||||
text-wrong-color="eba0ac";
|
||||
color = "1e1e2e";
|
||||
bs-hl-color = "f5e0dc";
|
||||
caps-lock-bs-hl-color = "f5e0dc";
|
||||
caps-lock-key-hl-color = "a6e3a1";
|
||||
inside-color = "00000000";
|
||||
inside-clear-color = "00000000";
|
||||
inside-caps-lock-color = "00000000";
|
||||
inside-ver-color = "00000000";
|
||||
inside-wrong-color = "00000000";
|
||||
key-hl-color = "a6e3a1";
|
||||
layout-bg-color = "00000000";
|
||||
layout-border-color = "00000000";
|
||||
layout-text-color = "cdd6f4";
|
||||
line-color = "00000000";
|
||||
line-clear-color = "00000000";
|
||||
line-caps-lock-color = "00000000";
|
||||
line-ver-color = "00000000";
|
||||
line-wrong-color = "00000000";
|
||||
ring-color = "b4befe";
|
||||
ring-clear-color = "f5e0dc";
|
||||
ring-caps-lock-color = "fab387";
|
||||
ring-ver-color = "89b4fa";
|
||||
ring-wrong-color = "eba0ac";
|
||||
separator-color = "00000000";
|
||||
text-color = "cdd6f4";
|
||||
text-clear-color = "f5e0dc";
|
||||
text-caps-lock-color = "fab387";
|
||||
text-ver-color = "89b4fa";
|
||||
text-wrong-color = "eba0ac";
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@
|
|||
automount = true;
|
||||
notify = true;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,45 +4,45 @@
|
|||
enable = true;
|
||||
|
||||
style = ''
|
||||
window {
|
||||
margin: 0px;
|
||||
border: 1px solid #88c0d0;
|
||||
background-color: #2e3440;
|
||||
}
|
||||
window {
|
||||
margin: 0px;
|
||||
border: 1px solid #88c0d0;
|
||||
background-color: #2e3440;
|
||||
}
|
||||
|
||||
#input {
|
||||
margin: 5px;
|
||||
border: none;
|
||||
color: #d8dee9;
|
||||
background-color: #3b4252;
|
||||
}
|
||||
#input {
|
||||
margin: 5px;
|
||||
border: none;
|
||||
color: #d8dee9;
|
||||
background-color: #3b4252;
|
||||
}
|
||||
|
||||
#inner-box {
|
||||
margin: 5px;
|
||||
border: none;
|
||||
background-color: #2e3440;
|
||||
}
|
||||
#inner-box {
|
||||
margin: 5px;
|
||||
border: none;
|
||||
background-color: #2e3440;
|
||||
}
|
||||
|
||||
#outer-box {
|
||||
margin: 5px;
|
||||
border: none;
|
||||
background-color: #2e3440;
|
||||
}
|
||||
#outer-box {
|
||||
margin: 5px;
|
||||
border: none;
|
||||
background-color: #2e3440;
|
||||
}
|
||||
|
||||
#scroll {
|
||||
margin: 0px;
|
||||
border: none;
|
||||
}
|
||||
#scroll {
|
||||
margin: 0px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
#text {
|
||||
margin: 5px;
|
||||
border: none;
|
||||
color: #d8dee9;
|
||||
}
|
||||
#text {
|
||||
margin: 5px;
|
||||
border: none;
|
||||
color: #d8dee9;
|
||||
}
|
||||
|
||||
#entry:selected {
|
||||
background-color: #3b4252;
|
||||
}
|
||||
'';
|
||||
#entry:selected {
|
||||
background-color: #3b4252;
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
|
||||
|
||||
autocd = true;
|
||||
shellAliases = {
|
||||
os-update = "nh os switch /home/rhea/nix-config/";
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
time = {
|
||||
disabled = false;
|
||||
format = ''\[[$time]($style)\]'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@
|
|||
};
|
||||
|
||||
services.blueman.enable = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@
|
|||
|
||||
programs.zsh.enable = true;
|
||||
|
||||
environment.sessionVariables = {
|
||||
environment.sessionVariables = {
|
||||
NIXOS_OZONE_WL = "1";
|
||||
};
|
||||
|
||||
|
||||
# Enable Flakes
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,4 +13,4 @@
|
|||
./diskservices.nix
|
||||
./bluetooth.nix
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
services.gvfs.enable = true;
|
||||
services.udisks2.enable = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
environment.pathsToLink = [ "/share/zsh" ];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ...}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.fprintd = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
|
||||
|
|
@ -14,19 +15,20 @@
|
|||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-label/nix-root";
|
||||
{
|
||||
device = "/dev/disk/by-label/nix-root";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-label/EFI";
|
||||
{
|
||||
device = "/dev/disk/by-label/EFI";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
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
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@
|
|||
networking.firewall = {
|
||||
allowedUDPPorts = [ 51820 ]; # Clients and peers can use the same port, see listenport
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,17 +3,17 @@
|
|||
security.polkit.enable = true;
|
||||
|
||||
systemd = {
|
||||
user.services.polkit-gnome-authentication-agent-1 = {
|
||||
description = "polkit-gnome-authentication-agent-1";
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
wants = [ "graphical-session.target" ];
|
||||
serviceConfig = {
|
||||
user.services.polkit-gnome-authentication-agent-1 = {
|
||||
description = "polkit-gnome-authentication-agent-1";
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
wants = [ "graphical-session.target" ];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 1;
|
||||
TimeoutStopSec = 10;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@
|
|||
services.power-profiles-daemon = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@ in
|
|||
"sign_etwas.age".publicKeys = [ rhea-laptop ];
|
||||
"fbda_wg_priv_key.age".publicKeys = [ rhea-laptop ];
|
||||
"fbda_wg_psk.age".publicKeys = [ rhea-laptop ];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue