Changes...

This commit is contained in:
Dmitriy Holkin 2019-10-03 12:38:59 +04:00
parent 0e0c83165d
commit 3d0ddd87e8
6 changed files with 170 additions and 151 deletions

View File

@ -10,8 +10,12 @@
};
networks.Alukard.pskRaw =
"5ef5fe07c1f062e4653fce9fe138cc952c20e284ae1ca50babf9089b5cba3a5a";
networks.AlukardAP.pskRaw =
"b8adc07cf1a9c7a7a5946c2645283b27ab91a8af4c065e5f9cde03ed1815811c";
networks.SladkiySon.pskRaw =
"86b1c8c60d3e99145bfe90e0af9bf552540d34606bb0d00b314f5b5960e46496";
networks.AlukardAP_5GHz.pskRaw =
"fb8a89b5602442be083d2a1e67db55c6ff05a306551bcd08a79b6c6bbc97fc30";
# interfaces = ["wlan0"];
userControlled.enable = true;
};

View File

@ -111,6 +111,7 @@ in
} else {
client.enable = true;
client.serverAddress = "ataraxia-pc";
server.autoStart = false;
};
})
];

View File

@ -49,23 +49,23 @@ in {
colors = rec {
background = "\$bg";
unfocused = {
border = "\$color0";
border = "\$dark";
background = "\$bg";
text = "\$color8";
text = "\$alt";
indicator = "\$fg";
childBorder = "\$color0";
childBorder = "\$dark";
};
focusedInactive = unfocused;
urgent = unfocused // {
border = "\$color8";
border = "\$purple";
text = "\$fg";
childBorder = "\$color8";
childBorder = "\$purple";
};
focused = unfocused // {
border = "\$color12";
background = "\$color0";
border = "\$blue";
background = "\$dark";
text = "\$fg";
childBorder = "\$color12";
childBorder = "\$blue";
};
};
gaps = {
@ -89,6 +89,7 @@ in {
};
startup = map (a: { notification = false; } // a) [
{ command = "${pkgs.xorg.xrdb}/bin/xrdb -merge ~/.Xresources"; }
{ command = "${pkgs.pywal}/bin/wal -R"; }
];
keybindings = let
script = name: content: "exec ${pkgs.writeScript name content}";
@ -182,5 +183,13 @@ in {
};
workspaceLayout = "tabbed";
};
extraConfig = ''
set_from_resource $bg i3wm.background "{background}"
set_from_resource $fg i3wm.foreground "{foreground}"
set_from_resource $dark i3wm.color0 "{color0}"
set_from_resource $alt i3wm.color 8"{color8}"
set_from_resource $purple i3wm.color5 "{color5}"
set_from_resource $blue i3wm.color4 "{color4}"
'';
};
}

View File

