diff --git a/.gitignore b/.gitignore index 3f45bb6..c851d83 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /.config/lite-xl/ws/ +.aider* diff --git a/doom/config.el b/doom/config.el index a46579e..beff491 100644 --- a/doom/config.el +++ b/doom/config.el @@ -5,13 +5,14 @@ (load "doom-themes") ;; doom-henna, doom-nord, doom-one, doom-opera, doom-miramare, doom-manegarm -(setq doom-theme 'doom-pine) +(setq doom-theme 'doom-1337) (setq display-line-numbers-type 'relative) (setq org-directory "~/org/") -(setq doom-font (font-spec :family "BigBlueTerm437 Nerd Font" :size 15)) +;;(setq doom-font (font-spec :family "ProFont IIx Nerd Font" :size 15)) +(setq doom-font (font-spec :family "Hack Nerd Font Mono" :size 14)) (beacon-mode 1) (good-scroll-mode 1) @@ -29,4 +30,7 @@ (map! :leader :desc "Aider command" "a" #'aider-command) -(set-frame-parameter nil 'alpha-background 50) +(set-frame-parameter nil 'alpha-background 60) + +(after! evil + (add-to-list 'evil-keyword "_")) diff --git a/doom/packages.el b/doom/packages.el index 4e2266d..6c0cfd3 100644 --- a/doom/packages.el +++ b/doom/packages.el @@ -52,11 +52,11 @@ (package! tldr) ;;(package! haskell-mode) ;;(package! lsp-haskell) -(package! elcord) +;(package! elcord) (package! beacon) (package! good-scroll) (package! sublime-themes) (package! color-theme-sanityinc-tomorrow) (package! jazz-theme) -(package! aider :recipe (:host github :repo "tninja/aider.el" )) +;(package! aider :recipe (:host github :repo "tninja/aider.el" )) diff --git a/primary-startup.sh b/primary-startup.sh index bc244e1..ecab7cb 100755 --- a/primary-startup.sh +++ b/primary-startup.sh @@ -1,8 +1,6 @@ #!/bin/bash setxkbmap -option "caps:ctrl_modifier" -xset r rate 350 30 +xset r rate 200 30 xrandr --output DisplayPort-0 --primary --mode 3440x1440 --rate 143.97 --output DisplayPort-1 --mode 2560x1440 --rate 144 --left-of DisplayPort-0 -# TODO: Improve this -redshift -O 4000 diff --git a/symlinks.sh b/symlinks.sh index d48db6e..3b5049f 100755 --- a/symlinks.sh +++ b/symlinks.sh @@ -4,15 +4,15 @@ DOTFILES_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" declare -A DIRS -DIRS["alacritty"]="$HOME/.config/alacritty" -DIRS["doom"]="$HOME/.config/doom" -DIRS["i3"]="$HOME/.config/i3" +#DIRS["alacritty"]="$HOME/.config/alacritty" +#DIRS["doom"]="$HOME/.config/doom" +#DIRS["i3"]="$HOME/.config/i3" DIRS["polybar"]="$HOME/.config/polybar" -DIRS["qtile"]="$HOME/.config/qtile" +#DIRS["qtile"]="$HOME/.config/qtile" DIRS["xmobar"]="$HOME/.config/xmobar" DIRS["xmonad"]="$HOME/.config/xmonad" -DIRS["bin/nixos-update-script"]="$HOME/.local/bin/nixos-update-script" +#DIRS["bin/nixos-update-script"]="$HOME/.local/bin/nixos-update-script" for DIR in "${!DIRS[@]}"; do TARGET="${DIRS[$DIR]}" diff --git a/xmobar/blue-lake-xmobarrc b/xmobar/blue-lake-xmobarrc new file mode 100644 index 0000000..79ec310 --- /dev/null +++ b/xmobar/blue-lake-xmobarrc @@ -0,0 +1,9 @@ +Config { bgColor = "#23497E" + , fgColor = "#70A6DC" + , font = "xft:BigBlueTermPlus Nerd Font-12" + , additionalFonts = [] + , commands = [ Run Date "%a %Y-%m-%d %H:%M" "date" 10 + , Run XMonadLog + ] + , alignSep = "}{" + , template = "  %XMonadLog% }{ %date% "} diff --git a/xmobar/dusk-cloud-xmobarrc b/xmobar/dusk-cloud-xmobarrc new file mode 100644 index 0000000..34cbabe --- /dev/null +++ b/xmobar/dusk-cloud-xmobarrc @@ -0,0 +1,9 @@ +Config { bgColor = "#000000" + , fgColor = "#C0C0C0" + , font = "xft:BigBlueTermPlus Nerd Font-12" + , additionalFonts = [] + , commands = [ Run Date "%a %Y-%m-%d %H:%M" "date" 10 + , Run XMonadLog + ] + , alignSep = "}{" + , template = "  %XMonadLog% }{ %date% "} \ No newline at end of file diff --git a/xmobar/purple-subway-xmobarrc b/xmobar/purple-subway-xmobarrc new file mode 100644 index 0000000..06c1590 --- /dev/null +++ b/xmobar/purple-subway-xmobarrc @@ -0,0 +1,9 @@ +Config { bgColor = "#23497E" + , fgColor = "#4987C6" + , font = "xft:BigBlueTermPlus Nerd Font-12" + , additionalFonts = [] + , commands = [ Run Date "%a %Y-%m-%d %H:%M" "date" 10 + , Run XMonadLog + ] + , alignSep = "}{" + , template = "  %XMonadLog% }{ %date% "} diff --git a/xmonad/lib/BlueLakeTheme.hs b/xmonad/lib/BlueLakeTheme.hs new file mode 100644 index 0000000..b9915a5 --- /dev/null +++ b/xmonad/lib/BlueLakeTheme.hs @@ -0,0 +1,17 @@ +module BlueLakeTheme (blueLakeTheme) where +import Theme (Theme(..)) +import XMonad.Hooks.StatusBar.PP + +blueLakeXmobarPP :: PP +blueLakeXmobarPP = def + { ppSep = " • " + } + +blueLakeTheme :: Theme +blueLakeTheme = Theme { themeName = "Blue Lake" + , themeBarConfig = "~/.config/xmobar/blue-lake-xmobarrc" + , themeBorderColor = "#23497E" + , themeFocusedBorderColor = "#376899" + , themeWallpaper = "/home/reo/Wallpapers/lake1.jpg" + , themeXmobarPP = blueLakeXmobarPP + } diff --git a/xmonad/lib/DuskCloudTheme.hs b/xmonad/lib/DuskCloudTheme.hs new file mode 100644 index 0000000..cf67dde --- /dev/null +++ b/xmonad/lib/DuskCloudTheme.hs @@ -0,0 +1,17 @@ +module DuskCloudTheme (duskCloudTheme) where +import Theme (Theme(..)) +import XMonad.Hooks.StatusBar.PP + +duskCloudXmobarPP :: PP +duskCloudXmobarPP = def + { ppSep = " • " + } + +duskCloudTheme :: Theme +duskCloudTheme = Theme { themeName = "Dusk Cloud" + , themeBarConfig = "~/.config/xmobar/dusk-cloud-xmobarrc" + , themeBorderColor = "#333333" + , themeFocusedBorderColor = "#FFFFFF" + , themeWallpaper = "/home/reo/Wallpapers/sky.jpg" + , themeXmobarPP = duskCloudXmobarPP + } \ No newline at end of file diff --git a/xmonad/lib/NaturalGreenTheme.hs b/xmonad/lib/NaturalGreenTheme.hs index 0992253..b04d45f 100644 --- a/xmonad/lib/NaturalGreenTheme.hs +++ b/xmonad/lib/NaturalGreenTheme.hs @@ -12,6 +12,6 @@ naturalGreenTheme = Theme { themeName = "Natural Green" , themeBarConfig = "~/.config/xmobar/natural-green-xmobarrc" , themeBorderColor = "#425F57" , themeFocusedBorderColor = "#749F82" - , themeWallpaper = "/home/reo/Wallpapers/forest1.jpg" + , themeWallpaper = "/home/reo/Wallpapers/forest3.png" , themeXmobarPP = naturalGreenXmobarPP } diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index fa864aa..e4a0df5 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -9,6 +9,8 @@ import XMonad.Layout.Spacing import Theme import NaturalGreenTheme +import BlueLakeTheme +import DuskCloudTheme main = do xmonad . ewmhFullscreen . ewmh . withEasySB (statusBarProp ("xmobar " ++ themeWallpaper myTheme) (pure $ themeXmobarPP myTheme)) defToggleStrutsKey $ myConfig @@ -26,19 +28,20 @@ myConfig = def { terminal = myTerminal myTerminal = "alacritty" myModMask = mod4Mask -myBorderWidth = 2 +myBorderWidth = 0 myEmacs = "emacsclient -c -a 'emacs' " -myBrowser = "firefox" +myBrowser = "vivaldi" myWorkBrowser = "firefox -P emre@mixrank.com" -myTheme = naturalGreenTheme +myTheme = duskCloudTheme myLauncher = ".config/rofi/launchers/type-6/launcher.sh" myPowerMenu = ".config/rofi/powermenu/type-6/powermenu.sh" myGapSize = 13 myStartupHook :: X () myStartupHook = do + spawn $ "dotfiles/primary-startup.sh" spawn $ "/usr/bin/xmobar " ++ themeBarConfig myTheme - spawn $ "feh --bg-fill " ++ themeWallpaper myTheme + spawn $ "feh --bg-scale " ++ themeWallpaper myTheme spawn "xscreensaver -no-splash" spawnOnce "trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 10 --transparent true --tint 0x5f5f5f --height 31" spawn "emacs --daemon" @@ -48,7 +51,7 @@ myKeybindings :: [(String, X())] myKeybindings = [ ("M-S-e", spawn myEmacs) , ("M-S-", spawn myWorkBrowser) , ("M-S-f", spawn myBrowser) - , ("M-s", spawn "scrot -s - | xclip -selection clipboard -t image/png") + , ("M-s", spawn "maim -s | xclip -selection clipboard -t image/png") , ("", spawn "brightnessctl s +4%") , ("", spawn "brightnessctl s 4%-") , ("", spawn "amixer -q sset Master 3%+") @@ -57,6 +60,7 @@ myKeybindings = [ ("M-S-e", spawn myEmacs) , ("M-q", spawn "xmonad --recompile; killall xmobar; killall picom; xmonad --restart") , ("M-d", spawn myLauncher) , ("M-S-d", spawn myPowerMenu) + , ("", spawn "playerctl play-pause") ] myLayoutHook = tiled ||| Mirror tiled ||| Full