color scheme ref

MatthiasBenaets · Dec 2, 2023 · 36c0e9a · 36c0e9a
1 parent 5d82645
commit 36c0e9a
Show file tree

Hide file tree

Showing 11 changed files with 120 additions and 63 deletions.
diff --git a/flake.nix b/flake.nix
@@ -1,5 +1,5 @@
 #
-#  flake.nix *             
+#  flake.nix *
 #   ├─ ./hosts
 #   │   └─ default.nix
 #   ├─ ./darwin

diff --git a/hosts/beelink/default.nix b/hosts/beelink/default.nix
@@ -65,7 +65,6 @@
       obs-studio            # Live Streaming
       plex-media-player     # Media Player
       simple-scan           # Scanning
-      kitty
       moonlight-qt          # Remote Streaming
     ];
   };

diff --git a/hosts/configuration.nix b/hosts/configuration.nix
@@ -24,6 +24,9 @@
 
 { config, lib, pkgs, stable, inputs, vars, ... }:
 
+let
+  terminal = stable.${vars.terminal};
+in
 {
   imports = ( import ../modules/desktops ++
               import ../modules/editors ++
@@ -79,6 +82,7 @@
     };
     systemPackages = with stable; [           # System-Wide Packages
       # Terminal
+      terminal          # Terminal Emulator
       btop              # Resource Manager
       coreutils         # GNU Utilities
       git               # Version Control

diff --git a/modules/desktops/hyprland.nix b/modules/desktops/hyprland.nix
@@ -5,6 +5,9 @@
 
 { config, lib, system, pkgs, hyprland, vars, host, ... }:
 
+let
+  colors = import ../theming/colors.nix;
+in
 with lib;
 with host;
 {
@@ -169,17 +172,17 @@ with host;
         '' else "";
     in
     let
-      hyprlandConf = ''
+      hyprlandConf = with colors.scheme.default.hex; ''
         ${workspaces}
         ${monitors}
-        monitor=,highres,auto,auto
+        monitor=,preferred,auto,1,mirror,${toString mainMonitor}
 
         general {
           border_size=3
           gaps_in=0
           gaps_out=0
-          col.active_border=0x99005577
-          col.inactive_border=0x66333333
+          col.active_border=0x99${active}
+          col.inactive_border=0x66${inactive}
           layout=dwindle
         }
 
@@ -250,7 +253,6 @@ with host;
         bind=SUPER,L,exec,${pkgs.swaylock}/bin/swaylock
         bind=SUPER,E,exec,GDK_BACKEND=x11 ${pkgs.pcmanfm}/bin/pcmanfm
         bind=SUPER,H,togglefloating,
-        #bind=SUPER,Space,exec,${pkgs.rofi}/bin/rofi -show drun
         bind=SUPER,Space,exec, pkill wofi || ${pkgs.wofi}/bin/wofi --show drun
         bind=SUPER,P,pseudo,
         bind=SUPER,F,fullscreen,

diff --git a/modules/editors/nvim.nix b/modules/editors/nvim.nix
@@ -1,16 +1,20 @@
 { lib, pkgs, ... }:
 
+let
+  colors = import ../theming/colors.nix;
+in
 {
-  # steam-run for codeium-vim
-  # start nvim in bash first time, so the spell files can be downloaded
-  programs.zsh.shellAliases = {
-    vim = "${pkgs.steam-run}/bin/steam-run nvim";
-    nvim = "${pkgs.steam-run}/bin/steam-run nvim";
-  };
+  # # steam-run for codeium-vim
+  # # start nvim in bash first time, so the spell files can be downloaded
+  # programs.zsh.shellAliases = {
+  #   vim = "${pkgs.steam-run}/bin/steam-run nvim";
+  #   nvim = "${pkgs.steam-run}/bin/steam-run nvim";
+  # };
   programs.nixvim = {
     enable = true;
     viAlias = true;
     vimAlias = true;
+    defaultEditor = true;
 
     autoCmd = [
       {
@@ -229,6 +233,14 @@
       neo-tree = {
         enable = true;
         window.width = 30;
+        closeIfLastWindow = true;
+        extraOptions = {
+          filesystem = {
+            filtered_items = {
+              visible = true;
+            };
+          };
+        };
       };
       undotree = {
         enable = true;
@@ -312,22 +324,23 @@
           "<C-f>" = "cmp.mapping.scroll_docs(4)";
           "<C-Space>" = "cmp.mapping.complete()";
           "<C-e>" = "cmp.mapping.close()";
-          # "<Tab>" = {
-          #   modes = ["i" "s"];
-          #   action = "cmp.mapping.select_next_item()";
-          # };
-          # "<S-Tab>" = {
-          #   modes = ["i" "s"];
-          #   action = "cmp.mapping.select_prev_item()";
-          # };
-          "<C-j>" = {
+          "<Tab>" = {
             modes = ["i" "s"];
             action = "cmp.mapping.select_next_item()";
           };
-          "<C-k>" = {
+          "<S-Tab>" = {
             modes = ["i" "s"];
             action = "cmp.mapping.select_prev_item()";
           };
+          # # When codeium-vim is active:
+          # "<C-j>" = {
+          #   modes = ["i" "s"];
+          #   action = "cmp.mapping.select_next_item()";
+          # };
+          # "<C-k>" = {
+          #   modes = ["i" "s"];
+          #   action = "cmp.mapping.select_prev_item()";
+          # };
           "<CR>" = "cmp.mapping.confirm({ select = true })";
         };
         sources = [
@@ -346,7 +359,7 @@
       friendly-snippets
       orgmode
       vim-table-mode
-      codeium-vim
+      # codeium-vim
       (pkgs.vimUtils.buildVimPlugin rec {
         pname = "scope-nvim";
         version = "cd27af77ad61a7199af5c28d27013fb956eb0e3e";
@@ -385,11 +398,11 @@
 
       require('org-bullets').setup()
     '';
-    extraConfigLuaPre = ''
+    extraConfigLuaPre = with colors.scheme.default.hex; ''
       require('orgmode').setup_ts_grammar()
       require('onedarkpro').setup({
         colors = {
-          bg = "#111111",
+          bg = "#${bg}",
         }
       })
     '';

diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
@@ -4,6 +4,9 @@
 
 { pkgs, vars, ... }:
 
+let
+  colors = import ../theming/colors.nix;
+in
 {
   home-manager.users.${vars.user} = {
     programs = {
@@ -14,7 +17,7 @@
           confirm_os_window_close=0;
           enable_audio_bell="no";
           resize_debounce_time="0";
-          background="#111111";
+          background="#${colors.scheme.default.hex.bg}";
         };
       };
     };

diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
@@ -3,7 +3,9 @@
 #
 
 { config, lib, pkgs, vars, host, ...}:
-
+let
+  colors = import ../theming/colors.nix;
+in
 with host;
 let
   output =
@@ -43,7 +45,7 @@ in
       waybar
     ];
 
-    home-manager.users.${vars.user} = {
+    home-manager.users.${vars.user} = with colors.scheme.default; {
       programs.waybar = {
         enable = true;
         package = pkgs.waybar;
@@ -61,15 +63,13 @@ in
             text-shadow: 0px 0px 5px #000000;
           }
           button:hover {
-            background-color: rgba(80,100,100,0.4);
+            background-color: rgba(${rgb.active},0.4);
           }
           window#waybar {
-            background-color: rgba(0,0,0,0.5);
-            background: transparent;
+            background-color: #${hex.bg};
             transition-property: background-color;
             transition-duration: .5s;
-            /*border-bottom: none;*/
-            border-bottom: 1px solid rgba(0, 85, 119, 0.99);
+            border-bottom: 1px solid rgba(${rgb.active}, 0.99);
           }
           window#waybar.hidden {
             opacity: 0.2;
@@ -92,32 +92,31 @@ in
           #custom-kb,
           #custom-ds4,
           #tray {
-            color: #999999;
+            color: #${hex.text};
             background-clip: padding-box;
           }
           #custom-menu {
-            color: #A7C7E7;
+            color: rgba(${rgb.cyan}, 0.9);
             padding: 0px 5px 0px 5px;
           }
           #workspaces button {
             padding: 0px 7px;
             min-width: 5px;
-            color: rgba(255,255,255,0.8);
+            color: rgba(${rgb.text},1);
           }
           #workspaces button:hover {
             background-color: rgba(0,0,0,0.2);
           }
           #workspaces button.visible {
-            background-color: rgba(0, 85, 119, 0.3);
+            background-color: rgba(${rgb.active}, 0.3);
           }
           /*#workspaces button.focused {*/
           #workspaces button.active {
-            color: rgba(255,255,255,0.8);
-            /*background-color: rgba(80,100,100,0.4);*/
-            background-color: rgba(0, 85, 119, 0.99);
+            color: rgba(${rgb.fg},1);
+            background-color: rgba(${rgb.active}, 0.99);
           }
           #workspaces button.hidden {
-            color: #999999;
+            color: #${hex.text};
           }
           #battery.warning {
             color: #ff5d17;

diff --git a/modules/programs/wofi.nix b/modules/programs/wofi.nix
@@ -4,6 +4,9 @@
 
 { config, lib, pkgs, vars, ... }:
 
+let
+  colors = import ../theming/colors.nix;
+in
 {
   config = lib.mkIf (config.wlwm.enable) {
     home-manager.users.${vars.user} = {
@@ -13,13 +16,13 @@
         ];
       };
 
-      home.file = {
+      home.file = with colors.scheme.default.hex; {
         ".config/wofi/config" = {
           text = ''
             width=100%
-            lines=1
+            height=27
             xoffset=0
-            yoffset=-28
+            yoffset=-27
             location=1
             prompt=Search...
             filter_rate=100
@@ -30,45 +33,42 @@
             content_halign=fill
             insensitive=true
             allow_images=true
-            image_size=15
+            image_size=10
             hide_scroll=true
           '';
         };
         ".config/wofi/style.css" = {
           text = ''
             window {
-              margin: 0px;
-              background-color: #111111;
-              min-height: 27px;
+              background-color: #${bg};
             }
 
             #input {
               all: unset;
               border: none;
-              color: #999999;
-              background-color: #111111;
+              color: #${text};
+              background-color: #${bg};
               padding-left: 5px;
             }
 
             #outer-box {
-              margin: 0px;
               border: none;
-              border-bottom: 1px solid #005577;
+              border-bottom: 1px solid #${active};
             }
 
             #text:selected {
               color: rgba(255, 255, 255, 0.8);
             }
 
             #entry {
-              color: #999999;
+              color: #${text};
               padding-right: 10px;
             }
 
             #entry:selected {
               all: unset;
               border-radius: 0px;
-              background-color: #005577;
+              background-color: #${active};
               padding-right: 10px;
             }
 

diff --git a/modules/theming/colors.nix b/modules/theming/colors.nix
@@ -4,6 +4,48 @@
 
 {
   scheme = {
+    default = {
+      scheme = "One Dark Pro";
+      hex = {
+        bg = "111111"; # 283c34
+        fg = "abb2bf";
+        red = "e06c75";
+        orange = "d19a66";
+        yellow = "e5c07b";
+        green = "98c379";
+        cyan = "56b6c2";
+        blue = "61afef";
+        purple = "c678dd";
+        white = "abb2bf";
+        black = "282c34";
+        gray = "5c6370";
+        highlight = "e2be7d";
+        comment = "7f848e";
+        active = "005577";
+        inactive = "333333";
+        text = "999999";
+      };
+      rgb = {
+        bg = "17, 17, 17";
+        fg = "171, 178, 191";
+        red = "224, 108, 118";
+        orange = "209, 154, 102";
+        yellow = "229, 192, 123";
+        green = "152, 195, 121";
+        cyan = "86, 181, 194";
+        blue = "97, 175, 223";
+        purple = "197, 120, 221";
+        white = "171, 178, 191";
+        black = "40, 44, 52";
+        gray = "92, 99, 112";
+        highlight = "226, 191, 125";
+        comment = "127, 132, 142";
+        active = "0, 85, 119";
+        inactive = "51, 51, 51";
+        text = "153, 153, 153";
+      };
+    };
+
     doom = {
       scheme    = "Doom One Dark";
       black     = "000000";