It builds now.
This commit is contained in:
parent
9c71495c73
commit
f3d9e8a188
47 changed files with 577 additions and 401 deletions
|
@ -1,4 +1,4 @@
|
|||
{ outputs, ... }:
|
||||
{ config, ... }:
|
||||
{
|
||||
programs.foot = {
|
||||
enable = true;
|
||||
|
@ -6,14 +6,14 @@
|
|||
settings = {
|
||||
main = {
|
||||
term = "xterm-256color";
|
||||
font = "${outputs.look.fonts.nerd}:size=14.7";
|
||||
font = "${config.look.fonts.nerd}:size=14.7";
|
||||
};
|
||||
cursor = {
|
||||
style = "beam";
|
||||
};
|
||||
colors = {
|
||||
alpha = "0.65";
|
||||
background = "${outputs.look.colors.dark}";
|
||||
background = "${config.look.colors.dark}";
|
||||
regular0 = "3f3f3f";
|
||||
regular1 = "cc0000";
|
||||
regular2 = "4e9a06";
|
||||
|
|
|
@ -1,31 +1,31 @@
|
|||
{ pkgs, config, outputs, ... }:
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
# FireFox colors
|
||||
themeJim = ''
|
||||
:root {
|
||||
--tab-active-bg-color: #${outputs.look.colors.prime};
|
||||
--tab-hover-bg-color: #${outputs.look.colors.accent};
|
||||
--tab-inactive-bg-color: #${outputs.look.colors.dark};
|
||||
--tab-active-bg-color: #${config.look.colors.prime};
|
||||
--tab-hover-bg-color: #${config.look.colors.accent};
|
||||
--tab-inactive-bg-color: #${config.look.colors.dark};
|
||||
--tab-active-fg-fallback-color: #FFFFFF;
|
||||
--tab-inactive-fg-fallback-color: #${outputs.look.colors.text};
|
||||
--urlbar-focused-bg-color: #${outputs.look.colors.dark};
|
||||
--urlbar-not-focused-bg-color: #${outputs.look.colors.dark};
|
||||
--toolbar-bgcolor: #${outputs.look.colors.dark} !important;
|
||||
--tab-inactive-fg-fallback-color: #${config.look.colors.text};
|
||||
--urlbar-focused-bg-color: #${config.look.colors.dark};
|
||||
--urlbar-not-focused-bg-color: #${config.look.colors.dark};
|
||||
--toolbar-bgcolor: #${config.look.colors.dark} !important;
|
||||
'';
|
||||
themeAlt = ''
|
||||
:root {
|
||||
--tab-active-bg-color: #${outputs.look.colors.dark};
|
||||
--tab-hover-bg-color: #${outputs.look.colors.accent};
|
||||
--tab-inactive-bg-color: #${outputs.look.colors.prime};
|
||||
--tab-active-fg-fallback-color: #${outputs.look.colors.text};
|
||||
--tab-active-bg-color: #${config.look.colors.dark};
|
||||
--tab-hover-bg-color: #${config.look.colors.accent};
|
||||
--tab-inactive-bg-color: #${config.look.colors.prime};
|
||||
--tab-active-fg-fallback-color: #${config.look.colors.text};
|
||||
--tab-inactive-fg-fallback-color: #FFFFFF;
|
||||
--urlbar-focused-bg-color: #${outputs.look.colors.prime};
|
||||
--urlbar-not-focused-bg-color: #${outputs.look.colors.prime};
|
||||
--toolbar-bgcolor: #${outputs.look.colors.prime} !important;
|
||||
--urlbar-focused-bg-color: #${config.look.colors.prime};
|
||||
--urlbar-not-focused-bg-color: #${config.look.colors.prime};
|
||||
--toolbar-bgcolor: #${config.look.colors.prime} !important;
|
||||
'';
|
||||
quteFoxCSS = ''
|
||||
--tab-font: '${outputs.look.fonts.main}';
|
||||
--urlbar-font: '${outputs.look.fonts.main}';
|
||||
--tab-font: '${config.look.fonts.main}';
|
||||
--urlbar-font: '${config.look.fonts.main}';
|
||||
|
||||
/* try increasing if you encounter problems */
|
||||
--urlbar-height-setting: 24px;
|
||||
|
@ -336,9 +336,9 @@ in {
|
|||
};
|
||||
};
|
||||
commonSettings = {
|
||||
"font.name.serif.x-western" = "${outputs.look.fonts.main}";
|
||||
"font.name.sans-serif.x-western" = "${outputs.look.fonts.main}";
|
||||
"font.name.monospace.x-western" = "${outputs.look.fonts.nerd}";
|
||||
"font.name.serif.x-western" = "${config.look.fonts.main}";
|
||||
"font.name.sans-serif.x-western" = "${config.look.fonts.main}";
|
||||
"font.name.monospace.x-western" = "${config.look.fonts.nerd}";
|
||||
"general.autoScroll" = true;
|
||||
"browser.compactmode.show" = true;
|
||||
"browser.uidensity" = 1;
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
{ pkgs, outputs, ... }:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
services.mako = {
|
||||
enable = true;
|
||||
borderColor = "#${outputs.look.colors.accent}";
|
||||
backgroundColor = "#${outputs.look.colors.dark}CC";
|
||||
output = "${outputs.displays.d1}";
|
||||
borderColor = "#${config.look.colors.accent}";
|
||||
backgroundColor = "#${config.look.colors.dark}CC";
|
||||
output = "${config.displays.d1}";
|
||||
sort = "+time";
|
||||
layer = "overlay";
|
||||
padding = "8";
|
||||
margin = "0";
|
||||
borderSize = outputs.look.border.int;
|
||||
borderSize = config.look.border.int;
|
||||
maxIconSize = 40;
|
||||
defaultTimeout = 6000;
|
||||
font = "${outputs.look.fonts.main} 12";
|
||||
font = "${config.look.fonts.main} 12";
|
||||
anchor = "bottom-right";
|
||||
extraConfig = "on-button-right=dismiss-all\nouter-margin=10\n[mode=do-not-disturb]\ninvisible=1";
|
||||
};
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ pkgs, config, outputs, ... }:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
package = pkgs.rofi-wayland;
|
||||
terminal = "foot";
|
||||
font = "${outputs.look.fonts.main} 14";
|
||||
font = "${config.look.fonts.main} 14";
|
||||
theme = let
|
||||
inherit (config.lib.formats.rasi) mkLiteral;
|
||||
in {
|
||||
|
@ -15,24 +15,24 @@
|
|||
red = mkLiteral "#DC322F";
|
||||
background-color = mkLiteral "#00000000";
|
||||
separatorcolor = mkLiteral "#00000000";
|
||||
normal-foreground = mkLiteral "#${outputs.look.colors.text}";
|
||||
normal-background = mkLiteral "#${outputs.look.colors.dark}1A";
|
||||
urgent-foreground = mkLiteral "#${outputs.look.colors.urgent}";
|
||||
active-foreground = mkLiteral "#${outputs.look.colors.split}";
|
||||
selected-active-foreground = mkLiteral "#${outputs.look.colors.prime}";
|
||||
background = mkLiteral "#${outputs.look.colors.dark}B3";
|
||||
bordercolor = mkLiteral "#${outputs.look.colors.prime}";
|
||||
normal-foreground = mkLiteral "#${config.look.colors.text}";
|
||||
normal-background = mkLiteral "#${config.look.colors.dark}1A";
|
||||
urgent-foreground = mkLiteral "#${config.look.colors.urgent}";
|
||||
active-foreground = mkLiteral "#${config.look.colors.split}";
|
||||
selected-active-foreground = mkLiteral "#${config.look.colors.prime}";
|
||||
background = mkLiteral "#${config.look.colors.dark}B3";
|
||||
bordercolor = mkLiteral "#${config.look.colors.prime}";
|
||||
selected-normal-foreground = mkLiteral "#FFFFFF";
|
||||
selected-normal-background = mkLiteral "#${outputs.look.colors.prime}80";
|
||||
border-color = mkLiteral "#${outputs.look.colors.prime}";
|
||||
urgent-background = mkLiteral "#${outputs.look.colors.accent}26";
|
||||
active-background = mkLiteral "#${outputs.look.colors.accent}26";
|
||||
selected-active-background = mkLiteral "#${outputs.look.colors.split}54";
|
||||
selected-normal-background = mkLiteral "#${config.look.colors.prime}80";
|
||||
border-color = mkLiteral "#${config.look.colors.prime}";
|
||||
urgent-background = mkLiteral "#${config.look.colors.accent}26";
|
||||
active-background = mkLiteral "#${config.look.colors.accent}26";
|
||||
selected-active-background = mkLiteral "#${config.look.colors.split}54";
|
||||
};
|
||||
"#window" = {
|
||||
background-color = mkLiteral "@background";
|
||||
width = 500;
|
||||
border = mkLiteral "${outputs.look.border.string}";
|
||||
border = mkLiteral "${config.look.border.string}";
|
||||
padding = 5;
|
||||
};
|
||||
"#message" = {
|
||||
|
@ -155,13 +155,13 @@
|
|||
case $RET in
|
||||
Default) swaymsg reload ;;
|
||||
Wide) swaymsg "
|
||||
output ${outputs.displays.d1} enable pos 1680 0 mode 1680x1050@59.954Hz
|
||||
output ${outputs.displays.d2} enable pos 0 0 mode 1680x1050@59.954Hz
|
||||
output ${outputs.displays.d3} enable pos 3360 0 transform 0
|
||||
output ${config.displays.d1} enable pos 1680 0 mode 1680x1050@59.954Hz
|
||||
output ${config.displays.d2} enable pos 0 0 mode 1680x1050@59.954Hz
|
||||
output ${config.displays.d3} enable pos 3360 0 transform 0
|
||||
";;
|
||||
GPU2) swaymsg "
|
||||
output ${outputs.displays.d2} enable pos 1680 0 mode 1920x1080@60Hz
|
||||
output ${outputs.displays.d3} enable pos 0 0 transform 0
|
||||
output ${config.displays.d2} enable pos 1680 0 mode 1920x1080@60Hz
|
||||
output ${config.displays.d3} enable pos 0 0 transform 0
|
||||
";;
|
||||
esac
|
||||
}
|
||||
|
|
|
@ -7,6 +7,5 @@
|
|||
./general
|
||||
./headless
|
||||
./production
|
||||
./remote-desktop
|
||||
];
|
||||
}
|
||||
|
|
|
@ -6,6 +6,6 @@
|
|||
ryujinx
|
||||
duckstation
|
||||
pcsx2
|
||||
unstable.lime3ds
|
||||
#lime3ds
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
{ pkgs, blender-bin, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
krita
|
||||
|
@ -7,4 +7,6 @@
|
|||
blender_4_2
|
||||
sunvox
|
||||
];
|
||||
|
||||
nixpkgs.overlays = [ blender-bin.overlays.default ];
|
||||
}
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
{ pkgs, outputs, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
lfs.enable = true;
|
||||
userName = outputs.secrets.jimUsername;
|
||||
userEmail = outputs.secrets.jimEmail;
|
||||
userName = "Jimbo";
|
||||
userEmail = "jimbo@jimbosfiles.com";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, outputs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
|
@ -85,8 +85,8 @@
|
|||
let g:airline_theme='onedark'
|
||||
let g:airline#extensions#tabline#enabled = 1
|
||||
hi Normal guibg=none ctermbg=235
|
||||
hi Visual guibg=#${outputs.look.colors.mid} ctermbg=238
|
||||
hi Pmenu guibg=#${outputs.look.colors.mid} ctermbg=238
|
||||
hi Visual guibg=#${config.look.colors.mid} ctermbg=238
|
||||
hi Pmenu guibg=#${config.look.colors.mid} ctermbg=238
|
||||
hi EndOfBuffer guibg=none ctermbg=235
|
||||
hi LineNr guibg=none ctermbg=none
|
||||
lua require'colorizer'.setup()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue