From a1921a342b1426705c4fca02d78f8546b13106d8 Mon Sep 17 00:00:00 2001 From: natto1784 Date: Mon, 7 Feb 2022 14:45:50 +0530 Subject: [PATCH] changed color themes --- home/stuff/programs/ncmpcpp.nix | 14 +++--- hosts/satori/services.nix | 1 + modules/emacs/init.el | 82 ++++++++++++-------------------- overlays/customscripts/src/ytmp3 | 4 +- overlays/patches/st.patch | 38 +++++++-------- 5 files changed, 60 insertions(+), 79 deletions(-) diff --git a/home/stuff/programs/ncmpcpp.nix b/home/stuff/programs/ncmpcpp.nix index ebc1204..de0153a 100644 --- a/home/stuff/programs/ncmpcpp.nix +++ b/home/stuff/programs/ncmpcpp.nix @@ -12,16 +12,16 @@ browser_sort_mode="mtime"; colors_enabled = "yes"; main_window_color = "white"; - header_window_color = "180"; - volume_color = "215"; - progressbar_color = "180"; - progressbar_elapsed_color = "16"; - statusbar_color = "43"; + header_window_color = "143"; + volume_color = "222"; + progressbar_color = "143"; + # progressbar_elapsed_color = ""; + # statusbar_color = "43"; active_window_border = "blue"; user_interface = "alternative"; #song_list_format="(4)[230]{l}"; - song_columns_list_format = "(4)[230]{l} (20)[219]{t} (12)[180]{a} (16)[215]{b}"; - song_list_format = "{$(219)%a} - {$(230)%t}"; + song_columns_list_format = "(4)[167]{l} (20)[109]{t} (12)[143]{a} (16)[139]{b}"; + song_list_format = "$(222){%a} - $(109){%t}"; #song_list_format = "{$7%a - $9}{$5%t$9}|{$5%f$9}$R{$6%b $9}{$3%l$9}"; song_status_format = " $6%a $7⟫⟫ $3%t $7⟫⟫ $4%b "; visualizer_data_source = "/tmp/g.fifo"; diff --git a/hosts/satori/services.nix b/hosts/satori/services.nix index f827f5e..cdbcea5 100644 --- a/hosts/satori/services.nix +++ b/hosts/satori/services.nix @@ -13,6 +13,7 @@ ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq" ''; }; + systemd.enableUnifiedCgroupHierarchy = false; systemd.services = { tor.wantedBy = lib.mkForce [ ]; logmein-hamachi.wantedBy = lib.mkForce [ ]; diff --git a/modules/emacs/init.el b/modules/emacs/init.el index 4d34586..2e278a6 100644 --- a/modules/emacs/init.el +++ b/modules/emacs/init.el @@ -1,23 +1,24 @@ ; -*- lexical-binding: t; -*- ;;colors (setq -c-bg "#1d2021" -c-fg "#d5c4a1" -c-red "#cc241d" -c-green "#98971a" -c-yellow "#d79921" -c-blue "#458588" -c-magenta "#b16286" -c-cyan "#689d6a" -c-white "#a89984" -c-black "#928374" -c-red-2 "#fb4934" -c-green-2 "#b8bb26" -c-yellow-2 "#fabd2f" -c-blue-2 "#83a598" -c-magenta-2 "#d3869b" -c-cyan-2 "#8ec07c" -c-white-2 "#ebdbb2") +c-bg "#1d1f21" +c-fg "#c5c8c6" +c-red "#912226" +c-green "#778900" +c-yellow "#ae7b00" +c-blue "#1d2594" +c-magenta "#682a9b" +c-cyan "#2b6651" +c-white "#929593" +c-black "#969896" +c-red-2 "#cc6666" +c-green-2 "#b5bd68" +c-yellow-2 "#f0c674" +c-blue-2 "#81a2be" +c-magenta-2 "#b294bb" +c-cyan-2 "#8abeb7" +c-white-2 "#ecebec") + ;;settings (set-face-attribute 'default nil :font "Monoid" :height 120) (global-hl-line-mode 1) @@ -44,18 +45,16 @@ c-white-2 "#ebdbb2") (package-initialize) (require 'use-package) -;;package config and modes -;(use-package gruvbox-theme -; :init (load-theme 'gruvbox-dark-hard t)) - +(use-package solaire-mode + :config + (solaire-mode)) (use-package doom-themes :config (setq doom-themes-enable-bold t doom-themes-enable-italic t - doom-themes-treemacs-theme "doom-colors" - doom-gruvbox-dark-variant "hard") - (load-theme 'doom-gruvbox t) + doom-themes-treemacs-theme "doom-colors") + (load-theme 'doom-tomorrow-night t) (doom-themes-visual-bell-config) (doom-themes-treemacs-config) (doom-themes-org-config)) @@ -168,6 +167,11 @@ c-white-2 "#ebdbb2") (use-package nix-mode :mode "\\.nix\\'") +(use-package hcl-mode + :mode + "\\.hcl\\'" + "\\.nomad\\'") + (use-package projectile) (use-package vterm @@ -179,22 +183,15 @@ c-white-2 "#ebdbb2") (use-package centaur-tabs :config - (setq centaur-tabs-style "bar" - centaur-tabs-set-bar 'left + (setq centaur-tabs-style "box" +; centaur-tabs-set-bar 'left centaur-tabs-height 18 centaur-tabs-set-modified-marker t centaur-tabs-set-icons t) (centaur-tabs-group-buffer-groups) (centaur-tabs-mode 1) (centaur-tabs-headline-match) - (set-face-attribute 'tab-line nil :background c-bg :foreground c-fg) - (set-face-attribute 'centaur-tabs-active-bar-face nil :background c-red-2) - (set-face-attribute 'centaur-tabs-modified-marker-selected nil :foreground c-red-2) - (set-face-attribute 'centaur-tabs-modified-marker-unselected nil :foreground c-red-2) - (set-face-attribute 'centaur-tabs-selected nil :background c-fg :foreground c-bg) - (set-face-attribute 'centaur-tabs-unselected nil :background c-bg :foreground c-fg) - (set-face-attribute 'centaur-tabs-selected-modified nil :background c-fg :foreground c-bg) - (set-face-attribute 'centaur-tabs-unselected-modified nil :background c-bg :foreground c-fg)) + (set-face-attribute 'tab-line nil :inherit 'centaur-tabs-unselected)) (use-package general) @@ -271,23 +268,6 @@ c-white-2 "#ebdbb2") (set-face-foreground 'bufname (cdr color)) )))) -;;keybinds -;(global-set-key (kbd "M-o") 'treemacs) -;(global-set-key (kbd "M-v") 'split-window-vertically) -;(global-set-key (kbd "M-h") 'split-window-horizontally) -;(global-set-key (kbd "M-C-m") 'shrink-window-horizontally) -;(global-set-key (kbd "M-C-i") 'enlarge-window-horizontally) -;(global-set-key (kbd "M-C-e") 'shrink-window) -;(global-set-key (kbd "M-C-n") 'enlarge-window) -;(global-set-key (kbd "C-S-m") 'windmove-left) -;(global-set-key (kbd "C-S-i") 'windmove-right) -;(global-set-key (kbd "C-S-e") 'windmove-up) -;(global-set-key (kbd "C-S-n") 'windmove-down) -;(global-set-key (kbd "M->") 'previous-buffer) -;(global-set-key (kbd "M-<") 'next-buffer) -;(global-set-key (kbd "M-C-S-q") 'kill-buffer) - - ;; stolen from https://www.reddit.com/r/emacs/comments/ft84xy/run_shell_command_in_new_vterm/ (defun run-in-vterm-kill (process event) "A process sentinel. Kills PROCESS's buffer if it is live." diff --git a/overlays/customscripts/src/ytmp3 b/overlays/customscripts/src/ytmp3 index 32e896e..fc7b800 100644 --- a/overlays/customscripts/src/ytmp3 +++ b/overlays/customscripts/src/ytmp3 @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p ffmpeg youtube-dl -youtube-dl -f bestaudio -o "ytmp3.%(title)s.%(ext)s" "$1" +#! nix-shell -i bash -p ffmpeg yt-dlp +yt-dlp -f bestaudio -o "ytmp3.%(title)s.%(ext)s" "$1" file=$(echo ytmp3.*.*) newfile=$(echo $file | cut -c 7-) mv "$file" "$newfile" diff --git a/overlays/patches/st.patch b/overlays/patches/st.patch index 150b631..f4b548b 100755 --- a/overlays/patches/st.patch +++ b/overlays/patches/st.patch @@ -54,28 +54,28 @@ diff --color -u a/config.def.h b/config.def.h - "#555555", -}; - - -+ [0] = "#1d2021", -+ [1] = "#cc241d", /* red */ -+ [2] = "#98971a", /* green */ -+ [3] = "#d79921", /* yellow */ -+ [4] = "#458588", /* blue */ -+ [5] = "#b16286", /* magenta */ -+ [6] = "#689d6a", /* cyan */ -+ [7] = "#a89984", /* white */ + ++ [0] = "#1d1f21", ++ [1] = "#912226", /* red */ ++ [2] = "#778900", /* green */ ++ [3] = "#ae7b00", /* yellow */ ++ [4] = "#1d2594", /* blue */ ++ [5] = "#682a9b", /* magenta */ ++ [6] = "#2b6651", /* cyan */ ++ [7] = "#929593", /* white */ + -+ [8] = "#928374", /* black */ -+ [9] = "#fb4934", /* red */ -+ [10] = "#b8bb26", /* green */ -+ [11] = "#fabd2f", /* yellow */ -+ [12] = "#83a598", /* blue */ -+ [13] = "#d3869b", /* magenta */ -+ [14] = "#8ec07c", /* cyan */ -+ [15] = "#ebdbb2", /* white */ ++ [8] = "#969896", /* black */ ++ [9] = "#cc6666", /* red */ ++ [10] = "#b5bd68", /* green */ ++ [11] = "#f0c674", /* yellow */ ++ [12] = "#81a2be", /* blue */ ++ [13] = "#b294bb", /* magenta */ ++ [14] = "#8abeb7", /* cyan */ ++ [15] = "#ecebec", /* white */ + + /* bg and fg */ -+ [256] = "#1d2021", -+ [257] = "#d5c4a1", ++ [256] = "#1d1f21", ++ [257] = "#c5c8c6", +}; /* * Default colors (colorname index)