Add dunst

This commit is contained in:
elkowar 2020-09-20 10:29:51 +02:00
parent 1ab8660ee8
commit a61f9cc7c7
15 changed files with 193 additions and 117 deletions

View file

@ -1,72 +0,0 @@
*.background: #282828
color5: #ff0000
Xcursor.size: 16
Xcursor.theme: capitaine-cursors-light
Xft.autohint: 0
Xft.antialias: 1
Xft.hinting: true
Xft.hintstyle: hintslight
Xft.dpi: 96
Xft.rgba: rgb
Xft.lcdfilter: lcddefault
rofi.lines: 5
rofi.eh: 2
rofi.padding: 200
rofi.fullscreen: true
rofi.bw: 0
rofi.separator-style: none
rofi.hide-scrollbar: true
rofi.color-enabled: true
! 'background', 'border', 'separator'
rofi.color-window: argb:c82d303b, #7c8389, #1d1f21
! State: 'bg', 'fg', 'bgalt', 'hlbg', 'hlfg'
rofi.color-normal: argb:031d1f21, #f3f4f5, argb:031d1f21, argb:031d1f21, #9575cd
rofi.color-urgent: argb:031d1f21, #f3f4f5, argb:bc303541, argb:031d1f21, #9575cd
rofi.color-active: argb:031d1f21, #f3f4f5, argb:031d1f21, argb:031d1f21, #9575cd
rofi.font: System San Francisco Display 18
dzen.font: -*-fixed-medium-r-s*--12-87-*-*-*-*-iso10???-1
URxvt.font: xft:scientifica
!URxvt.color24: #076678
!URxvt.color66: #427b58
!URxvt.color88: #9d0006
!URxvt.color96: #8f3f71
!URxvt.color100: #79740e
!URxvt.color108: #8ec07c
!URxvt.color109: #83a598
!URxvt.color130: #af3a03
!URxvt.color136: #b57614
!URxvt.color142: #b8bb26
!URxvt.color167: #fb4934
!URxvt.color175: #d3869b
!URxvt.color208: #fe8019
!URxvt.color214: #fabd2f
!URxvt.color223: #ebdbb2
!URxvt.color228: #f2e5bc
!URxvt.color229: #fbf1c7
!URxvt.color230: #f9f5d7
!URxvt.color234: #1d2021
!URxvt.color235: #282828
!URxvt.color236: #32302f
!URxvt.color237: #3c3836
!URxvt.color239: #504945
!URxvt.color241: #665c54
!URxvt.color243: #7c6f64
!URxvt.color244: #928374
!URxvt.color245: #928374
!URxvt.color246: #a89984
!URxvt.color248: #bdae93
!URxvt.color250: #d5c4a1

View file

@ -1,4 +1,10 @@
{
"optOut": false,
"lastUpdateCheck": 1599398002350
"lastUpdateCheck": 1600193922234,
"update": {
"latest": "6.14.8",
"current": "6.14.6",
"type": "patch",
"name": "npm"
}
}

View file

