reformat with nixpkgs-fmt

This commit is contained in:
Adithya 2023-11-04 16:12:45 +05:30
parent 26a9022f4b
commit 24ae3a3bc1
Signed by: adtya
GPG key ID: 48FC9915FFD326D0
79 changed files with 344 additions and 333 deletions

View file

@ -1,7 +1,6 @@
{ { nixpkgs
nixpkgs, , pkgs
pkgs, , ...
...
}: { }: {
environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath; environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
nix = { nix = {

View file

@ -1,10 +1,11 @@
{ { pkgs
pkgs, , secrets
secrets, , ...
... }:
}: let let
user = secrets.users; user = secrets.users;
in { in
{
users.mutableUsers = false; users.mutableUsers = false;
users.users = { users.users = {
root = { root = {

View file

@ -60,18 +60,20 @@
}; };
}; };
outputs = { outputs =
self, { self
nixpkgs, , nixpkgs
flake-utils, , flake-utils
home-manager, , home-manager
impermanence, , impermanence
lanzaboote, , lanzaboote
nixvim, , nixvim
www, , www
wiki, , wiki
if3, , if3
} @ inputs: let ,
} @ inputs:
let
secrets = import ./secrets.nix; secrets = import ./secrets.nix;
nixpkgs-config = { nixpkgs-config = {
allowUnfree = true; allowUnfree = true;
@ -150,13 +152,14 @@
}; };
} }
// flake-utils.lib.eachDefaultSystem ( // flake-utils.lib.eachDefaultSystem (
system: let system:
let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
}; };
in in
with pkgs; { with pkgs; {
formatter = pkgs.alejandra; formatter = nixpkgs-fmt;
devShells.default = mkShell { devShells.default = mkShell {
buildInputs = [ buildInputs = [
git git

View file

@ -1,8 +1,8 @@
{ { lib
lib, , pkgs
pkgs, , ...
... }:
}: let let
gtkTheme = { gtkTheme = {
name = "Dracula"; name = "Dracula";
package = pkgs.dracula-gtk; package = pkgs.dracula-gtk;
@ -17,7 +17,8 @@
name = "Bibata-Modern-Classic"; name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
}; };
in { in
{
gtk = { gtk = {
enable = true; enable = true;
theme = gtkTheme; theme = gtkTheme;

View file

@ -1,7 +1,6 @@
{ { pkgs
pkgs, , osConfig
osConfig, , ...
...
}: { }: {
programs = { programs = {
firefox = { firefox = {

View file

@ -1,6 +1,8 @@
{secrets, ...}: let { secrets, ... }:
let
user = secrets.users; user = secrets.users;
in { in
{
programs.git = { programs.git = {
enable = true; enable = true;
delta = { delta = {

View file

@ -1,11 +1,13 @@
{pkgs, ...}: let { pkgs, ... }:
let
dracula-kitty = pkgs.fetchFromGitHub { dracula-kitty = pkgs.fetchFromGitHub {
owner = "dracula"; owner = "dracula";
repo = "kitty"; repo = "kitty";
rev = "87717a3f00e3dff0fc10c93f5ff535ea4092de70"; rev = "87717a3f00e3dff0fc10c93f5ff535ea4092de70";
hash = "sha256-78PTH9wE6ktuxeIxrPp0ZgRI8ST+eZ3Ok2vW6BCIZkc="; hash = "sha256-78PTH9wE6ktuxeIxrPp0ZgRI8ST+eZ3Ok2vW6BCIZkc=";
}; };
in { in
{
programs.kitty = { programs.kitty = {
enable = true; enable = true;
font.package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }; font.package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; };

View file

@ -1,7 +1,6 @@
{ { config
config, , pkgs
pkgs, , ...
...
}: { }: {
programs.zsh = { programs.zsh = {
enable = true; enable = true;

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , secrets
secrets, , ...
...
}: { }: {
systemd.user.services = { systemd.user.services = {
ariang = { ariang = {

View file

@ -1,7 +1,6 @@
{ { pkgs
pkgs, , secrets
secrets, , ...
...
}: { }: {
services = { services = {
spotifyd = { spotifyd = {

View file

@ -1,11 +1,12 @@
{ { config
config, , pkgs
pkgs, , ...
... }:
}: let let
dmenu = "${config.programs.rofi.package}/bin/rofi -dmenu"; dmenu = "${config.programs.rofi.package}/bin/rofi -dmenu";
firefox = "${config.programs.firefox.package}/bin/firefox"; firefox = "${config.programs.firefox.package}/bin/firefox";
in { in
{
services.dunst = { services.dunst = {
enable = true; enable = true;
iconTheme.name = config.gtk.iconTheme.name; iconTheme.name = config.gtk.iconTheme.name;

View file

@ -1,7 +1,9 @@
{pkgs, ...}: let { pkgs, ... }:
let
swaylock = "${pkgs.swaylock}/bin/swaylock"; swaylock = "${pkgs.swaylock}/bin/swaylock";
hyprctl = "${pkgs.hyprland}/bin/hyprctl"; hyprctl = "${pkgs.hyprland}/bin/hyprctl";
in { in
{
services.swayidle = { services.swayidle = {
enable = true; enable = true;
systemdTarget = "graphical-session.target"; systemdTarget = "graphical-session.target";

View file

@ -1,8 +1,8 @@
{ { config
config, , pkgs
pkgs, , ...
... }:
}: let let
dbus-update-activation-environment = "${pkgs.dbus}/bin/dbus-update-activation-environment"; dbus-update-activation-environment = "${pkgs.dbus}/bin/dbus-update-activation-environment";
brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl"; brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
grim = "${pkgs.grim}/bin/grim"; grim = "${pkgs.grim}/bin/grim";
@ -17,7 +17,8 @@
xdg-user-dir = "${pkgs.xdg-user-dirs}/bin/xdg-user-dir"; xdg-user-dir = "${pkgs.xdg-user-dirs}/bin/xdg-user-dir";
change-wallpaper = "${pkgs.scripts}/bin/chpaper ${config.xdg.userDirs.pictures}/Wallpapers"; change-wallpaper = "${pkgs.scripts}/bin/chpaper ${config.xdg.userDirs.pictures}/Wallpapers";
wallhaven-wallpaper = "${pkgs.scripts}/bin/chpaper \$(${pkgs.scripts}/bin/wallhaven ${config.xdg.userDirs.pictures}/Wallpapers)"; wallhaven-wallpaper = "${pkgs.scripts}/bin/chpaper \$(${pkgs.scripts}/bin/wallhaven ${config.xdg.userDirs.pictures}/Wallpapers)";
in { in
{
home.packages = with pkgs; [ home.packages = with pkgs; [
hyprland hyprland
]; ];

View file

@ -1,7 +1,6 @@
{ { lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
boot = { boot = {
initrd = { initrd = {

View file

@ -1,10 +1,11 @@
{ { pkgs
pkgs, , secrets
secrets, , ...
... }:
}: let let
inherit (secrets) frp_config; inherit (secrets) frp_config;
in { in
{
services.frp = { services.frp = {
enable = true; enable = true;
role = "client"; role = "client";

View file

@ -1,10 +1,11 @@
{ { config
config, , secrets
secrets, , ...
... }:
}: let let
inherit (secrets.wireguard_config) peers; inherit (secrets.wireguard_config) peers;
in { in
{
networking.firewall.trustedInterfaces = [ "wg0" ]; networking.firewall.trustedInterfaces = [ "wg0" ];
networking.wireguard = { networking.wireguard = {
enable = true; enable = true;

View file

@ -1,7 +1,6 @@
{ { lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
boot = { boot = {
initrd = { initrd = {

View file

@ -1,11 +1,12 @@
{ { pkgs
pkgs, , www
www, , secrets
secrets, , ...
... }:
}: let let
system = pkgs.system; system = pkgs.system;
in { in
{
services = { services = {
caddy.virtualHosts."adtya.xyz" = { caddy.virtualHosts."adtya.xyz" = {
serverAliases = [ "www.adtya.xyz" ]; serverAliases = [ "www.adtya.xyz" ];

View file

@ -1,7 +1,6 @@
{ { config
config, , secrets
secrets, , ...
...
}: { }: {
services.caddy = { services.caddy = {
enable = true; enable = true;

View file

@ -1,10 +1,11 @@
{ { pkgs
pkgs, , secrets
secrets, , ...
... }:
}: let let
inherit (secrets) frp_config; inherit (secrets) frp_config;
in { in
{
services.frp = { services.frp = {
enable = true; enable = true;
role = "client"; role = "client";

View file

@ -1,10 +1,11 @@
{ { pkgs
pkgs, , if3
if3, , ...
... }:
}: let let
system = pkgs.system; system = pkgs.system;
in { in
{
services = { services = {
caddy.virtualHosts = { caddy.virtualHosts = {
"if3.adtya.xyz" = { "if3.adtya.xyz" = {

View file

@ -1,7 +1,6 @@
{ { config
config, , secrets
secrets, , ...
...
}: { }: {
services = { services = {
caddy.virtualHosts = { caddy.virtualHosts = {

View file

@ -1,10 +1,11 @@
{ { pkgs
pkgs, , wiki
wiki, , ...
... }:
}: let let
system = pkgs.system; system = pkgs.system;
in { in
{
services = { services = {
caddy.virtualHosts = { caddy.virtualHosts = {
"wiki.adtya.xyz" = { "wiki.adtya.xyz" = {

View file

@ -1,10 +1,11 @@
{ { config
config, , secrets
secrets, , ...
... }:
}: let let
inherit (secrets.wireguard_config) peers; inherit (secrets.wireguard_config) peers;
in { in
{
networking.firewall.trustedInterfaces = [ "wg0" ]; networking.firewall.trustedInterfaces = [ "wg0" ];
networking.wireguard = { networking.wireguard = {
enable = true; enable = true;

View file

@ -1,7 +1,6 @@
{ { lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
imports = [ ./kernel.nix ./filesystem.nix ]; imports = [ ./kernel.nix ./filesystem.nix ];

View file

@ -1,7 +1,6 @@
{ { lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
boot = { boot = {
consoleLogLevel = 3; consoleLogLevel = 3;

View file

@ -1,7 +1,6 @@
{ { lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
boot = { boot = {
bootspec.enable = true; bootspec.enable = true;

View file

@ -1,6 +1,8 @@
{secrets, ...}: let { secrets, ... }:
let
user = secrets.users; user = secrets.users;
in { in
{
imports = [ imports = [
./dbus.nix ./dbus.nix
./keyd.nix ./keyd.nix

View file

@ -1,10 +1,11 @@
{ { config
config, , secrets
secrets, , ...
... }:
}: let let
inherit (secrets.wireguard_config) peers; inherit (secrets.wireguard_config) peers;
in { in
{
networking.firewall.trustedInterfaces = [ "wg0" ]; networking.firewall.trustedInterfaces = [ "wg0" ];
networking.wireguard = { networking.wireguard = {
enable = true; enable = true;

View file

@ -1,9 +1,9 @@
{ { lib
lib, , stdenvNoCC
stdenvNoCC, , fetchFromGitHub
fetchFromGitHub, , pack ? "pack_1"
pack ? "pack_1", , theme ? "cuts"
theme ? "cuts", ,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "adi1090x-plymouth"; pname = "adi1090x-plymouth";

View file

@ -1,10 +1,10 @@
{ { lib
lib, , stdenvNoCC
stdenvNoCC, , fetchFromGitHub
fetchFromGitHub, , gtk3
gtk3, , gnome-themes-extra
gnome-themes-extra, , gtk-engine-murrine
gtk-engine-murrine, ,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "dracula-gtk"; pname = "dracula-gtk";

View file

@ -1,10 +1,10 @@
{ { lib
lib, , fetchFromGitHub
fetchFromGitHub, , makeWrapper
makeWrapper, , stdenvNoCC
stdenvNoCC, , bluez
bluez, , rofi-wayland
rofi-wayland, ,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "rofi-bluetooth"; pname = "rofi-bluetooth";

View file

@ -1,18 +1,18 @@
{ { lib
lib, , stdenvNoCC
stdenvNoCC, , makeWrapper
makeWrapper, , libnotify
libnotify, , rofi-wayland
rofi-wayland, , tmux
tmux, , kitty
kitty, , imagemagick
imagemagick, , hyprland
hyprland, , swww
swww, , jq
jq, , curl
curl, , ytfzf
ytfzf, , libsecret
libsecret, ,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "scripts"; pname = "scripts";