@ -1,150 +1,151 @@
{ pkgs, config, lib, ... }:
with import ../../support.nix { inherit lib config; }; {
home-manager.users.alukard.home.file.".config/rofi/custom.rasi".text = ''
* {
red: rgba ( ${thmDec.red}, 100 % );
blue: rgba ( ${thmDec.blue}, 100 % );
lightfg: rgba ( ${thmDec.cyan}, 100 % );
lightbg: rgba ( ${thmDec.dark}, 100 % );
foreground: rgba ( ${thmDec.purple}, 100 % );
background: rgba ( ${thmDec.bg}, 100 % );
background-color: rgba ( ${thmDec.bg}, 0 % );
separatorcolor: @foreground;
border-color: @foreground;
selected-normal-foreground: @background;
selected-normal-background: @blue;
selected-active-foreground: @lightbg;
selected-active-background: @lightfg;
selected-urgent-foreground: @background;
selected-urgent-background: @red;
normal-foreground: @foreground;
normal-background: @background;
active-foreground: @blue;
active-background: @background;
urgent-foreground: @red;
urgent-background: @background;
alternate-normal-foreground: @foreground;
alternate-normal-background: @lightbg;
alternate-active-foreground: @blue;
alternate-active-background: @lightbg;
alternate-urgent-foreground: @red;
alternate-urgent-background: @lightbg;
spacing: 2;
}
window {
background-color: @background;
border: 1;
padding: 5;
}
mainbox {
border: 0;
padding: 0;
}
message {
border: 1px dash 0px 0px ;
border-color: @separatorcolor;
padding: 1px ;
}
textbox {
text-color: @foreground;
}
listview {
fixed-height: 0;
border: 2px dash 0px 0px ;
border-color: @separatorcolor;
spacing: 2px ;
scrollbar: true;
padding: 2px 0px 0px ;
}
element {
border: 0;
padding: 1px ;
}
element normal.normal {
background-color: @normal-background;
text-color: @normal-foreground;
}
element normal.urgent {
background-color: @urgent-background;
text-color: @urgent-foreground;
}
element normal.active {
background-color: @active-background;
text-color: @active-foreground;
}
element selected.normal {
background-color: @selected-normal-background;
text-color: @selected-normal-foreground;
}
element selected.urgent {
background-color: @selected-urgent-background;
text-color: @selected-urgent-foreground;
}
element selected.active {
background-color: @selected-active-background;
text-color: @selected-active-foreground;
}
element alternate.normal {
background-color: @alternate-normal-background;
text-color: @alternate-normal-foreground;
}
element alternate.urgent {
background-color: @alternate-urgent-background;
text-color: @alternate-urgent-foreground;
}
element alternate.active {
background-color: @alternate-active-background;
text-color: @alternate-active-foreground;
}
scrollbar {
width: 4px ;
border: 0;
handle-color: @normal-foreground;
handle-width: 8px ;
padding: 0;
}
sidebar {
border: 2px dash 0px 0px ;
border-color: @separatorcolor;
}
button {
spacing: 0;
text-color: @normal-foreground;
}
button selected {
background-color: @selected-normal-background;
text-color: @selected-normal-foreground;
}
inputbar {
spacing: 0px;
text-color: @normal-foreground;
padding: 1px ;
children: [ prompt,textbox-prompt-colon,entry,case-indicator ];
}
case-indicator {
spacing: 0;
text-color: @normal-foreground;
}
entry {
spacing: 0;
text-color: @normal-foreground;
}
prompt {
spacing: 0;
text-color: @normal-foreground;
}
textbox-prompt-colon {
expand: false;
str: ":";
margin: 0px 0.3000em 0.0000em 0.0000em ;
text-color: inherit;
}
'';
# home-manager.users.alukard.home.file.".config/rofi/custom.rasi".text = ''
# * {
# red: rgba ( ${thmDec.red}, 100 % );
# blue: rgba ( ${thmDec.blue}, 100 % );
# lightfg: rgba ( ${thmDec.cyan}, 100 % );
# lightbg: rgba ( ${thmDec.dark}, 100 % );
# foreground: rgba ( ${thmDec.purple}, 100 % );
# background: rgba ( ${thmDec.bg}, 100 % );
# background-color: rgba ( ${thmDec.bg}, 0 % );
# separatorcolor: @foreground;
# border-color: @foreground;
# selected-normal-foreground: @background;
# selected-normal-background: @blue;
# selected-active-foreground: @lightbg;
# selected-active-background: @lightfg;
# selected-urgent-foreground: @background;
# selected-urgent-background: @red;
# normal-foreground: @foreground;
# normal-background: @background;
# active-foreground: @blue;
# active-background: @background;
# urgent-foreground: @red;
# urgent-background: @background;
# alternate-normal-foreground: @foreground;
# alternate-normal-background: @lightbg;
# alternate-active-foreground: @blue;
# alternate-active-background: @lightbg;
# alternate-urgent-foreground: @red;
# alternate-urgent-background: @lightbg;
# spacing: 2;
# }
# window {
# background-color: @background;
# border: 1;
# padding: 5;
# }
# mainbox {
# border: 0;
# padding: 0;
# }
# message {
# border: 1px dash 0px 0px ;
# border-color: @separatorcolor;
# padding: 1px ;
# }
# textbox {
# text-color: @foreground;
# }
# listview {
# fixed-height: 0;
# border: 2px dash 0px 0px ;
# border-color: @separatorcolor;
# spacing: 2px ;
# scrollbar: true;
# padding: 2px 0px 0px ;
# }
# element {
# border: 0;
# padding: 1px ;
# }
# element normal.normal {
# background-color: @normal-background;
# text-color: @normal-foreground;
# }
# element normal.urgent {
# background-color: @urgent-background;
# text-color: @urgent-foreground;
# }
# element normal.active {
# background-color: @active-background;
# text-color: @active-foreground;
# }
# element selected.normal {
# background-color: @selected-normal-background;
# text-color: @selected-normal-foreground;
# }
# element selected.urgent {
# background-color: @selected-urgent-background;
# text-color: @selected-urgent-foreground;
# }
# element selected.active {
# background-color: @selected-active-background;
# text-color: @selected-active-foreground;
# }
# element alternate.normal {
# background-color: @alternate-normal-background;
# text-color: @alternate-normal-foreground;
# }
# element alternate.urgent {
# background-color: @alternate-urgent-background;
# text-color: @alternate-urgent-foreground;
# }
# element alternate.active {
# background-color: @alternate-active-background;
# text-color: @alternate-active-foreground;
# }
# scrollbar {
# width: 4px ;
# border: 0;
# handle-color: @normal-foreground;
# handle-width: 8px ;
# padding: 0;
# }
# sidebar {
# border: 2px dash 0px 0px ;
# border-color: @separatorcolor;
# }
# button {
# spacing: 0;
# text-color: @normal-foreground;
# }
# button selected {
# background-color: @selected-normal-background;
# text-color: @selected-normal-foreground;
# }
# inputbar {
# spacing: 0px;
# text-color: @normal-foreground;
# padding: 1px ;
# children: [ prompt,textbox-prompt-colon,entry,case-indicator ];
# }
# case-indicator {
# spacing: 0;
# text-color: @normal-foreground;
# }
# entry {
# spacing: 0;
# text-color: @normal-foreground;
# }
# prompt {
# spacing: 0;
# text-color: @normal-foreground;
# }
# textbox-prompt-colon {
# expand: false;
# str: ":";
# margin: 0px 0.3000em 0.0000em 0.0000em ;
# text-color: inherit;
# }
# '';
# TODO: отвязать от абсолютного пути (/home/user/...)
home-manager.users.alukard.programs.rofi = {
enable = true;
font = "Roboto Mono 14";
terminal = "\${rxvt_unicode}/bin/urxvt";
theme = "custom.rasi";
# theme = "custom.rasi";
theme = "~/.cache/wal/colors-rofi-dark.rasi";
};
}

View File

@ -45,6 +45,10 @@
"clr" = "clear";
"weather" = "curl wttr.in/Volzhskiy";
"l" = "ls -lah --group-directories-first";
"rede" = "systemctl --user start redshift.service";
"redd" = "systemctl --user stop redshift.service";
"bare" = "systemctl --user start barrier-client.service";
"bard" = "systemctl --user stop barrier-client.service";
};
};
}

View File

@ -9,8 +9,8 @@ with deviceSpecific; with themes; {
libinput = {
enable = isLaptop;
sendEventsMode = "disabled-on-external-mouse";
middleEmulation = false;
# sendEventsMode = "disabled-on-external-mouse";
# middleEmulation = false;
naturalScrolling = true;
};