Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
mrtnvgr committed Oct 25, 2023
1 parent ae7010b commit 681a84e
Show file tree
Hide file tree
Showing 34 changed files with 228 additions and 109 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
on:
push:
workflow_dispatch:

jobs:
main:
runs-on: ubuntu-latest

steps:
- name: Checkout repo
uses: actions/checkout@v4

- uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixos-unstable

- name: Format files with nixpkgs-fmt
run: nix-shell -p nixpkgs-fmt --run "nixpkgs-fmt ."

- name: Commit changes
uses: EndBug/add-and-commit@v9
with:
message: "chore: format"
default_author: user_info
committer_name: GitHub Actions
committer_email: 41898282+github-actions[bot]@users.noreply.github.com
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

My NixOS flake

## Hosts
## Hosts

- **nixie** - personal laptop

Expand All @@ -25,4 +25,4 @@ sudo nixos-rebuild switch --flake .

## Notes

- If you installed REAPER, run `winetricks-reaper-setup` script after the first reboot.
- If you enabled REAPER, run `winetricks-reaper-setup` script after the first reboot.
64 changes: 64 additions & 0 deletions TODO
Original file line number Diff line number Diff line change
@@ -1,5 +1,69 @@
# TODO

mako/default.nix: backgroundColor = "#${colors.base00}";
mako/default.nix: textColor = "#${colors.base05}";
mako/default.nix: borderColor = "#${colors.base0C}";
mako/default.nix: progressColor = "over #${colors.base02}";
waybar/default.nix: background-color: #${config.colorScheme.colors.base08};
waybar/default.nix: background-color: #${config.colorScheme.colors.base00};
waybar/default.nix: color: #${config.colorScheme.colors.base05};
waybar/default.nix: border: 2px solid #${config.colorScheme.colors.base0D};
waybar/default.nix: color: #${config.colorScheme.colors.base08};
waybar/default.nix: background-color: #${config.colorScheme.colors.base08};
waybar/default.nix: color: #${config.colorScheme.colors.base00};
waybar/default.nix: color: #${config.colorScheme.colors.base0C};
waybar/default.nix: background-color: #${config.colorScheme.colors.base0C};
waybar/default.nix: color: #${config.colorScheme.colors.base00};
waybar/default.nix: color: #${config.colorScheme.colors.base0D};
waybar/default.nix: background-color: #${config.colorScheme.colors.base0D};
waybar/default.nix: color: #${config.colorScheme.colors.base00};
waybar/default.nix: color: #${config.colorScheme.colors.base0E};
waybar/default.nix: background-color: #${config.colorScheme.colors.base0E};
waybar/default.nix: color: #${config.colorScheme.colors.base00};
waybar/default.nix: color: #${config.colorScheme.colors.base05};
waybar/default.nix: background-color: #${config.colorScheme.colors.base00};
waybar/default.nix: border: 2px solid #${config.colorScheme.colors.base0D};
waybar/default.nix: color: #${config.colorScheme.colors.base05};
waybar/default.nix: color: #${config.colorScheme.colors.base0D};
waybar/default.nix: color: #${config.colorScheme.colors.base00};
waybar/default.nix: background-color: #${config.colorScheme.colors.base0E};
waybar/default.nix: background-color: #${config.colorScheme.colors.base04};
waybar/default.nix: background-color: #${config.colorScheme.colors.base08};
waybar/default.nix: background-color: #${config.colorScheme.colors.base04};
waybar/default.nix: background-color: #${config.colorScheme.colors.base0C};
waybar/default.nix: background-color: #${config.colorScheme.colors.base0D};
waybar/default.nix: background-color: #${config.colorScheme.colors.base0E};
foot/default.nix: cursor.color = "${colors.base00} ${colors.base05}";
foot/default.nix: background = "${colors.base00}";
foot/default.nix: foreground = "${colors.base05}";
foot/default.nix: regular0 = "${colors.base00}";
foot/default.nix: regular1 = "${colors.base08}";
foot/default.nix: regular2 = "${colors.base0B}";
foot/default.nix: regular3 = "${colors.base0A}";
foot/default.nix: regular4 = "${colors.base0D}";
foot/default.nix: regular5 = "${colors.base0E}";
foot/default.nix: regular6 = "${colors.base07}";
foot/default.nix: regular7 = "${colors.base05}";
foot/default.nix: bright0 = "${colors.base03}";
foot/default.nix: bright1 = "${colors.base08}";
foot/default.nix: bright2 = "${colors.base0B}";
foot/default.nix: bright3 = "${colors.base0A}";
foot/default.nix: bright4 = "${colors.base0D}";
foot/default.nix: bright5 = "${colors.base0E}";
foot/default.nix: bright6 = "${colors.base07}";
foot/default.nix: bright7 = "${colors.base05}";
hyprland/default.nix: "col.active_border" = "rgb(${colors.base0D}) rgb(${colors.base0C}) 45deg";
hyprland/default.nix: "col.inactive_border" = "rgb(${colors.base03})";
hyprland/default.nix: decoration."col.shadow" = "rgb(${colors.base01})";
hyprland/default.nix: misc."background_color" = "rgb(${colors.base00})";
hyprland/default.nix: backgroundColor = "#${colors.base00}";
hyprland/default.nix: color0 = "#${colors.base08}";
hyprland/default.nix: color1 = "#${colors.base0A}";
hyprland/default.nix: color2 = "#${colors.base0B}";
hyprland/default.nix: color3 = "#${colors.base0C}";
hyprland/default.nix: color4 = "#${colors.base0E}";
hyprland/default.nix: color5 = "#${colors.base0F}";

