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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,5 +1,4 @@
{pkgs}:
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/" ] && echo "Cancelling wallpaper change" && exit 1

View File

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

View File

@@ -1,5 +1,4 @@
{pkgs}:
pkgs.writeShellScriptBin "moveonscreen" ''
center_window=false
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 = [
"d /home/${username}/media 0770 ${username} users -"
"d /home/${username}/backup 0770 ${username} users -"
@@ -10,6 +13,4 @@
"d /home/${username}/inbox 0770 ${username} users -"
"d /home/${username}/outbox 0770 ${username} users -"
];
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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