diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix index f1d5ddf..6b8c316 100755 --- a/home/desktop/sway.nix +++ b/home/desktop/sway.nix @@ -7,59 +7,9 @@ let down = "j"; up = "k"; right = "l"; - bg-color = "#424242"; - inactive-bg-color = "#424242"; - text-color = "#4f97d7"; - inactive-text-color = "#676E7D"; - urgent-bg-color = "#E53935"; - - colorSchemeDark = rec { - primary = { - normal = { - background = "181818"; - foreground = "b9b9b9"; - }; - bright = { - background = bright.black; - foreground = bright.white; - }; - }; - normal = { - black = "252525"; - gray = "5b5b5b"; - red = "ed4a46"; - green = "70b433"; - yellow = "dbb32d"; - blue = "368aeb"; - magenta = "eb6eb7"; - cyan = "3fc5b7"; - white = "777777"; - }; - bright = { - black = "3b3b3b"; - gray = "7b7b7b"; - red = "ff5e56"; - green = "83c746"; - yellow = "efc541"; - blue = "4f9cfe"; - magenta = "ff81ca"; - cyan = "56d8c9"; - white = "dedede"; - }; - }; - - colorScheme = colorSchemeDark; - font = "Roboto"; - - bgColor = colorScheme.primary.normal.background; - fgColor = colorScheme.primary.bright.foreground; - acColor = colorScheme.normal.red; - acColor2 = colorScheme.normal.yellow; in { - imports = [ - #./sway-style.nix - ]; + imports = [ ./swayfx.nix ]; wayland.windowManager.sway = { enable = true; @@ -96,14 +46,11 @@ in { terminal = "kitty"; ## Startup scripts and programs startup = [ { command = "startup"; } { command = "kitty"; } ]; + modifier = "Mod4"; + floating = { modifier = "Mod4"; }; - ## Use waybar as desktop statusbar - bars = [{ - command = "${waybar}/bin/waybar"; - position = "top"; - fonts = { size = 15.0; }; - }]; - + ## Window and focus settings + window = { }; focus = { followMouse = true; mouseWarping = false; @@ -123,51 +70,6 @@ in { }; }; - modifier = "Mod4"; - - window = { border = 0; }; - - floating = { - modifier = "Mod4"; - border = 0; - }; - - fonts = { - names = [ "Spleen-32x64" ]; - size = 9.0; - }; - - colors = { - focused = { - border = bg-color; - childBorder = bg-color; - background = bg-color; - text = text-color; - indicator = "#00ff00"; - }; - unfocused = { - border = inactive-bg-color; - childBorder = inactive-bg-color; - background = inactive-bg-color; - text = inactive-text-color; - indicator = "#00ff00"; - }; - focusedInactive = { - border = inactive-bg-color; - childBorder = inactive-bg-color; - background = inactive-bg-color; - text = inactive-text-color; - indicator = "#00ff00"; - }; - urgent = { - border = urgent-bg-color; - childBorder = urgent-bg-color; - background = urgent-bg-color; - text = text-color; - indicator = "#00ff00"; - }; - }; - }; }; diff --git a/home/desktop/swayfx.nix b/home/desktop/swayfx.nix new file mode 100755 index 0000000..ab585d4 --- /dev/null +++ b/home/desktop/swayfx.nix @@ -0,0 +1,119 @@ +{ self, inputs, outputs, lib, config, pkgs, ... }: + +with lib; +with pkgs; + +let + + bg-color = "#424242"; + inactive-bg-color = "#424242"; + text-color = "#4f97d7"; + inactive-text-color = "#676E7D"; + urgent-bg-color = "#E53935"; + + colorSchemeDark = rec { + primary = { + normal = { + background = "181818"; + foreground = "b9b9b9"; + }; + bright = { + background = bright.black; + foreground = bright.white; + }; + }; + normal = { + black = "252525"; + gray = "5b5b5b"; + red = "ed4a46"; + green = "70b433"; + yellow = "dbb32d"; + blue = "368aeb"; + magenta = "eb6eb7"; + cyan = "3fc5b7"; + white = "777777"; + }; + bright = { + black = "3b3b3b"; + gray = "7b7b7b"; + red = "ff5e56"; + green = "83c746"; + yellow = "efc541"; + blue = "4f9cfe"; + magenta = "ff81ca"; + cyan = "56d8c9"; + white = "dedede"; + }; + }; + + colorScheme = colorSchemeDark; + font = "Spleen-32x64"; + + bgColor = colorScheme.primary.normal.background; + fgColor = colorScheme.primary.bright.foreground; + acColor = colorScheme.normal.red; + acColor2 = colorScheme.normal.yellow; + +in { + + imports = [ ]; + + wayland.windowManager.sway = { + extraSessionCommands = ""; + extraConfig = ""; + + config = rec { + + ## Use waybar as desktop statusbar + bars = [{ + command = "${waybar}/bin/waybar"; + position = "top"; + fonts = { size = 15.0; }; + }]; + + ## Borders + window = { border = 2; }; + floating = { border = 2; }; + + ## Fonts + fonts = { + names = [ "Spleen-32x64" ]; + size = 9.0; + }; + + ## Colours + colors = { + focused = { + border = bg-color; + childBorder = bg-color; + background = bg-color; + text = text-color; + indicator = "#00ff00"; + }; + unfocused = { + border = inactive-bg-color; + childBorder = inactive-bg-color; + background = inactive-bg-color; + text = inactive-text-color; + indicator = "#00ff00"; + }; + focusedInactive = { + border = inactive-bg-color; + childBorder = inactive-bg-color; + background = inactive-bg-color; + text = inactive-text-color; + indicator = "#00ff00"; + }; + urgent = { + border = urgent-bg-color; + childBorder = urgent-bg-color; + background = urgent-bg-color; + text = text-color; + indicator = "#00ff00"; + }; + }; + + }; + }; + +}