lytedev/nix
1
0
Fork 1
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Cleanup, color scheme fixes

Browse source
This commit is contained in:
Daniel Flanagan 2023-10-05 10:41:31 -05:00
parent bd542366f5
commit 75d10e2b7e
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
10 changed files with 84 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.nix
View file

@ -51,12 +51,11 @@
# pink, # pink,
purple, purple,
red, red,
# orange, orange,
yellow, yellow,
green, green,
teal, # teal,
blue, blue,
...
}: let }: let
base = base =
{ {
@ -73,14 +72,14 @@
"9" = red; "9" = red;
"2" = green; "2" = green;
"10" = green; "10" = green;
"3" = yellow; "3" = orange;
"11" = yellow; "11" = orange;
"4" = blue; "4" = blue;
"12" = blue; "12" = blue;
"5" = purple; "5" = purple;
"13" = purple; "13" = purple;
"6" = teal; "6" = yellow;
"14" = teal; "14" = yellow;
# whites # whites
"7" = fg2; "7" = fg2;
@ -111,8 +110,8 @@
yellow = "f4bf75"; yellow = "f4bf75";
blue = "66d9ef"; blue = "66d9ef";
purple = "ae81ff"; purple = "ae81ff";
teal = "a1efe4"; # teal = "a1efe4";
# orange = "fab387"; orange = "fab387";
}; };
catppuccin-mocha-sapphire = mkColorScheme { catppuccin-mocha-sapphire = mkColorScheme {
scheme-name = "catppuccin-mocha-sapphire"; scheme-name = "catppuccin-mocha-sapphire";
@ -130,11 +129,10 @@
# pink = "f5e0dc"; # pink = "f5e0dc";
purple = "cba6f7"; purple = "cba6f7";
red = "f38ba8"; red = "f38ba8";
# orange = "fab387"; orange = "fab387";
# yellow = "f9e2af"; yellow = "f9e2af";
yellow = "fab387";
green = "a6e3a1"; green = "a6e3a1";
teal = "94e2d5"; # teal = "94e2d5";
blue = "74c7ec"; blue = "74c7ec";
}; };
}; };

59
home/default.nix
View file

@ -10,15 +10,6 @@
email = "daniel@lyte.dev"; email = "daniel@lyte.dev";
name = "Daniel Flanagan"; name = "Daniel Flanagan";
in { in {
# TODO: email access?
/*
accounts.email.accounts = {
google = {
address = "wraithx2@gmail.com";
};
};
*/
# TODO: fonts? right now they are only handled at the nixos-level (desktop-usage module) # TODO: fonts? right now they are only handled at the nixos-level (desktop-usage module)
# TODO: wallpaper? # TODO: wallpaper?
@ -35,12 +26,13 @@ in {
# I use gawk for my fish prompt # I use gawk for my fish prompt
pkgs.gawk pkgs.gawk
# text editor
inputs.helix.packages.${system}.helix inputs.helix.packages.${system}.helix
# tools I use when editing nix code
pkgs.nil pkgs.nil
pkgs.alejandra pkgs.alejandra
# TODO: os-specific scripts? macOS versus Linux (arch or nixos? do I need to distinguish at that point?)
(pkgs.buildEnv { (pkgs.buildEnv {
name = "my-scripts-common"; name = "my-scripts-common";
paths = [./scripts/common]; paths = [./scripts/common];
@ -391,17 +383,17 @@ in {
themes = with colors.withHashPrefix; { themes = with colors.withHashPrefix; {
custom = { custom = {
"type" = yellow; "type" = orange;
"constructor" = blue; "constructor" = blue;
"constant" = yellow; "constant" = orange;
"constant.builtin" = yellow; "constant.builtin" = orange;
"constant.character" = teal; "constant.character" = yellow;
"constant.character.escape" = yellow; "constant.character.escape" = orange;
"string" = green; "string" = green;
"string.regexp" = yellow; "string.regexp" = orange;
"string.special" = blue; "string.special" = blue;
"comment" = { "comment" = {
@ -423,7 +415,7 @@ in {
"punctuation.special" = blue; "punctuation.special" = blue;
"keyword" = purple; "keyword" = purple;
"keyword.storage.modifier.ref" = teal; "keyword.storage.modifier.ref" = yellow;
"keyword.control.conditional" = { "keyword.control.conditional" = {
fg = purple; fg = purple;
modifiers = ["italic"]; modifiers = ["italic"];
@ -445,13 +437,13 @@ in {
"special" = blue; "special" = blue;
"markup.heading.marker" = { "markup.heading.marker" = {
fg = yellow; fg = orange;
modifiers = ["bold"]; modifiers = ["bold"];
}; };
"markup.heading.1" = blue; "markup.heading.1" = blue;
"markup.heading.2" = teal; "markup.heading.2" = yellow;
"markup.heading.3" = green; "markup.heading.3" = green;
"markup.heading.4" = yellow; "markup.heading.4" = orange;
"markup.heading.5" = red; "markup.heading.5" = red;
"markup.heading.6" = fg3; "markup.heading.6" = fg3;
"markup.list" = purple; "markup.list" = purple;
@ -500,7 +492,7 @@ in {
fg = text; fg = text;
bg = bg2; bg = bg2;
}; };
"ui.window" = {fg = fg3;}; "ui.window" = {fg = fgdim;};
"ui.help" = { "ui.help" = {
fg = fg2; fg = fg2;
bg = bg2; bg = bg2;
@ -514,8 +506,8 @@ in {
"ui.text" = text; "ui.text" = text;
"ui.text.focus" = { "ui.text.focus" = {
fg = "text"; fg = text;
bg = "surface0"; bg = bg3;
modifiers = ["bold"]; modifiers = ["bold"];
}; };
"ui.text.inactive" = {fg = fg2;}; "ui.text.inactive" = {fg = fg2;};
@ -528,7 +520,7 @@ in {
bg = bg; bg = bg;
}; };
"ui.selection" = {bg = bg5;}; "ui.selection" = {bg = bg3;};
"ui.cursor" = { "ui.cursor" = {
fg = bg; fg = bg;
@ -539,7 +531,7 @@ in {
bg = red; bg = red;
}; };
"ui.cursor.match" = { "ui.cursor.match" = {
fg = yellow; fg = orange;
modifiers = ["bold"]; modifiers = ["bold"];
}; };
@ -572,7 +564,8 @@ in {
"ui.cursorline.primary" = {bg = bg3;}; "ui.cursorline.primary" = {bg = bg3;};
"ui.highlight" = { "ui.highlight" = {
bg = fg2; bg = primary;
fg = bg;
modifiers = ["bold"]; modifiers = ["bold"];
}; };
@ -582,7 +575,7 @@ in {
}; };
"ui.menu.selected" = { "ui.menu.selected" = {
fg = text; fg = text;
bg = bg4; bg = bg3;
modifiers = ["bold"]; modifiers = ["bold"];
}; };
@ -594,7 +587,7 @@ in {
}; };
"diagnostic.warning" = { "diagnostic.warning" = {
underline = { underline = {
color = yellow; color = orange;
style = "curl"; style = "curl";
}; };
}; };
@ -612,10 +605,13 @@ in {
}; };
error = red; error = red;
warning = yellow; warning = orange;
info = blue; info = blue;
hint = teal; hint = yellow;
"ui.background" = bg; "ui.background" = {
bg = bg;
fg = fgdim;
};
# "ui.cursorline.primary" = { bg = "default" } # "ui.cursorline.primary" = { bg = "default" }
# "ui.cursorline.secondary" = { bg = "default" } # "ui.cursorline.secondary" = { bg = "default" }
@ -957,6 +953,7 @@ in {
enable = false; enable = false;
enableFishIntegration = true; enableFishIntegration = true;
settings = { settings = {
pane_frames = false;
# TODO: port config # TODO: port config
}; };
}; };

6
home/linux.nix
View file

@ -434,6 +434,12 @@
"*" = { "*" = {
background = "$HOME/.wallpaper fill"; background = "$HOME/.wallpaper fill";
}; };
"Dell Inc. DELL U2720Q D3TM623" = {
# desktop left vertical monitor
transform = "90";
scale = "1.5";
};
}; };
# TODO: popup_during_fullscreen smart # TODO: popup_during_fullscreen smart

4
home/work.nix
View file

@ -1,5 +1,5 @@
{lib, ...}: let {...}: let
username = "daniel.flanagan@divvypay.com"; username = "daniel.flanagan@hq.bill.com";
in { in {
home.username = username; home.username = username;
home.homeDirectory = "/Users/${username}"; home.homeDirectory = "/Users/${username}";

40
modules/nixos/common.nix
View file

@ -2,6 +2,7 @@
config, config,
lib, lib,
inputs, inputs,
colors,
# outputs, # outputs,
system, system,
... ...
@ -112,8 +113,7 @@ in {
PasswordAuthentication = false; PasswordAuthentication = false;
}; };
# TODO: tailscale can handle this I think...? openFirewall = lib.mkDefault false;
openFirewall = lib.mkDefault true;
# listenAddresses = [ # listenAddresses = [
# { addr = "0.0.0.0"; port = 22; } # { addr = "0.0.0.0"; port = 22; }
@ -134,23 +134,23 @@ in {
useXkbConfig = true; useXkbConfig = true;
earlySetup = true; earlySetup = true;
colors = [ colors = with colors; [
"111111" bg
"f92672" red
"a6e22e" green
"f4bf75" orange
"66d9ef" blue
"ae81ff" purple
"a1efe4" yellow
"f8f8f2" fg3
"75715e" fgdim
"f92672" red
"a6e22e" green
"f4bf75" orange
"66d9ef" blue
"ae81ff" purple
"a1efe4" yellow
"f9f8f5" fg
]; ];
}; };
@ -160,7 +160,7 @@ in {
firewall = { firewall = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
allowPing = lib.mkDefault true; allowPing = lib.mkDefault true;
allowedTCPPorts = lib.mkDefault [22]; allowedTCPPorts = lib.mkDefault [];
allowedUDPPorts = lib.mkDefault []; allowedUDPPorts = lib.mkDefault [];
}; };
}; };

6
modules/nixos/desktop-usage.nix
View file

@ -4,13 +4,11 @@
system, system,
... ...
}: { }: {
# TODO: add a DE?
# and include either plasma or gnome as a fallback?
imports = [ imports = [
./sway.nix ./sway.nix
./hyprland.nix ./hyprland.nix
./plasma.nix # ./plasma.nix
# ./gnome.nix
./user-installed-applications.nix ./user-installed-applications.nix
]; ];

1
modules/nixos/sway.nix
View file

@ -45,7 +45,6 @@
}; };
systemPackages = with pkgs; [ systemPackages = with pkgs; [
# TODO: converge with home manager/sway stuff?
brightnessctl brightnessctl
feh feh
gimp gimp

8
modules/nixos/wifi.nix
View file

@ -1,9 +1,9 @@
{...}: { {...}: {
# TODO: would like to move away from network manager to iwd
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
systemd.services.NetworkManager-wait-online.enable = false; systemd.services.NetworkManager-wait-online.enable = false;
# iwd? # TODO: powersave?
# powersave?
# TODO: can I pre-configure my usual wifi networks with SSIDs and PSKs loaded # TODO: can I pre-configure my usual wifi networks with SSIDs and PSKs loaded from secrets?
# from secrets?
} }

2
nixos/beefcake/default.nix
View file

@ -86,7 +86,7 @@
"api.lyte.dev" = { "api.lyte.dev" = {
path = "${config.services.api-lyte-dev.stateDir}/secrets.json"; path = "${config.services.api-lyte-dev.stateDir}/secrets.json";
# TODO: would be cool to assert that it's correctly-formatted JSON? # TODO: would be cool to assert that it's correctly-formatted JSON? probably should be done in a pre-commit hook?
mode = "0440"; mode = "0440";
owner = config.services.api-lyte-dev.user; owner = config.services.api-lyte-dev.user;
group = config.services.api-lyte-dev.group; group = config.services.api-lyte-dev.group;

11
readme.md
View file

@ -81,7 +81,6 @@ nix run nixpkgs#nixos-rebuild -- --flake "git+https://git.lyte.dev/lytedev/nix#$
# if we still have ssh access and the machine fails testing, just rollback # if we still have ssh access and the machine fails testing, just rollback
# instead of waiting for the reboot # instead of waiting for the reboot
# TODO: this is not tested yet
ssh "root@$host" nixos-rebuild --rollback switch ssh "root@$host" nixos-rebuild --rollback switch
``` ```
@ -120,6 +119,16 @@ nix-shell --packages git \
# To Do # To Do
## Short Term
- Fix Helix UI (picker borders gone)
- Remove all work-specific config and stick that in its own flake that uses my main flake as input
- Fonts installed by home manager instead of nixos module
- Zellij config
- Broot theme
## Long Term
- I don't understand Nix well enough to know why stuff is being compiled even when I have a binary cache - I don't understand Nix well enough to know why stuff is being compiled even when I have a binary cache
- Maybe it detects different CPUs and will recompile certain packages for per-CPU optimizations? - Maybe it detects different CPUs and will recompile certain packages for per-CPU optimizations?
- How does this factor in with "pureness"? - How does this factor in with "pureness"?