formatted nix files using alejandra

This commit is contained in:
pagedmov
2024-10-31 22:33:10 -04:00
parent c6d381fc58
commit 495d90b0de
45 changed files with 1537 additions and 1504 deletions

View File

@@ -52,8 +52,9 @@
scheme_string = builtins.readFile scheme_path; scheme_string = builtins.readFile scheme_path;
scheme_list = lib.splitString "\n" "${scheme_string}"; scheme_list = lib.splitString "\n" "${scheme_string}";
colors = lib.filter (line: builtins.match "^ *base[0-9A-F]{2}: .*" line != null) scheme_list; colors = lib.filter (line: builtins.match "^ *base[0-9A-F]{2}: .*" line != null) scheme_list;
scheme = lib.lists.foldl' (acc: line: scheme =
let lib.lists.foldl' (
acc: line: let
splitLine = lib.splitString ": " line; splitLine = lib.splitString ": " line;
key = builtins.elemAt splitLine 0; key = builtins.elemAt splitLine 0;
value = builtins.elemAt splitLine 1; value = builtins.elemAt splitLine 1;
@@ -63,7 +64,8 @@
cleanValue_final = builtins.substring 1 (builtins.stringLength cleanValue_step2 - 2) cleanValue_step2; cleanValue_final = builtins.substring 1 (builtins.stringLength cleanValue_step2 - 2) cleanValue_step2;
in in
acc // {"${trimmedKey}" = cleanValue_final;} acc // {"${trimmedKey}" = cleanValue_final;}
) {} colors; ) {}
colors;
in { in {
nixosConfigurations = { nixosConfigurations = {
oganesson = nixpkgs.lib.nixosSystem { oganesson = nixpkgs.lib.nixosSystem {

View File

@@ -1,4 +1,8 @@
{pkgs, username, ...}: { {
pkgs,
username,
...
}: {
system.stateVersion = "24.05"; system.stateVersion = "24.05";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix = { nix = {

View File

@@ -5,11 +5,13 @@
}: { }: {
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
(nerdfonts.override { fonts = [ (nerdfonts.override {
fonts = [
"JetBrainsMono" "JetBrainsMono"
"CascadiaCode" "CascadiaCode"
"NerdFontsSymbolsOnly" "NerdFontsSymbolsOnly"
]; }) ];
})
]; ];
gtk = { gtk = {

View File

@@ -2,17 +2,18 @@
username, username,
host, host,
... ...
}: }: let
desktop = host == "oganesson";
let screenshot_bind =
desktop = (host == "oganesson"); if desktop
screenshot_bind = if desktop then [ # My laptop does not have a printscreen button then [
# My laptop does not have a printscreen button
"super, print, exec, grimblast copy area" "super, print, exec, grimblast copy area"
] else [ ]
else [
"super, insert, exec, grimblast copy area" "super, insert, exec, grimblast copy area"
]; ];
in in {
{
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
settings = { settings = {
monitor = monitor =
@@ -168,7 +169,8 @@ in
"workspaces, 1, 4, easeOutCubic, fade" # styles: slide, slidevert, fade, slidefade, slidefadevert "workspaces, 1, 4, easeOutCubic, fade" # styles: slide, slidevert, fade, slidefade, slidefadevert
]; ];
bind = [ bind =
[
"super, up, exec, pactl set-sink-volume @default_sink@ +10%" "super, up, exec, pactl set-sink-volume @default_sink@ +10%"
"super, down, exec, pactl set-sink-volume @default_sink@ -10%" "super, down, exec, pactl set-sink-volume @default_sink@ -10%"
"super, t, exec, swaync-client -t -sw" "super, t, exec, swaync-client -t -sw"
@@ -207,7 +209,8 @@ in
"super shift, 6, movetoworkspace, 6" "super shift, 6, movetoworkspace, 6"
"super, s, togglespecialworkspace, magic" "super, s, togglespecialworkspace, magic"
"super shift, s, movetoworkspace, special:magic" "super shift, s, movetoworkspace, special:magic"
] ++ screenshot_bind; ]
++ screenshot_bind;
bindm = [ bindm = [
"super, mouse:272, movewindow" "super, mouse:272, movewindow"
"super, mouse:273, resizewindow" "super, mouse:273, resizewindow"

View File

@@ -2,8 +2,7 @@
inputs, inputs,
host, host,
... ...
}: }: {
{
imports = imports =
[(import ./hyprland.nix)] [(import ./hyprland.nix)]
++ [(import ./config.nix)]; ++ [(import ./config.nix)];

View File

@@ -3,9 +3,7 @@
scheme, scheme,
wallpaper, wallpaper,
... ...
}: }: {
{
stylix = { stylix = {
enable = true; enable = true;
autoEnable = true; autoEnable = true;

View File

@@ -2,9 +2,8 @@
pkgs, pkgs,
host, host,
... ...
}: }: let
let desktop = host == "oganesson";
desktop = (host == "oganesson");
extraFigletFonts = pkgs.fetchFromGitHub { extraFigletFonts = pkgs.fetchFromGitHub {
owner = "xero"; owner = "xero";
repo = "figlet-fonts"; repo = "figlet-fonts";

View File

@@ -1,7 +1,4 @@
{ {host, ...}:
host,
...
}:
# Grocery list: # Grocery list:
# Clock # Clock
# CPU/MEM meters # CPU/MEM meters
@@ -11,7 +8,7 @@ host,
# secondary monitor will have a vertical bar on the left side # secondary monitor will have a vertical bar on the left side
# Can contain more info with two bars # Can contain more info with two bars
let let
desktop = (host == "oganesson"); desktop = host == "oganesson";
workspaces = { workspaces = {
format = "{icon}"; format = "{icon}";
format-icons = { format-icons = {
@@ -22,22 +19,26 @@ let
"5" = ""; "5" = "";
"6" = ""; "6" = "";
}; };
persistent-workspaces = if desktop then { persistent-workspaces =
if desktop
then {
"HDMI-A-1" = [1 2 3]; "HDMI-A-1" = [1 2 3];
"DP-1" = [4 5 6]; "DP-1" = [4 5 6];
} else { }
else {
"eDP-1" = [1 2 3 4]; "eDP-1" = [1 2 3 4];
}; };
}; };
monitors = if desktop then [ monitors =
if desktop
then [
"DP-1" "DP-1"
"HDMI-A-1" "HDMI-A-1"
] else [ ]
else [
"eDP-1" "eDP-1"
]; ];
in {
in
{
programs.waybar.settings.mainBar = { programs.waybar.settings.mainBar = {
layer = "bottom"; layer = "bottom";
output = builtins.elemAt monitors 0; output = builtins.elemAt monitors 0;
@@ -45,7 +46,10 @@ in
name = "mainBar"; name = "mainBar";
margin-left = 8; margin-left = 8;
margin-top = 5; margin-top = 5;
margin-right = if desktop then 8 else 5; margin-right =
if desktop
then 8
else 5;
mode = "dock"; mode = "dock";
"gtk-layer-shell" = true; "gtk-layer-shell" = true;
@@ -121,7 +125,15 @@ in
rotate = 270; rotate = 270;
format = "{icon}"; format = "{icon}";
format-icons = [ format-icons = [
"󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥" "󰝦"
"󰪞"
"󰪟"
"󰪠"
"󰪡"
"󰪢"
"󰪣"
"󰪤"
"󰪥"
]; ];
}; };
@@ -130,7 +142,15 @@ in
rotate = 270; rotate = 270;
format = "{icon}"; format = "{icon}";
format-icons = [ format-icons = [
"󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥" "󰝦"
"󰪞"
"󰪟"
"󰪠"
"󰪡"
"󰪢"
"󰪣"
"󰪤"
"󰪥"
]; ];
max-length = 10; max-length = 10;
tooltip-format = "RAM: {used:0.1f} GB / {total:0.1f} GB"; tooltip-format = "RAM: {used:0.1f} GB / {total:0.1f} GB";
@@ -141,7 +161,15 @@ in
rotate = 270; rotate = 270;
format = "{icon}"; format = "{icon}";
format-icons = [ format-icons = [
"󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥" "󰝦"
"󰪞"
"󰪟"
"󰪠"
"󰪡"
"󰪢"
"󰪣"
"󰪤"
"󰪥"
]; ];
tooltip-format = "CPU: {usage:0.1f}%"; tooltip-format = "CPU: {usage:0.1f}%";
}; };
@@ -182,15 +210,16 @@ in
format = "{:%I:%M %p}"; format = "{:%I:%M %p}";
tooltip = false; tooltip = false;
}; };
}; };
# ------------------------------------------ # ------------------------------------------
programs.waybar.settings.sideBar = { programs.waybar.settings.sideBar = {
layer = "bottom"; layer = "bottom";
output = if desktop then builtins.elemAt monitors 1 else builtins.elemAt monitors 0; output =
if desktop
then builtins.elemAt monitors 1
else builtins.elemAt monitors 0;
position = "right"; position = "right";
margin-top = 8; margin-top = 8;
margin-right = 5; margin-right = 5;
@@ -199,9 +228,12 @@ in
mode = "dock"; mode = "dock";
"gtk-layer-shell" = true; "gtk-layer-shell" = true;
modules-left = if desktop then [ modules-left =
if desktop
then [
"hyprland/workspaces" "hyprland/workspaces"
] else [ ]
else [
"group/brightness" "group/brightness"
"battery" "battery"
]; ];
@@ -257,7 +289,15 @@ in
tooltip-format-charging = "{capacity}%\nTil full: {time}"; tooltip-format-charging = "{capacity}%\nTil full: {time}";
format = "{icon}"; format = "{icon}";
format-icons = [ format-icons = [
"󰁺" "󰁻" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" "󰁺"
"󰁻"
"󰁽"
"󰁾"
"󰁿"
"󰂀"
"󰂁"
"󰂂"
"󰁹"
]; ];
format-charging = "󰂄"; format-charging = "󰂄";
}; };

View File

@@ -1,9 +1,4 @@
{ {scheme, ...}: let
scheme,
...
}:
let
bg = { bg = {
darkester = scheme.base00; darkester = scheme.base00;
darkest = scheme.base01; darkest = scheme.base01;
@@ -26,8 +21,7 @@ let
color6 = scheme.base0E; color6 = scheme.base0E;
color7 = scheme.base0F; color7 = scheme.base0F;
}; };
in in {
{
programs.waybar.style = '' programs.waybar.style = ''
* { * {
border: none; border: none;

View File

@@ -1,6 +1,4 @@
{ self, ...}: {self, ...}: {
{
home.file.".config/neofetch/config.conf".text = '' home.file.".config/neofetch/config.conf".text = ''
username=$(whoami) username=$(whoami)
name_length=''${#username} name_length=''${#username}

View File

@@ -9,7 +9,7 @@
home-manager, home-manager,
... ...
}: let }: let
desktop = (host == "onagesson"); desktop = host == "onagesson";
desktop_modules = desktop_modules =
if desktop if desktop
then [(import ./gaming)] then [(import ./gaming)]

View File

@@ -1,8 +1,11 @@
{pkgs, scheme, ...}: { {
pkgs,
scheme,
...
}: {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
settings = { settings = {
confirm_os_window_close = 0; confirm_os_window_close = 0;
window_padding_width = 4; window_padding_width = 4;

View File

@@ -1,5 +1,4 @@
{pkgs, ...}: {pkgs, ...}:
pkgs.writeShellScriptBin "toolbelt" '' pkgs.writeShellScriptBin "toolbelt" ''
hostname=$(cat /etc/hostname) hostname=$(cat /etc/hostname)

View File

@@ -1,7 +1,4 @@
{ {pkgs}:
pkgs,
}:
pkgs.writeShellScriptBin "viconf" '' pkgs.writeShellScriptBin "viconf" ''
#!/usr/bin/env bash #!/usr/bin/env bash

View File

@@ -1,5 +1,4 @@
{pkgs}: {pkgs}:
pkgs.writeShellScriptBin "chpaper" '' pkgs.writeShellScriptBin "chpaper" ''
paper="$\{self}/assets/wallpapers/$(find "$FLAKEPATH"/assets/wallpapers -exec basename {} \; | rg "\.\w+$" | fzf --preview "chafa -s 30x40 $FLAKEPATH/assets/wallpapers/{}")" paper="$\{self}/assets/wallpapers/$(find "$FLAKEPATH"/assets/wallpapers -exec basename {} \; | rg "\.\w+$" | fzf --preview "chafa -s 30x40 $FLAKEPATH/assets/wallpapers/{}")"
[ "$paper" = "$\{self}/assets/wallpapers/" ] && echo "Cancelling wallpaper change" && exit 1 [ "$paper" = "$\{self}/assets/wallpapers/" ] && echo "Cancelling wallpaper change" && exit 1

View File

@@ -1,6 +1,4 @@
{ {pkgs}:
pkgs,
}:
pkgs.writeShellScriptBin "chscheme" '' pkgs.writeShellScriptBin "chscheme" ''
selected_scheme=$(/usr/bin/env ls "$(nix-build '<nixpkgs>' -A base16-schemes)"/share/themes | \ selected_scheme=$(/usr/bin/env ls "$(nix-build '<nixpkgs>' -A base16-schemes)"/share/themes | \
sed 's/\.yaml//g' | \ sed 's/\.yaml//g' | \

View File

@@ -1,5 +1,4 @@
{pkgs}: {pkgs}:
pkgs.writeShellScriptBin "moveonscreen" '' pkgs.writeShellScriptBin "moveonscreen" ''
center_window=false center_window=false
if [[ $1 == "--center" ]]; then if [[ $1 == "--center" ]]; then

View File

@@ -1,3 +1,8 @@
{config,inputs,scheme,wallpaper,username,...}: {
config,
{} inputs,
scheme,
wallpaper,
username,
...
}: {}

View File

@@ -1,6 +1,9 @@
{ config, pkgs, username, ... }:
{ {
config,
pkgs,
username,
...
}: {
systemd.user.tmpfiles.users."${username}".rules = [ systemd.user.tmpfiles.users."${username}".rules = [
"d /home/${username}/media 0770 ${username} users -" "d /home/${username}/media 0770 ${username} users -"
"d /home/${username}/backup 0770 ${username} users -" "d /home/${username}/backup 0770 ${username} users -"
@@ -10,6 +13,4 @@
"d /home/${username}/inbox 0770 ${username} users -" "d /home/${username}/inbox 0770 ${username} users -"
"d /home/${username}/outbox 0770 ${username} users -" "d /home/${username}/outbox 0770 ${username} users -"
]; ];
} }

View File

@@ -14,4 +14,3 @@
../home/home-manager.nix ../home/home-manager.nix
]; ];
} }

View File

@@ -1,6 +1,4 @@
{ ... }: {...}: {
{
environment.etc."issue".text = '' environment.etc."issue".text = ''
\e[38;5;27m \e[38;5;81m \e[38;5;27m \e[38;5;81m

View File

@@ -4,7 +4,8 @@
config, config,
... ...
}: { }: {
environment.systemPackages = [( environment.systemPackages = [
(
pkgs.catppuccin-sddm.override { pkgs.catppuccin-sddm.override {
flavor = "mocha"; flavor = "mocha";
font = "JetBrains Mono Nerd Font"; font = "JetBrains Mono Nerd Font";
@@ -12,7 +13,8 @@
loginBackground = true; loginBackground = true;
background = "${self}/assets/wallpapers/dark-waves.jpg"; background = "${self}/assets/wallpapers/dark-waves.jpg";
} }
)]; )
];
services.displayManager.sddm = { services.displayManager.sddm = {
enable = true; enable = true;
wayland.enable = true; wayland.enable = true;

View File

@@ -3,9 +3,7 @@
scheme, scheme,
wallpaper, wallpaper,
... ...
}: }: {
{
stylix = { stylix = {
enable = true; enable = true;
base16Scheme = scheme; base16Scheme = scheme;

View File

@@ -1,4 +1,3 @@
{ {
inputs, inputs,
nixpkgs, nixpkgs,
@@ -13,4 +12,3 @@
[(import ./bootloader.nix)] [(import ./bootloader.nix)]
++ [(import ./network.nix)]; ++ [(import ./network.nix)];
} }

View File

@@ -1,8 +1,6 @@
{host, ...}: {host, ...}: let
let desktop = host == "oganesson";
desktop = (host == "oganesson"); in {
in
{
networking = { networking = {
networkmanager.enable = true; networkmanager.enable = true;
hostName = hostName =

View File

@@ -6,14 +6,13 @@
username, username,
host, host,
... ...
}: }: let
let desktop = host == "oganesson";
desktop = (host == "oganesson"); desktop_modules =
desktop_modules = if desktop then if desktop
[(import ./virtualization.nix)] ++ [(import ./gaming)] then [(import ./virtualization.nix)] ++ [(import ./gaming)]
else []; else [];
in in {
{
imports = imports =
[(import ./packages.nix)] [(import ./packages.nix)]
++ [(import ./programs.nix)] ++ [(import ./programs.nix)]

View File

@@ -1,6 +1,4 @@
{ ... }: {...}: {
{
imports = imports =
[(import ./steam.nix)] [(import ./steam.nix)]
++ [(import ./gaming_pkgs.nix)]; ++ [(import ./gaming_pkgs.nix)];

View File

@@ -1,6 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
snes9x-gtk snes9x-gtk
]; ];

View File

@@ -1,6 +1,8 @@
{ scheme, config, ... }:
{ {
scheme,
config,
...
}: {
programs.nixvim = { programs.nixvim = {
colorschemes.base16 = { colorschemes.base16 = {
enable = true; enable = true;

View File

@@ -1,4 +1,4 @@
{pkgs, ...}: { {...}: {
services = { services = {
pipewire = { pipewire = {
enable = true; enable = true;
@@ -11,6 +11,9 @@
dbus.enable = true; dbus.enable = true;
mullvad-vpn.enable = true; mullvad-vpn.enable = true;
blueman.enable = true; blueman.enable = true;
openssh.enable = true; openssh = {
enable = true;
allowSFTP = true;
};
}; };
} }