switch to nixpkgs-fmt

This commit is contained in:
Adithya 2023-03-29 21:48:55 +05:30
parent 7cb7479433
commit 85645f37f9
Signed by: adtya
GPG key ID: 48FC9915FFD326D0
43 changed files with 291 additions and 278 deletions

View file

@ -21,17 +21,20 @@
}; };
}; };
outputs = { outputs =
self, { self
nixpkgs, , nixpkgs
home-manager, , home-manager
impermanence, , impermanence
lanzaboote, , lanzaboote
} @ inputs: let ,
} @ inputs:
let
system = "x86_64-linux"; system = "x86_64-linux";
lib = nixpkgs.lib; lib = nixpkgs.lib;
in { in
formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra; {
formatter.${system} = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
nixosConfigurations = { nixosConfigurations = {
Skipper = lib.nixosSystem { Skipper = lib.nixosSystem {
specialArgs = inputs; specialArgs = inputs;

View file

@ -1,10 +1,11 @@
{ { impermanence
impermanence, , pkgs
pkgs, , ...
... }:
}: let let
user = import ../users/user.nix; user = import ../users/user.nix;
in { in
{
programs.fuse.userAllowOther = true; programs.fuse.userAllowOther = true;
fileSystems."/home/${user.primary.userName}" = { fileSystems."/home/${user.primary.userName}" = {

View file

@ -1,6 +1,8 @@
{pkgs, ...}: let { pkgs, ... }:
let
user = import ../users/user.nix; user = import ../users/user.nix;
in { in
{
imports = [ imports = [
./nvim.nix ./nvim.nix
]; ];

View file

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

View file

@ -1,11 +1,13 @@
{pkgs, ...}: let { pkgs, ... }:
let
dracula = pkgs.fetchFromGitHub { dracula = 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,11 +1,12 @@
{ { osConfig
osConfig, , pkgs
pkgs, , ...
... }:
}: let let
notify-send = "${pkgs.libnotify}/bin/notify-send"; notify-send = "${pkgs.libnotify}/bin/notify-send";
dmenu = "${pkgs.rofi-wayland}/bin/rofi -dmenu"; dmenu = "${pkgs.rofi-wayland}/bin/rofi -dmenu";
in { in
{
xdg.configFile = { xdg.configFile = {
"scripts/power_menu.sh" = { "scripts/power_menu.sh" = {
executable = true; executable = true;
@ -42,9 +43,11 @@ in {
''; '';
}; };
"scripts/volume_up.sh" = let "scripts/volume_up.sh" =
let
wpctl = "${pkgs.wireplumber}/bin/wpctl"; wpctl = "${pkgs.wireplumber}/bin/wpctl";
in { in
{
executable = true; executable = true;
text = '' text = ''
#!/bin/sh #!/bin/sh
@ -56,10 +59,12 @@ in {
''; '';
}; };
"scripts/tmux_sessions.sh" = let "scripts/tmux_sessions.sh" =
let
kitty = "${pkgs.kitty}/bin/kitty"; kitty = "${pkgs.kitty}/bin/kitty";
tmux = "${pkgs.tmux}/bin/tmux"; tmux = "${pkgs.tmux}/bin/tmux";
in { in
{
executable = true; executable = true;
text = '' text = ''
#!/bin/sh #!/bin/sh
@ -75,11 +80,13 @@ in {
;; ;;
esac''; esac'';
}; };
"scripts/power_profile.sh" = let "scripts/power_profile.sh" =
let
sudo = "/run/wrappers/bin/sudo"; sudo = "/run/wrappers/bin/sudo";
cpupower = "${osConfig.boot.kernelPackages.cpupower}/bin/cpupower"; cpupower = "${osConfig.boot.kernelPackages.cpupower}/bin/cpupower";
powerprofilesctl = "${pkgs.power-profiles-daemon}/bin/powerprofilesctl"; powerprofilesctl = "${pkgs.power-profiles-daemon}/bin/powerprofilesctl";
in { in
{
executable = true; executable = true;
text = '' text = ''
#!/bin/sh #!/bin/sh

View file

@ -1,8 +1,7 @@
{ { config
config, , lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
imports = [ imports = [
./gnome-keyring.nix ./gnome-keyring.nix
@ -85,7 +84,8 @@
}; };
}; };
wayland.windowManager.sway.config.keybindings = let wayland.windowManager.sway.config.keybindings =
let
modifier = config.wayland.windowManager.sway.config.modifier; modifier = config.wayland.windowManager.sway.config.modifier;
in in
lib.mkOptionDefault { lib.mkOptionDefault {

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,8 +1,8 @@
{ { lib
lib, , pkgs
pkgs, , ...
... }:
}: let let
gtkTheme = { gtkTheme = {
name = "Dracula"; name = "Dracula";
package = pkgs.dracula-gtk; package = pkgs.dracula-gtk;
@ -20,7 +20,8 @@
name = "Bibata-Modern-Classic"; name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
}; };
in { in
{
gtk.enable = true; gtk.enable = true;
gtk.theme = gtkTheme; gtk.theme = gtkTheme;
home.sessionVariables.GTK_THEME = gtkTheme.name; home.sessionVariables.GTK_THEME = gtkTheme.name;

View file

@ -1,7 +1,6 @@
{ { config
config, , pkgs
pkgs, , ...
...
}: { }: {
programs.waybar.enable = true; programs.waybar.enable = true;
programs.waybar.systemd.enable = true; programs.waybar.systemd.enable = true;
@ -90,9 +89,11 @@
"tray" = { "tray" = {
"spacing" = 4; "spacing" = 4;
}; };
"custom/power_profile" = let "custom/power_profile" =
let
script = "${config.xdg.configHome}/scripts/power_profile.sh"; script = "${config.xdg.configHome}/scripts/power_profile.sh";
in { in
{
exec = "${script} icon"; exec = "${script} icon";
on-click = "${script} toggle"; on-click = "${script} toggle";
format = "{}"; format = "{}";

View file

@ -1,7 +1,6 @@
{ { config
config, , pkgs
pkgs, , ...
...
}: { }: {
imports = [ imports = [
./kitty.nix ./kitty.nix

View file

@ -1,7 +1,6 @@
{ pkgs, ... }: { { pkgs, ... }: {
programs.tmux = { programs.tmux = {
enable = true; enable = true;
shell = "${pkgs.zsh}/bin/zsh";
escapeTime = 0; escapeTime = 0;
plugins = with pkgs; [ plugins = with pkgs; [
{ {

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,7 +1,7 @@
{ { lib
lib, , stdenvNoCC
stdenvNoCC, , fetchFromGitHub
fetchFromGitHub, ,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "catppuccin-wallpapers"; pname = "catppuccin-wallpapers";

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,13 +1,13 @@
{ { lib
lib, , stdenvNoCC
stdenvNoCC, , fetchFromGitHub
fetchFromGitHub, , gtk3
gtk3, , gnome
gnome, , gnome-icon-theme
gnome-icon-theme, , hicolor-icon-theme
hicolor-icon-theme, , panel ? "dark"
panel ? "dark", , folder ? "default"
folder ? "default", ,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "newaita-icon-theme"; pname = "newaita-icon-theme";

View file

@ -1,8 +1,7 @@
{ { config
config, , lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
imports = [ imports = [
./filesystem.nix ./filesystem.nix

View file

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

View file

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

View file

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

View file

@ -1,6 +1,8 @@
{pkgs, ...}: let { pkgs, ... }:
let
user = import ./user.nix; user = import ./user.nix;
in { in
{
services.getty.autologinUser = user.primary.userName; services.getty.autologinUser = user.primary.userName;
users.mutableUsers = false; users.mutableUsers = false;
users.users = { users.users = {