- dynamic color/config reloading for foot terminal
- Variants:
- osc sequences (something from oxidec reloaders) (neovim won't reload without additional plugin)
Expand Down
59 changes: 59 additions & 0 deletions colorschemes/catppuccin.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
name = "Catppuccin";
slug = "catppuccin";
author = "https://github.com/catppuccin";

colors = rec {
# TODO: avoid using baseXX colors!
# base00 = "#1e1e2e"; # base
# base01 = "#181825"; # mantle
# base02 = "#313244"; # surface0
# base03 = "#45475a"; # surface1
# base04 = "#585b70"; # surface2
# base05 = "#cdd6f4"; # text
# base06 = "#f5e0dc"; # rosewater
# base07 = "#b4befe"; # lavender
# base08 = "#f38ba8"; # red
# base09 = "#fab387"; # peach
# base0A = "#f9e2af"; # yellow
# base0B = "#a6e3a1"; # green
# base0C = "#94e2d5"; # teal
# base0D = "#89b4fa"; # blue
# base0E = "#cba6f7"; # mauve
# base0F = "#f2cdcd"; # flamingo

background = "#1e1e2e"; # base
darkness = "#181825"; # mantle
void = "#11111b"; # crust

# Grayscale (dark -> light)
gray = "#313244"; # surface0
gray2 = "#45475a"; # surface1
gray3 = "#585b70"; # surface2
gray4 = "#6c7086"; # overlay0
gray5 = "#7f849c"; # overlay1
gray6 = "#9399b2"; # overlay2
gray7 = "#a6adc8"; # subtext0
gray8 = "#bac2de"; # subtext1

text = "#cdd6f4"; # text

red = "#f38ba8"; # red
green = "#a6e3a1"; # green
yellow = "#f9e2af"; # yellow
blue = "#89b4fa"; # blue
orange = "#fab387"; # peach

violet = "#cba6f7"; # mauve
lavender = "#b4befe"; # lavender

pink = "#f5c2e7"; # pink
lipstick = "#eba0ac"; # maroon
skin = "#f2cdcd"; # flamingo
fawn = "#f5e0dc"; # rosewater

sapphire = "#74c7ec"; # sapphire
sky = "#89dceb"; # sky
teal = "#94e2d5"; # teal
};
}
3 changes: 3 additions & 0 deletions colorschemes/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
catppuccin = import ./catppuccin.nix;
}
2 changes: 1 addition & 1 deletion core/bcache.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ ... }: {
_: {
nix.settings = {
substituters = [
"https://nix-community.cachix.org"
Expand Down
2 changes: 1 addition & 1 deletion core/bootloader.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ ... }: {
_: {
boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.configurationLimit = 3;

Expand Down
2 changes: 1 addition & 1 deletion core/nice-build.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ ... }: {
_: {
nix.daemonCPUSchedPolicy = "idle";
nix.daemonIOSchedClass = "idle";
}
2 changes: 1 addition & 1 deletion core/physlock.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ ... }: {
_: {
services.physlock = {
enable = true;
allowAnyUser = true;
Expand Down
2 changes: 1 addition & 1 deletion core/time-zone.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ ... }: {
_: {
time.timeZone = "Asia/Novosibirsk";

# Keeps the system timezone up-to-date based on the current location
Expand Down
54 changes: 27 additions & 27 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 2 additions & 22 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@

outputs = { nixpkgs, home-manager, nix-colors, ... } @ inputs:
let
forAllSystems = nixpkgs.lib.genAttrs [ "x86_64-linux" ];
colorschemes = import ./colorschemes;

mkSystem = user: hostname:
nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs nix-colors user hostname; };
specialArgs = { inherit inputs nix-colors colorschemes user hostname; };
modules = [
./core

Expand All @@ -43,26 +43,6 @@
};
in
{
# Devshell for bootstrapping
# Acessible through `nix develop` or `nix-shell` (legacy)
devShells = forAllSystems (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
import ./shell.nix { inherit pkgs; }
);

# Formatter (alejandra, nixfmt or nixpkgs-fmt)
# Run with `nix fmt`
formatter = forAllSystems (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
pkgs.nixpkgs-fmt
);

nixosConfigurations = {
# <hostname> = mkSystem <username> <hostname>;
nixie = mkSystem "user" "nixie";
Expand Down
4 changes: 2 additions & 2 deletions hosts/nixie/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ config, nix-colors, ... }: {
config.colorScheme = nix-colors.colorSchemes.catppuccin-mocha;
{ config, nix-colors, colorschemes, ... }: {
config.colorScheme = colorschemes.catppuccin;
# config.colorScheme = {
# slug = "arc-darkest";
# name = "Arc-Darkest COLORS";
Expand Down
Loading

0 comments on commit 681a84e

Please sign in to comment.