noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-22 23:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes for light mode

Browse Source
This commit is contained in:
Noah Masur 2022-11-05 13:41:09 -04:00
parent 4ea56b0aab
commit c871f59791
6 changed files with 56 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/desktop/default.nix
View File

@ -17,8 +17,8 @@ nixpkgs.lib.nixosSystem {
identityFile = "/home/${globals.user}/.ssh/id_ed25519"; identityFile = "/home/${globals.user}/.ssh/id_ed25519";
gui.enable = true; gui.enable = true;
theme = { theme = {
colors = (import ../../modules/colorscheme/gruvbox).dark; colors = (import ../../modules/colorscheme/gruvbox).light;
dark = true; dark = false;
}; };
wallpaper = "${wallpapers}/gruvbox/road.jpg"; wallpaper = "${wallpapers}/gruvbox/road.jpg";
gtk.theme.name = nixpkgs.lib.mkDefault "Adwaita-dark"; gtk.theme.name = nixpkgs.lib.mkDefault "Adwaita-dark";

2
modules/applications/firefox.nix
View File

@ -45,6 +45,8 @@
"toolkit.legacyUserProfileCustomizations.stylesheets" = "toolkit.legacyUserProfileCustomizations.stylesheets" =
true; # Allow userChrome.css true; # Allow userChrome.css
"layout.css.color-mix.enabled" = true; "layout.css.color-mix.enabled" = true;
"ui.systemUsesDarkTheme" =
if config.theme.dark == true then 1 else 0;
}; };
userChrome = '' userChrome = ''
:root { :root {

4
modules/colorscheme/gruvbox/default.nix
View File

@ -20,6 +20,7 @@
base0E = "#d3869b"; # purple base0E = "#d3869b"; # purple
base0F = "#d65d0e"; # brown base0F = "#d65d0e"; # brown
neovimConfig = ./neovim.lua; neovimConfig = ./neovim.lua;
batTheme = "gruvbox-dark";
}; };
light = { light = {
base00 = "#fbf1c7"; # ---- base00 = "#fbf1c7"; # ----
@ -38,6 +39,7 @@
base0D = "#076678"; # blue base0D = "#076678"; # blue
base0E = "#8f3f71"; # purple base0E = "#8f3f71"; # purple
base0F = "#d65d0e"; # brown base0F = "#d65d0e"; # brown
neovimConfig = ./neovim-light.lua; neovimConfig = ./neovim.lua;
batTheme = "gruvbox-light";
}; };
} }

1
modules/colorscheme/gruvbox/neovim.lua
View File

@ -6,7 +6,6 @@ M.packer = function(use)
config = function() config = function()
vim.g.gruvbox_italicize_strings = 0 vim.g.gruvbox_italicize_strings = 0
vim.cmd("colorscheme gruvbox8") vim.cmd("colorscheme gruvbox8")
vim.cmd("set background=dark")
end, end,
}) })
end end

4
modules/neovim/default.nix
View File

@ -19,9 +19,9 @@
}; };
"nvim/lua/packer/colors.lua".source = config.theme.colors.neovimConfig; "nvim/lua/packer/colors.lua".source = config.theme.colors.neovimConfig;
"nvim/lua/background.lua".text = '' "nvim/lua/background.lua".text = ''
vim.cmd("set background=${ vim.o.background = "${
if config.theme.dark == true then "dark" else "light" if config.theme.dark == true then "dark" else "light"
}") }"
''; '';
}; };

15
modules/shell/utilities.nix
View File

@ -13,13 +13,14 @@ let
in { in {
config = {
home-manager.users.${config.user} = { home-manager.users.${config.user} = {
home.packages = with pkgs; [ home.packages = with pkgs; [
unzip # Extract zips unzip # Extract zips
rsync # Copy folders rsync # Copy folders
ripgrep # grep ripgrep # grep
bat # cat
fd # find fd # find
sd # sed sd # sed
jq # JSON manipulation jq # JSON manipulation
@ -31,7 +32,7 @@ in {
vimv-rs # Batch rename files vimv-rs # Batch rename files
dig # DNS lookup dig # DNS lookup
lf # File viewer lf # File viewer
# whois # Lookup IPs inetutils # Includes telnet, whois
age # Encryption age # Encryption
]; ];
@ -43,6 +44,11 @@ in {
".digrc".text = "+noall +answer"; # Cleaner dig commands ".digrc".text = "+noall +answer"; # Cleaner dig commands
}; };
programs.bat = {
enable = true; # cat replacement
config = { theme = config.theme.colors.batTheme; };
};
programs.fish.shellAbbrs = { programs.fish.shellAbbrs = {
cat = "bat"; # Swap cat with bat cat = "bat"; # Swap cat with bat
}; };
@ -54,11 +60,14 @@ in {
body = "${pkgs.prettyping}/bin/prettyping --nolegend $target"; body = "${pkgs.prettyping}/bin/prettyping --nolegend $target";
}; };
qr = { qr = {
# Fix for non-macOS
body = body =
"${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | open /tmp/qr.png"; # Fix for non-macOS "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.gnome.sushi}/bin/sushi /tmp/qr.png";
}; };
}; };
}; };
};
} }