diff --git a/home/TODOS.md b/home/TODOS.md
index d68c7ca..f659821 100644
--- a/home/TODOS.md
+++ b/home/TODOS.md
@@ -14,10 +14,6 @@
- Kalender
- Signing
-## Audio
-
-- alsa
-
## Lockscreen
- Lockscreen implementieren
@@ -59,12 +55,15 @@
- Installieren
+## Catppuccin Theme
+
+- Firefox
+- Ecosia
+- Anki
+- Zathura
+
# Optimierung
-## Pulseaudio
-
-- einrichten
-
## Rofi
- Theme wählen
diff --git a/home/programs/neovim/lua/plugins/catppuccin-nvim.lua b/home/programs/neovim/lua/plugins/catppuccin-nvim.lua
index dec75b9..b3e7c93 100644
--- a/home/programs/neovim/lua/plugins/catppuccin-nvim.lua
+++ b/home/programs/neovim/lua/plugins/catppuccin-nvim.lua
@@ -5,7 +5,7 @@ return {
name = "catppuccin",
priority = 1000,
config = function()
- vim.cmd.colorscheme("catppuccin")
+ vim.cmd.colorscheme("catppuccin-mocha")
end,
opts = {
flavor = "mocha",
diff --git a/home/programs/rofi/theme.rafi b/home/programs/rofi/theme.rafi
index 2509073..c59fb5d 100644
--- a/home/programs/rofi/theme.rafi
+++ b/home/programs/rofi/theme.rafi
@@ -9,7 +9,7 @@
grey: #6e738d;
width: 600;
- font: "JetBrainsMono Nerd Font 14";
+ font: "Fira Code 14";
}
element-text, element-icon , mode-switcher {
diff --git a/home/programs/xmonad/src/xmobar/xmobar.hs b/home/programs/xmonad/src/xmobar/xmobar.hs
index be86dc6..bad2ce5 100644
--- a/home/programs/xmonad/src/xmobar/xmobar.hs
+++ b/home/programs/xmonad/src/xmobar/xmobar.hs
@@ -5,58 +5,58 @@ config =
defaultConfig
{ font = "Fira Code 10"
, position = TopH 25
- , borderColor = "#f38ba8"
+ , borderColor = "#11111b"
, border = FullB
, borderWidth = 2
- , bgColor = "#eba0ac"
- , fgColor = "#b4befe"
+ , bgColor = "#1e1e2e"
+ , fgColor = "#f5e0dc"
, commands =
[
- Run $ Com "/bin/sh" ["-c", "Status=$(pulseaudio-ctl full-status); Volume=$(cut -d ' ' -f 1 <<<$Status); Mute=$(cut -d ' ' -f 2 <<<$Status); Microphone=$(cut -d ' ' -f 3 <<<$ Status); if [[ $Mute == \"yes\" ]]; then Symbol=\"\xf466\"; elif [[ $Volume -le 50 ]]; then Symbol=\"\xf027\"; elseSymbol=\"\xf028\"; fi; if [[ $Microphone == *\"yes\"* ]]; then MicOut=\"\xf036d\"; else MicOut=\"\xf036c\"; fi; echo \"$Symbol $Volume% $MicOut\""] "audio" 100
- , Run $ Com "/bin/sh" ["-c", "echo \"\xf00e0 $(xbacklight -get)%\""] "backlight" 100
+ Run $ Com "/bin/sh" ["-c", "Status=$(pulseaudio-ctl full-status); Volume=$(cut -d ' ' -f 1 <<<$Status); Mute=$(cut -d ' ' -f 2 <<<$Status); Microphone=$(cut -d ' ' -f 3 <<<$Status); SpeakerColor=\"#a6e3a1\"; MicColor=\"#a6e3a1\"; if [[ $Mute == \"yes\" ]]; then Symbol=\"\xf466\"; SpeakerColor=\"#f38ba8\"; elif [[ $Volume -le 50 ]]; then Symbol=\"\xf027\"; elseSymbol=\"\xf028\"; fi; if [[ $Microphone == \"yes\" ]]; then MicOut=\"\xf036d\"; MicColor=\"#f38ba8\"; else MicOut=\"\xf036c\"; fi; echo \"$Symbol $Volume% $MicOut\""] "audio" 10
+ , Run $ Com "/bin/sh" ["-c", "echo \"\xf00e0 $(xbacklight -get)%\""] "backlight" 10
, Run $ Cpu
[
- "--template", "\xf085 %"
+ "--template", "\xf085 %"
, "--Low","3"
, "--High","50"
- , "--low","#bbc2cf"
- , "--normal","#bbc2cf"
- , "--high","#fb4934"
+ , "--low","#f5e0dc"
+ , "--normal","#f5e0dc"
+ , "--high","#f38ba8"
] 50
, Run $ Memory
[
- "-t","\xF2DB %"
+ "-t","\xF2DB %"
,"-H","80"
,"-L","10"
- ,"-l","#bbc2cf"
- ,"-n","#bbc2cf"
- ,"-h","#fb4934"
+ ,"-l","#f5e0dc"
+ ,"-n","#f5e0dc"
+ ,"-h","#f38ba8"
] 50
- , Run $ Date "\xf017 %a %d.%m.%y %H:%M" "date" 300
+ , Run $ Date "\xf017 %a %d.%m.%y %H:%M" "date" 300
, Run $ DynNetwork
[
- "-t","\xf063 \xf062 "
+ "-t","\xf063 \xf062 "
,"-H","200"
,"-L","10"
- ,"-h","#bbc2cf"
- ,"-l","#bbc2cf"
- ,"-n","#bbc2cf"
+ ,"-h","#f5e0dc"
+ ,"-l","#f5e0dc"
+ ,"-n","#f38ba8"
] 50
, Run $ BatteryP [ "BAT0" ]
[
- "--template" , "\xf240 "
+ "--template" , "\xf240 "
, "--Low" , "10" -- units: %
, "--High" , "80" -- units: %
- , "--low" , "#fb4934"
- , "--normal" , "#bbc2cf"
- , "--high" , "#98be65"
+ , "--low" , "#f38ba8"
+ , "--normal" , "#f5e0dc"
+ , "--high" , "#a6e3a1"
, "--" -- battery specific options
-- discharging status
, "-o" , "% ()"
-- AC "on" status
- , "-O" , "% (Charging)"
+ , "-O" , "% (Charging)"
-- charged status
- , "-i" , "Charged"
+ , "-i" , "Charged"
] 50
, Run XMonadLog
]
diff --git a/home/programs/xmonad/src/xmonad.hs b/home/programs/xmonad/src/xmonad.hs
index f468c28..47a0bfb 100644
--- a/home/programs/xmonad/src/xmonad.hs
+++ b/home/programs/xmonad/src/xmonad.hs
@@ -10,7 +10,6 @@ import XMonad.Layout.Magnifier
import XMonad.Util.ClickableWorkspaces
import XMonad.Util.Loggers
import Data.ByteString (maximum)
-import Text.XHtml (gray)
import Distribution.Compat.Prelude (print)
@@ -20,14 +19,14 @@ myconfig = def
{
layoutHook = myLayout
, terminal = "alacritty"
- , normalBorderColor = "#050508"
- , focusedBorderColor = "#89b4fa"
+ , normalBorderColor = "#f5c2e7"
+ , focusedBorderColor = "#cdd6f4"
}
`additionalKeysP`
[
-- System
("M-p", spawn "rofi -show \"drun\"")
- , ("", spawn "maim --format=png \"/home/elias/Pictures/screenshot-$(date -u +'%Y-%m-%d-%H:%M:%S.png')\"")
+ , ("", spawn "maim --format=png \"/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S)\"")
--Program
, ("M-c", spawn "firefox")
-- Brightness
@@ -38,15 +37,17 @@ myconfig = def
, ("", spawn "pulseaudio-ctl up 5")
, ("", spawn "pulseaudio-ctl down 5")
, ("", spawn "pulseaudio-ctl mute-input")
+ -- Print
+ , ("", spawn "pulseaudio-ctl mute-input")
]
`removeKeysP` []
myXmobarPP :: PP
myXmobarPP = def
{
- ppSep = magenta " • "
+ ppSep = pink " • "
, ppWsSep = ""
- , ppCurrent = wrap " " "" . xmobarBorder "Top" "#a8dfe3" 2
+ , ppCurrent = wrap " " "" . xmobarBorder "Top" "#f5c2e7" 2
, ppHidden = wrap " " ""
, ppHiddenNoWindows = gray . wrap " " ""
, ppUrgent = red . wrap (yellow "!") (yellow "!")
@@ -55,17 +56,17 @@ myXmobarPP = def
, ppExtras = [logTitles formatFocused formatUnfocused]
}
where
- formatFocused = wrap "[" "]" . magenta . ppWindow
+ formatFocused = wrap "[" "]" . pink . ppWindow
formatUnfocused = wrap "[" "]" . gray . ppWindow
ppWindow :: String -> String
ppWindow = xmobarRaw . (\w -> if null w then "???" else w) . shorten 15 -- set maximum length of windowtitle to 15
- magenta, gray, red, yellow :: String -> String
- magenta = xmobarColor "#ff79c6" ""
- gray = xmobarColor "#5c5e5e" ""
- red = xmobarColor "#ff5555" ""
- yellow = xmobarColor "#f1fa8c" ""
+ pink, gray, red, yellow :: String -> String
+ pink = xmobarColor "#f5c2e7" ""
+ gray = xmobarColor "#cdd6f4" ""
+ red = xmobarColor "#f38ba8" ""
+ yellow = xmobarColor "#f9e2af" ""
myLayout = Tall 1 (3/100) (1/2) ||| Mirror (Tall 1 (3/100) (1/2)) ||| Full ||| ThreeColMid 1 (3/100) (1/2) -- wenn wieder zoom von fokusierten Seitenfenstern gewünscht, dann Fireox fixn und: magnifiercz' 1.3 (ThreeColMid 1 (3/100) (1/2))
diff --git a/home/programs/zathura.nix b/home/programs/zathura.nix
index 68ca88b..2b68673 100644
--- a/home/programs/zathura.nix
+++ b/home/programs/zathura.nix
@@ -1,13 +1,21 @@
{ ... }:
-{
+let
+ theme = builtins.fetchurl {
+ url =
+ "https://raw.githubusercontent.com/catppuccin/zathura/main/src/catppuccin-mocha";
+ sha256 = "1zhx3bfz5s2wjrj87w0ryh15vgsqqfhg6dm48p63r5fmqwsak721";
+ };
+in {
programs.zathura = {
enable = true;
options = {
synctex-editor-command = ''
+ include ${theme}
nvim --headless -c "VimtexInverseSearch %l '%f'"
'';
synctex = true;
+ font = "Fira Code 16";
};
};
}