@ -14,8 +14,8 @@ import Control.Monad (join, filterM
import Control.Arrow ( (>>>) )
import Data.List ( isPrefixOf
, isSuffixOf
, isInfixOf
, intercalate
)
import qualified Foreign.C.Types
import System.Exit (exitSuccess)
@ -29,6 +29,8 @@ import qualified FancyBorders
import XMonad.Hooks.WindowSwallowing as WindowSwallowing
import Data.Foldable ( for_ )
@ -158,13 +160,16 @@ aqua = "#8ec07c"
-- Layout ---------------------------------------- {{{
myTabTheme :: Theme
myTabTheme = def -- defaultThemeWithButtons
{ activeColor = "#1d2021"
, inactiveColor = "#282828"
{ activeColor = "#202020" --activeColor = "#1d2021"
, inactiveColor = "#1d2021" --inactiveColor = "#282828"
, activeBorderColor = "#1d2021"
, inactiveBorderColor = "#282828"
, activeTextColor = "#fbf1c7"
, inactiveTextColor = "#fbf1c7"
, decoHeight = 20
, decoHeight = 40
, activeBorderWidth = 0
, inactiveBorderWidth = 0
, urgentBorderWidth = 0
, fontName = "-misc-cozettevector-*-*-*-*-10-*-*-*-*-*-*-*"
}
@ -173,8 +178,9 @@ instance Shrinker EmptyShrinker where
shrinkIt _ _ = [] :: [String]
myLayout = avoidStruts
myLayout = noBorders $ avoidStruts
$ smartBorders
-- $ FancyBorders.fancyBorders borderTheme
$ MTog.mkToggle1 MTog.FULL
$ ToggleLayouts.toggleLayouts (rename "Tabbed" . makeTabbed . spacingAndGaps $ ResizableTall 1 (3/100) (1/2) [])
$ MTog.mkToggle1 WINDOWDECORATION
@ -187,11 +193,11 @@ myLayout = avoidStruts
layouts = PerScreen.ifWider 1900 horizScreenLayouts vertScreenLayouts
horizScreenLayouts =
((rename "Tall" $ spacingAndGaps $ mouseResizableTile {draggerType = BordersDragger})
(rename "Tall" $ spacingAndGaps $ mouseResizableTile {draggerType = BordersDragger})
||| (rename "Horizon" $ spacingAndGaps $ mouseResizableTileMirrored {draggerType = BordersDragger})
||| (rename "BSP" $ spacingAndGaps $ borderResize $ emptyBSP)
||| (rename "ThreeCol" $ makeTabbed $ spacingAndGaps $ ResizableThreeColMid 1 (3/100) (1/2) [])
||| (rename "TabbedRow" $ makeTabbed $ spacingAndGaps $ zoomRow))
||| (rename "TabbedRow" $ makeTabbed $ spacingAndGaps $ zoomRow)
vertScreenLayouts =
((rename "ThreeCol" $ makeTabbed $ spacingAndGaps $ Mirror $ reflectHoriz $ ThreeColMid 1 (3/100) (1/2))
@ -214,9 +220,11 @@ myLayout = avoidStruts
data WINDOWDECORATION = WINDOWDECORATION deriving (Read, Show, Eq, Typeable)
instance MTog.Transformer WINDOWDECORATION Window where
transform WINDOWDECORATION x k = k
(windowSwitcherDecoration shrinkText (myTabTheme { activeBorderColor = "#1d2021" }) $ x)
(windowSwitcherDecoration EmptyShrinker (myTabTheme { activeBorderColor = "#1d2021" }) $ x)
(const x)
-- }}}
-- Startuphook ----------------------------- {{{
@ -322,7 +330,7 @@ myKeys = concat [ zoomRowBindings, tabbedBindings, multiMonitorBindings, program
, ("M-n", scratchpadSubmap)
, ("M-e", Rofi.promptRunCommand def specialCommands)
, ("M-o", Rofi.promptRunCommand def withSelectionCommands)
, ("M-S-C-g", spawn "killall -INT -g giph" >> spawn "scr -s") -- stop gif and video recording
, ("M-S-C-g", spawn "giph --stop" >> spawn "scr -s") -- stop gif and video recording
--, ("M-b", launchWithBackgroundInstance (className =? "qutebrowser") "bwrap --bind / / --dev-bind /dev /dev --tmpfs /tmp --tmpfs /run qutebrowser")
--, ("M-b", safeSpawnProg "qutebrowser")
@ -542,7 +550,7 @@ main = do
mySwallowEventHook = WindowSwallowing.swallowEventHook
(className =? "Alacritty" <||> className =? "Termite" <||> className =? "NOPE Thunar")
(not <$> className =? "Dragon")
(not <$> (className =? "Dragon" <||> className =? "noswallow"))
activateWindowEventHook :: Event -> X All

View file

@ -27,7 +27,6 @@
elkowar = {
base = {
enable = true;

View file

@ -54,7 +54,6 @@ in
nodejs
nodePackages.bash-language-server
nodePackages.dockerfile-language-server-nodejs
rust-analyzer
cargo-outdated
(addFlags bat "bat" "--theme base16")
@ -72,6 +71,11 @@ in
websocat
gtop
nix-prefetch
cargo-bloat
sccache
bpytop
cargo-watch
cargo-expand
]
)
(

View file

@ -14,6 +14,7 @@ in
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
(scr.override { extraPackages = [ rofi ]; })
my-st
mmutils
liquidctl
bashtop
@ -22,7 +23,6 @@ in
dragon-drop
polybarFull
discord
my-st
#hyper-haskell
];
@ -63,6 +63,58 @@ in
musicDirectory = "/home/leon/Downloads/music";
};
udiskie.enable = true;
kdeconnect = {
enable = true;
};
dunst =
let dunst_settings = {
geometry = "500x5-30+50";
background = cfg.colors.primary.bg_darker;
foreground = cfg.colors.primary.foreground;
padding = "20px";
horizontal_padding = "20px";
font = "Terminus (TTF)";
};
in
{
enable = true;
settings.global = dunst_settings;
settings.urgency_normal = dunst_settings;
settings.urgency_low = dunst_settings;
};
};
xresources.properties = with config.elkowar.desktop.colors; {
"Xcursor.size" = "16";
"Xcursor.theme" = "capitaine-cursors-light";
"Xft.autohint" = "0";
"Xft.antialias" = "1";
"Xft.hinting" = "true";
"Xft.hintstyle" = "hintslight";
"Xft.dpi" = "96";
"Xft.rgba" = "rgb";
"Xft.lcdfilter" = "lcddefault";
"st.font" = "Terminus (TTF):pixelsize=12";
"*.background" = primary.background;
"*.foreground" = primary.foreground;
"*.color0" = normal.black;
"*.color1" = normal.red;
"*.color2" = normal.green;
"*.color3" = normal.yellow;
"*.color4" = normal.blue;
"*.color5" = normal.magenta;
"*.color6" = normal.cyan;
"*.color7" = normal.white;
"*.color8" = bright.black;
"*.color9" = bright.red;
"*.color10" = bright.green;
"*.color11" = bright.yellow;
"*.color12" = bright.blue;
"*.color13" = bright.magenta;
"*.color14" = bright.cyan;
"*.color15" = bright.white;
};
};
}

View file

@ -26,10 +26,10 @@ in
gtk-decoration-layout = ":";
gtk-toolbar-style = "GTK_TOOLBAR_ICONS";
gtk-toolbar-icon-size = "GTK_ICON_SIZE_LARGE_TOOLBAR";
gtk-enable-even-sounds = 0;
#gtk-enable-even-sounds = 0;
gtk-enable-input-feedback-sounds = 0;
gtk-button-images = 1;
ctk-cursor-theme-name = "capitaine-cursors-light";
#ctk-cursor-theme-name = "capitaine-cursors-light";
gtk-cursor-theme-size = 0;
};

View file

@ -2,6 +2,7 @@
let
cfg = config.elkowar.programs.fish;
myConf = import ../myConfig.nix;
sources = import ../../../nix/sources.nix;
in
{
options.elkowar.programs.fish = {
@ -14,23 +15,17 @@ in
fish_prompt = builtins.readFile ./fish-prompt.fish;
fish_greeting = "";
fish_mode_prompt = "";
};
shellAliases = {
ls = "exa --icons";
};
plugins =
[
{
name = "foreign-env";
src = pkgs.fetchFromGitHub {
owner = "oh-my-fish";
repo = "plugin-foreign-env";
rev = "dddd9213272a0ab848d474d0cbde12ad034e65bc";
sha256 = "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs";
};
}
plugins = [
{ name = "fzf"; src = sources.fish-fzf-tab; }
{ name = "foreign-env"; src = sources.plugin-foreign-env; }
{ name = "base16-fish"; src = sources.base16-fish; }
];
shellInit = ''
@ -42,6 +37,8 @@ in
set -U fish_greeting
base16-gruvbox-dark-medium
#if status is-interactive
#and not set -q TMUX
#exec tmux
@ -93,6 +90,7 @@ in
fenv source '$HOME/.nix-profile/etc/profile.d/nix.sh'
set -g NIX_PATH "$HOME/.nix-defexpr/channels:$NIX_PATH"
fenv source "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
'';
};
};

View file

@ -103,7 +103,7 @@ in
default = {};
};
};
config = {
config = lib.mkIf cfg.enable {
home.packages = [ pkgs.zsh-completions ];
programs.zsh = {
enable = true;
@ -127,6 +127,7 @@ in
shellAliases = {
ls = "exa --icons";
kaks = "/home/leon/scripts/kak-attatch-session";
};
initExtraBeforeCompInit = ''

View file

@ -1,14 +1,50 @@
{
"base16-fish": {
"branch": "master",
"description": "🐟 Base16 for fish",
"homepage": "",
"owner": "tomyun",
"repo": "base16-fish",
"rev": "675d53a0dd1aed0fc5927f26a900f5347d446459",
"sha256": "0lp1s9hg682jwzqn1lgj5mrq5alqn9sqw75gjphmiwmciv147kii",
"type": "tarball",
"url": "https://github.com/tomyun/base16-fish/archive/675d53a0dd1aed0fc5927f26a900f5347d446459.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"fish-fzf-tab": {
"branch": "master",
"description": "Ef-🐟-ient fish keybindings for fzf",
"homepage": "",
"owner": "jethrokuan",
"repo": "fzf",
"rev": "7643f3832fcaf2cc048f6cfaa583e893ce27e0f6",
"sha256": "1pz3iqhcxfzs9ar5ib17hbqql4azjw8q7akzns9mf4rdmr5vhvj0",
"type": "tarball",
"url": "https://github.com/jethrokuan/fzf/archive/7643f3832fcaf2cc048f6cfaa583e893ce27e0f6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"fish-gruvbox": {
"branch": "master",
"description": "gruvbox theme for fish",
"homepage": null,
"owner": "Jomik",
"repo": "fish-gruvbox",
"rev": "d8c0463518fb95bed8818a1e7fe5da20cffe6fbd",
"sha256": "0hkps4ddz99r7m52lwyzidbalrwvi7h2afpawh9yv6a226pjmck7",
"type": "tarball",
"url": "https://github.com/Jomik/fish-gruvbox/archive/d8c0463518fb95bed8818a1e7fe5da20cffe6fbd.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"manix": {
"branch": "master",
"description": "A fast CLI documentation searcher for Nix.",
"homepage": null,
"owner": "mlvzk",
"repo": "manix",
"rev": "01895e6ac53a9d40c6f5f783263f4875924ad712",
"sha256": "06cn51h8nab85jk4jfhri3v9kvhb4lpni3qk0mn3dvcw5sg5ri2n",
"rev": "b428f30d58e2b6955f670e21f881056ab1803541",
"sha256": "0fv3sgzwjsgq2h1177r8r1cl5zrfja4ll801sd0bzj3nzmkyww7p",
"type": "tarball",
"url": "https://github.com/mlvzk/manix/archive/01895e6ac53a9d40c6f5f783263f4875924ad712.tar.gz",
"url": "https://github.com/mlvzk/manix/archive/b428f30d58e2b6955f670e21f881056ab1803541.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"niv": {
@ -17,10 +53,10 @@
"homepage": "https://github.com/nmattia/niv",
"owner": "nmattia",
"repo": "niv",
"rev": "89ae775e9dfc2571f912156dd2f8627e14d4d507",
"sha256": "0ssw6byyn79fpyzswi28s5b85x66xh4xsfhmcfl5mkdxxpmyy0ns",
"rev": "dd13098d01eaa6be68237e7e38f96782b0480755",
"sha256": "1cfjdbsn0219fjzam1k7nqzkz8fb1ypab50rhyj026qbklqq2kvq",
"type": "tarball",
"url": "https://github.com/nmattia/niv/archive/89ae775e9dfc2571f912156dd2f8627e14d4d507.tar.gz",
"url": "https://github.com/nmattia/niv/archive/dd13098d01eaa6be68237e7e38f96782b0480755.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixGL": {
@ -41,10 +77,22 @@
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "14006b724f3d1f25ecf38238ee723d38b0c2f4ce",
"sha256": "07hfbilyh818pigfn342v2r05n8061wpjaf1m4h291lf6ydjagis",
"rev": "e82b1de75a195856945cadff4f40b7bea9530f67",
"sha256": "1l3pq4w5xcdwbj6pdsxkq8spacy91ds28f7svgcsc836v959jcv7",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/14006b724f3d1f25ecf38238ee723d38b0c2f4ce.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/e82b1de75a195856945cadff4f40b7bea9530f67.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"plugin-foreign-env": {
"branch": "master",
"description": "Run foreign bash scripts and capture exported environment variables",
"homepage": "",
"owner": "oh-my-fish",
"repo": "plugin-foreign-env",
"rev": "dddd9213272a0ab848d474d0cbde12ad034e65bc",
"sha256": "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs",
"type": "tarball",
"url": "https://github.com/oh-my-fish/plugin-foreign-env/archive/dddd9213272a0ab848d474d0cbde12ad034e65bc.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}

View file

@ -10,4 +10,5 @@ self: super: {
mmutils = super.callPackage ../packages/mmutils.nix { };
nixGL = import sources.nixGL { };
scr = super.callPackage ../packages/scr.nix { };
my-st = super.callPackage ../packages/st/st-tanish2002 { };
}

View file

@ -0,0 +1,17 @@
{ pkgs ? import <nixpkgs> { } }:
with pkgs; python38Packages.buildPythonPackage rec {
pname = "DiscordOverlayLinux";
version = "f71b6c9c345cd8df131a431bcbeabcc79159be99";
src = fetchFromGitHub {
owner = "trigg";
repo = "DiscordOverlayLinux";
rev = "${version}";
sha256 = "0wrm1l3f8irzn62lqbnxk8k6jpkhz0h7nnqn51sa3m43pdi787f1";
};
propagatedBuildInputs = [ python38Packages.pyqt5 python38Packages.pyqtwebengine python38Packages.pyxdg qt5.qtwebengine ];
doCheck = false;
}

@ -0,0 +1 @@
Subproject commit 9a2c72ef17250be5f0719ca6d50e0669f0cddd84

View file

@ -0,0 +1 @@
/nix/store/7k8wg1pbvh785v443d28kb42sgi17wy6-options.json

View file

@ -0,0 +1,12 @@
#!/bin/sh
kak -clear
session="${PWD##*/}"
if ! kak -l | grep -q "$session"; then
kak -d -s "$session" &
fi
kak -c "$session" "$@"