From 62b3b0f4425c3140d478fb918c8920cd6bf22791 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Thu, 1 Aug 2024 02:23:54 +0200 Subject: [PATCH] beginning of my own colorscheme --- hosts/vali/temperance/configuration.nix | 4 +- modules/cli/zellij.nix | 2 +- modules/gui/schizofox/default.nix | 6 +-- modules/styling/quickshell/bar/Bar.qml | 65 +++++++++++++------------ modules/styling/stylix.nix | 36 +++++++++----- 5 files changed, 64 insertions(+), 49 deletions(-) diff --git a/hosts/vali/temperance/configuration.nix b/hosts/vali/temperance/configuration.nix index 7b23d78..79fffa9 100644 --- a/hosts/vali/temperance/configuration.nix +++ b/hosts/vali/temperance/configuration.nix @@ -30,7 +30,7 @@ system = { programs = { editors = { - emacs.enable = false; + emacs.enable = true; neovim.enable = false; helix.enable = true; kakoune.enable = false; @@ -69,7 +69,7 @@ style = { stylix = { enable = true; - scheme = "${pkgs.base16-schemes}/share/themes/tomorrow-night.yaml"; + scheme = "${pkgs.base16-schemes}/share/themes/bright.yaml"; cursor = { size = 28; package = pkgs.bibata-cursors; diff --git a/modules/cli/zellij.nix b/modules/cli/zellij.nix index a43a555..673e095 100644 --- a/modules/cli/zellij.nix +++ b/modules/cli/zellij.nix @@ -11,7 +11,7 @@ in { home-manager.users.${username} = { programs.zellij = { enable = true; - enableFishIntegration = true; + enableFishIntegration = false; on_force_close = "quit"; layout_dir = "${./layouts}"; settings = { diff --git a/modules/gui/schizofox/default.nix b/modules/gui/schizofox/default.nix index b0bb176..44aa289 100644 --- a/modules/gui/schizofox/default.nix +++ b/modules/gui/schizofox/default.nix @@ -17,9 +17,9 @@ in { enable = true; theme = { colors = { - background-darker = "1d2021"; - background = "282828"; - foreground = "ebdbb2"; + background-darker = "000000"; + background = "3a3432"; + foreground = "f7f7f7"; }; font = "ComicShannsMono Nerd Font"; diff --git a/modules/styling/quickshell/bar/Bar.qml b/modules/styling/quickshell/bar/Bar.qml index 3f5dc0d..bc95eb2 100644 --- a/modules/styling/quickshell/bar/Bar.qml +++ b/modules/styling/quickshell/bar/Bar.qml @@ -3,47 +3,48 @@ import Quickshell.Io // For Processes import QtQuick // For Text Scope { - property string time; + id: root + property string time; - Variants { - model: Quickshell.screens + Variants { + model: Quickshell.screens - PanelWindow { - property var modelData - screen: modelData + PanelWindow { + property var modelData + screen: modelData - anchors { - top: true - left: true - right: true - } + anchors { + top: true + left: true + right: true + } - height: 30 + height: 30 - Text { - anchors.centerIn: parent + Text { + anchors.centerIn: parent - // now just time instead of root.time - text: time - } + // now just time instead of root.time + text: time + } + } } - } - Process { - id: dateProc - command: ["date"] - running: true + Process { + id: dateProc + command: ["date"] + running: true - stdout: SplitParser { - // now just time instead of root.time - onRead: data => time = data + stdout: SplitParser { + // now just time instead of root.time + onRead: data => time = data + } } - } - Timer { - interval: 1000 - running: true - repeat: true - onTriggered: dateProc.running = true - } + Timer { + interval: 1000 + running: true + repeat: true + onTriggered: dateProc.running = true + } } diff --git a/modules/styling/stylix.nix b/modules/styling/stylix.nix index 2fe58ce..008585b 100644 --- a/modules/styling/stylix.nix +++ b/modules/styling/stylix.nix @@ -19,7 +19,28 @@ in { followSystem = true; autoImport = true; }; - base16Scheme = scheme; + # base16Scheme = scheme; + base16Scheme = { + scheme = "3024-custom"; + # base00 = "090300"; # ---- + base00 = "000000"; # Black + base01 = "3a3432"; # Dark grey + base02 = "4a4543"; # Lighter grey + base03 = "5c5855"; # Light greLight grey + base04 = "807d7c"; # + + base05 = "a5a2a2"; # ++ + base06 = "d6d5d4"; # +++ + base07 = "f7f7f7"; # ++++ + base08 = "db2d20"; # red + base09 = "e8bbd0"; # orange + base0A = "fded02"; # yellow + base0B = "01a252"; # green + base0C = "b5e4f4"; # aqua + base0D = "01a0e4"; # blue + base0E = "a16a94"; # purple + base0F = "cdab53"; # brown + }; + inherit image; polarity = "dark"; cursor = { @@ -41,16 +62,6 @@ in { serif = config.stylix.fonts.monospace; sansSerif = config.stylix.fonts.monospace; - # serif = { - # - # package = pkgs.noto-fonts; - # name = "Noto Serif"; - # }; - # sansSerif = { - # package = pkgs.lexend; - # name = "Lexend"; - # }; - emoji = { package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; @@ -84,6 +95,9 @@ in { fzf.enable = true; hyprland.enable = true; lazygit.enable = true; + emacs.enable = true; + kde.enable = true; + yazi.enable = true; zellij.enable = true; }; };