From e368b1ca3d809f5f124fd516ec46c6131005f770 Mon Sep 17 00:00:00 2001
From: Matei Adriel <rafaeladriel11@gmail.com>
Date: Tue, 10 May 2022 20:04:51 +0300
Subject: [PATCH] feat: finally settled down on a theme
---
modules/applications/xmonad/Main.hs | 19 ++++++++-----------
modules/themes/catppuccin/default.nix | 8 +++++---
modules/themes/catppuccin/nvim.lua | 4 +++-
modules/themes/themes.nix | 9 +++++++--
4 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/modules/applications/xmonad/Main.hs b/modules/applications/xmonad/Main.hs
index 1b73123..42df757 100644
--- a/modules/applications/xmonad/Main.hs
+++ b/modules/applications/xmonad/Main.hs
@@ -1,11 +1,9 @@
{-# LANGUAGE BlockArguments #-}
-import System.Environment
-import System.Process
-
import Control.Monad (join)
import Data.Function ((&))
-
+import System.Environment
+import System.Process
import XMonad
import XMonad.Actions.SpawnOn
import XMonad.Config (defaultConfig)
@@ -14,8 +12,8 @@ import XMonad.Hooks.EwmhDesktops (ewmh, fullscreenEventHook)
import XMonad.Hooks.ManageDocks
import XMonad.Layout.Spacing
import XMonad.Layout.ThreeColumns
-import XMonad.Util.EZConfig
import XMonad.Operations
+import XMonad.Util.EZConfig
kdeOn :: Bool
kdeOn = False
@@ -81,11 +79,11 @@ main =
-- TODO: find a way to bind all the program-opening-keybindings to a single sub-map
keymap =
- [ ("M-p", spawn "rofi -show run")
- , ("M-g", spawn myBrowser)
- , ("M-d", spawn "Discord")
- , ("M-v", spawn "alacritty -e vimclip")
- , ("M-c", kill)
+ [ ("M-p", spawn "rofi -show run"),
+ ("M-g", spawn myBrowser),
+ ("M-d", spawn "Discord"),
+ ("M-v", spawn "alacritty -e vimclip"),
+ ("M-c", kill)
]
uniformBorder = join $ join $ join Border
@@ -102,4 +100,3 @@ main =
startup = do
-- The file is dynamically set in wallpaper.nix
spawn "xwallpaper --zoom ~/.config/wallpaper"
-
diff --git a/modules/themes/catppuccin/default.nix b/modules/themes/catppuccin/default.nix
index ae9ff94..74c9ed4 100644
--- a/modules/themes/catppuccin/default.nix
+++ b/modules/themes/catppuccin/default.nix
@@ -5,7 +5,7 @@ let
foreign = pkgs.callPackage (import ./foreign.nix) { };
in
{
- wallpaper = "${foreign.wallpapers}/${wallpaper}";
+ wallpaper = wallpaper.foreign or "${foreign.wallpapers}/${wallpaper}";
name = "catppuccin";
neovim = {
@@ -35,8 +35,10 @@ in
import = [ "${foreign.alacritty}/catppuccin.yml" ];
window = {
padding = {
- x = 8;
- y = 8;
+ x = 0;
+ y = 0;
+ # x = 8;
+ # y = 8;
};
gtk_theme_variant = "dark";
diff --git a/modules/themes/catppuccin/nvim.lua b/modules/themes/catppuccin/nvim.lua
index 67dda3f..df25908 100644
--- a/modules/themes/catppuccin/nvim.lua
+++ b/modules/themes/catppuccin/nvim.lua
@@ -1,6 +1,8 @@
local catppuccin = require("catppuccin")
catppuccin.setup({
- transparet_background = true,
+ transparent_background = true,
integrations = {nvimtree = {transparent_panel = true}}
})
+
+vim.cmd [[colorscheme catppuccin]]
diff --git a/modules/themes/themes.nix b/modules/themes/themes.nix
index 67f376c..3f619ff 100644
--- a/modules/themes/themes.nix
+++ b/modules/themes/themes.nix
@@ -6,8 +6,13 @@ in
lib.lists.map (theme: pkgs.callPackage theme { }) [
(catppuccin {
# wallpaper = "os/nix-magenta-pink-1920x1080.png";
- wallpaper = "minimalistic/tetris.png";
- transparency = 0.6;
+ # wallpaper = "minimalistic/tetris.png";
+ # wallpaper = "os/nix-black-4k.png";
+ # wallpaper = "landscapes/forrest.png";
+ # wallpaper = "landscapes/salty_mountains.png";
+ # wallpaper = "misc/rainbow.png";
+ wallpaper.foreign = ./wallpapers/eye.png;
+ transparency = 0.8;
})
(githubVariant {
variant = "light";