many changes, add printer
This commit is contained in:
parent
ba48b6da38
commit
cd3c449620
21
flake.lock
generated
21
flake.lock
generated
@ -5,16 +5,15 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1597074307,
|
"lastModified": 1597074767,
|
||||||
"narHash": "sha256-iPbbi0Ipv2ppoyPn3N2NF/OVzri/tBeHkMTvpG2uOzk=",
|
"narHash": "sha256-WrctYb/drpAsxvBJLDbA+wPCEx9fVDoHHKTMnjVZ4ZU=",
|
||||||
"owner": "alukardbf",
|
"owner": "alukardbf",
|
||||||
"repo": "base16-nix",
|
"repo": "base16-nix",
|
||||||
"rev": "fdb349a3869ed9482254fc619df8a1cb615554d6",
|
"rev": "d2a9a9a8cf652049f02bbd8671684d8a3e4fcc24",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "alukardbf",
|
"owner": "alukardbf",
|
||||||
"ref": "custom-scheme",
|
|
||||||
"repo": "base16-nix",
|
"repo": "base16-nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -91,16 +90,18 @@
|
|||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1596554686,
|
"lastModified": 1593628299,
|
||||||
"narHash": "sha256-B+c/xcjp/7vxUm6zVV2SwPalRWYWzxoUOvjGrzlwm7g=",
|
"narHash": "sha256-TG05BV4fbJdDW4RzoYBYaGdFtOq6NNet1JHjP1Au/VE=",
|
||||||
"owner": "NixOS",
|
"owner": "nixos",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "5b22a2c0d443ce1156f361af2dcb142d270daa6c",
|
"rev": "6ff9aa8df7ce8266147f74c65e2cc529a1e72ce0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nix",
|
"owner": "nixos",
|
||||||
"type": "indirect"
|
"repo": "nix",
|
||||||
|
"rev": "6ff9aa8df7ce8266147f74c65e2cc529a1e72ce0",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
|
17
flake.nix
17
flake.nix
@ -3,8 +3,9 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
|
nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
|
||||||
|
nix.url = github:nixos/nix/6ff9aa8df7ce8266147f74c65e2cc529a1e72ce0;
|
||||||
home-manager.url = github:rycee/home-manager/bqv-flakes;
|
home-manager.url = github:rycee/home-manager/bqv-flakes;
|
||||||
base16.url = github:alukardbf/base16-nix/custom-scheme;
|
base16.url = github:alukardbf/base16-nix;
|
||||||
# base16.url = "/shared/nixos/base16-nix";
|
# base16.url = "/shared/nixos/base16-nix";
|
||||||
base16-horizon-scheme = {
|
base16-horizon-scheme = {
|
||||||
url = github:michael-ball/base16-horizon-scheme;
|
url = github:michael-ball/base16-horizon-scheme;
|
||||||
@ -55,5 +56,19 @@
|
|||||||
|
|
||||||
legacyPackages.x86_64-linux =
|
legacyPackages.x86_64-linux =
|
||||||
(builtins.head (builtins.attrValues self.nixosConfigurations)).pkgs;
|
(builtins.head (builtins.attrValues self.nixosConfigurations)).pkgs;
|
||||||
|
|
||||||
|
|
||||||
|
devShell.x86_64-linux = let
|
||||||
|
pkgs = import nixpkgs { system = "x86_64-linux"; };
|
||||||
|
rebuild = pkgs.writeShellScriptBin "rebuild" ''
|
||||||
|
if [[ -z $1 ]]; then
|
||||||
|
echo "Usage: $(basename $0) {switch|boot|test}"
|
||||||
|
else
|
||||||
|
sudo nixos-rebuild $1 --flake .
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
in pkgs.mkShell {
|
||||||
|
nativeBuildInputs = [ rebuild ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
BIN
misc/Passwords.old.kdbx
Executable file
BIN
misc/Passwords.old.kdbx
Executable file
Binary file not shown.
@ -1,4 +1,5 @@
|
|||||||
{ pkgs, config, lib, ... }:
|
{ pkgs, config, lib, ... }:
|
||||||
|
with config.deviceSpecific;
|
||||||
{
|
{
|
||||||
options.defaultApplications = lib.mkOption {
|
options.defaultApplications = lib.mkOption {
|
||||||
type = lib.types.attrs;
|
type = lib.types.attrs;
|
||||||
@ -6,7 +7,10 @@
|
|||||||
};
|
};
|
||||||
config = rec {
|
config = rec {
|
||||||
defaultApplications = {
|
defaultApplications = {
|
||||||
term = {
|
term = if isLaptop then {
|
||||||
|
cmd = "${pkgs.rxvt_unicode}/bin/urxvt";
|
||||||
|
desktop = "urxvt";
|
||||||
|
} else {
|
||||||
cmd = "${pkgs.alacritty}/bin/alacritty";
|
cmd = "${pkgs.alacritty}/bin/alacritty";
|
||||||
desktop = "alacritty";
|
desktop = "alacritty";
|
||||||
};
|
};
|
||||||
|
@ -2,14 +2,13 @@
|
|||||||
let
|
let
|
||||||
thm = config.lib.base16.theme;
|
thm = config.lib.base16.theme;
|
||||||
in
|
in
|
||||||
|
with config.deviceSpecific;
|
||||||
{
|
{
|
||||||
home-manager.users.alukard = {
|
home-manager.users.alukard = {
|
||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = true;
|
enable = !isLaptop;
|
||||||
settings = {
|
settings = {
|
||||||
font = {
|
font = {
|
||||||
# normal.family = "Roboto Mono for Powerline";
|
|
||||||
# bold = { style = "Bold"; };
|
|
||||||
normal = {
|
normal = {
|
||||||
family = "${thm.powerlineFont}";
|
family = "${thm.powerlineFont}";
|
||||||
style = "Regular";
|
style = "Regular";
|
||||||
@ -26,7 +25,7 @@ in
|
|||||||
family = "${thm.powerlineFont}";
|
family = "${thm.powerlineFont}";
|
||||||
style = "Bold Italic";
|
style = "Bold Italic";
|
||||||
};
|
};
|
||||||
size = 11;
|
size = lib.toInt thm.smallFontSize;
|
||||||
};
|
};
|
||||||
|
|
||||||
window.padding = {
|
window.padding = {
|
||||||
@ -40,53 +39,38 @@ in
|
|||||||
|
|
||||||
colors = {
|
colors = {
|
||||||
primary = {
|
primary = {
|
||||||
background = "0x${thm.base00-hex}";
|
background = "#${thm.base00-hex}";
|
||||||
foreground = "0x${thm.base05-hex}";
|
foreground = "#${thm.base05-hex}";
|
||||||
};
|
};
|
||||||
cursor = {
|
cursor = {
|
||||||
text = "0x${thm.base00-hex}";
|
text = "#${thm.base00-hex}";
|
||||||
cursor = "0x${thm.base05-hex}";
|
cursor = "#${thm.base05-hex}";
|
||||||
};
|
};
|
||||||
normal = {
|
normal = {
|
||||||
black = "0x${thm.base00-hex}";
|
black = "#${thm.base00-hex}";
|
||||||
red = "0x${thm.base08-hex}";
|
red = "#${thm.base08-hex}";
|
||||||
green = "0x${thm.base0B-hex}";
|
green = "#${thm.base0B-hex}";
|
||||||
yellow = "0x${thm.base0A-hex}";
|
yellow = "#${thm.base0A-hex}";
|
||||||
blue = "0x${thm.base0D-hex}";
|
blue = "#${thm.base0D-hex}";
|
||||||
magenta = "0x${thm.base0E-hex}";
|
magenta = "#${thm.base0E-hex}";
|
||||||
cyan = "0x${thm.base0C-hex}";
|
cyan = "#${thm.base0C-hex}";
|
||||||
white = "0x${thm.base05-hex}";
|
white = "#${thm.base05-hex}";
|
||||||
};
|
};
|
||||||
bright = {
|
bright = {
|
||||||
black = "0x${thm.base03-hex}";
|
black = "#${thm.base03-hex}";
|
||||||
red = "0x${thm.base09-hex}";
|
red = "#${thm.base09-hex}";
|
||||||
green = "0x${thm.base01-hex}";
|
green = "#${thm.base01-hex}";
|
||||||
yellow = "0x${thm.base02-hex}";
|
yellow = "#${thm.base02-hex}";
|
||||||
blue = "0x${thm.base04-hex}";
|
blue = "#${thm.base04-hex}";
|
||||||
magenta = "0x${thm.base06-hex}";
|
magenta = "#${thm.base06-hex}";
|
||||||
cyan = "0x${thm.base0F-hex}";
|
cyan = "#${thm.base0F-hex}";
|
||||||
white = "0x${thm.base07-hex}";
|
white = "#${thm.base07-hex}";
|
||||||
};
|
};
|
||||||
draw_bold_text_with_bright_colors = "false";
|
draw_bold_text_with_bright_colors = "false";
|
||||||
# bright = {
|
};
|
||||||
# black = "0x${thm.base03-hex}";
|
|
||||||
# red = "0x${thm.base08-hex}";
|
|
||||||
# green = "0x${thm.base0B-hex}";
|
|
||||||
# yellow = "0x${thm.base0A-hex}";
|
|
||||||
# blue = "0x${thm.base0D-hex}";
|
|
||||||
# magenta = "0x${thm.base0E-hex}";
|
|
||||||
# cyan = "0x${thm.base0C-hex}";
|
|
||||||
# white = "0x${thm.base07-hex}";
|
|
||||||
# };
|
|
||||||
# indexed_colors = {
|
|
||||||
# - { index: 16, color: '0xff8700' }
|
|
||||||
# - { index: 17, color: '0xd65d0e' }
|
|
||||||
# - { index: 18, color: '0x3a3a3a' }
|
|
||||||
# - { index: 19, color: '0x4e4e4e' }
|
|
||||||
# - { index: 20, color: '0x949494' }
|
|
||||||
# - { index: 21, color: '0xd5c4a1' }
|
|
||||||
# };
|
|
||||||
|
|
||||||
|
env = {
|
||||||
|
WINIT_X11_SCALE_FACTOR = "1.0";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
with rec {
|
with config.deviceSpecific;
|
||||||
inherit (config) deviceSpecific;
|
{
|
||||||
};
|
|
||||||
with deviceSpecific; {
|
|
||||||
home-manager.users.alukard.programs.mpv = {
|
home-manager.users.alukard.programs.mpv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = {
|
@ -13,11 +13,13 @@ with deviceSpecific; {
|
|||||||
# Utils
|
# Utils
|
||||||
curl
|
curl
|
||||||
wget
|
wget
|
||||||
rxvt_unicode
|
|
||||||
xclip
|
xclip
|
||||||
pciutils
|
pciutils
|
||||||
usbutils
|
usbutils
|
||||||
nix-prefetch-git
|
nix-prefetch-git
|
||||||
|
|
||||||
|
system-config-printer
|
||||||
|
gnome3.simple-scan
|
||||||
# vdpauinfo
|
# vdpauinfo
|
||||||
# libva-utils
|
# libva-utils
|
||||||
lm_sensors
|
lm_sensors
|
||||||
@ -25,6 +27,8 @@ with deviceSpecific; {
|
|||||||
neofetch
|
neofetch
|
||||||
# bashmount
|
# bashmount
|
||||||
zip
|
zip
|
||||||
|
unzip
|
||||||
|
(p7zip.override { enableUnfree = true; })
|
||||||
feh
|
feh
|
||||||
|
|
||||||
# new tools
|
# new tools
|
||||||
@ -36,7 +40,7 @@ with deviceSpecific; {
|
|||||||
lnav
|
lnav
|
||||||
advance-touch # python3 pip
|
advance-touch # python3 pip
|
||||||
exa
|
exa
|
||||||
# nomino # 'heavy' rust build
|
nomino # 'heavy' rust build
|
||||||
bpytop
|
bpytop
|
||||||
nnn
|
nnn
|
||||||
micro
|
micro
|
||||||
@ -62,11 +66,12 @@ with deviceSpecific; {
|
|||||||
xarchiver
|
xarchiver
|
||||||
tdesktop
|
tdesktop
|
||||||
spotifywm
|
spotifywm
|
||||||
# spotify-tui
|
|
||||||
discord
|
discord
|
||||||
pulseeffects
|
pulseeffects
|
||||||
# quodlibet
|
# quodlibet
|
||||||
zathura # pdf
|
zathura # pdf
|
||||||
|
pinta
|
||||||
|
# audacity # fixit
|
||||||
] ++ lib.optionals (!isVM) [
|
] ++ lib.optionals (!isVM) [
|
||||||
libreoffice
|
libreoffice
|
||||||
# rust-stable
|
# rust-stable
|
||||||
|
@ -7,7 +7,7 @@ in
|
|||||||
home-manager.users.alukard = {
|
home-manager.users.alukard = {
|
||||||
programs.rofi = {
|
programs.rofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
font = "${thm.fontMono} ${thm.headerSize}";
|
font = "${thm.fontMono} ${thm.headerFontSize}";
|
||||||
terminal = config.defaultApplications.term.cmd;
|
terminal = config.defaultApplications.term.cmd;
|
||||||
theme = "${themeFile}";
|
theme = "${themeFile}";
|
||||||
};
|
};
|
||||||
|
62
modules/applications/urxvt.nix
Normal file
62
modules/applications/urxvt.nix
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
with config.deviceSpecific;
|
||||||
|
with config.lib.base16.theme;
|
||||||
|
{
|
||||||
|
home-manager.users.alukard = {
|
||||||
|
programs.urxvt = {
|
||||||
|
enable = isLaptop;
|
||||||
|
extraConfig = {
|
||||||
|
"font" = "xft:${powerlineFont}:style=Regular:size=${smallFontSize}";
|
||||||
|
"boldFont" = "xft:${powerlineFont}:style=Bold:size=${smallFontSize}";
|
||||||
|
"italicFont" = "xft:${powerlineFont}:style=Italic:size=${smallFontSize}";
|
||||||
|
"boldItalicfont" = "xft:${powerlineFont}:style=Bold Italic:size=${smallFontSize}";
|
||||||
|
|
||||||
|
"letterSpace" = "0";
|
||||||
|
"lineSpace" = "0";
|
||||||
|
"geometry" = "92x24";
|
||||||
|
"internalBorder" = "24";
|
||||||
|
"cursorBlink" = "true";
|
||||||
|
"cursorUnderline" = "false";
|
||||||
|
"saveline" = "2048";
|
||||||
|
"scrollBar" = "false";
|
||||||
|
"scrollBar_right" = "false";
|
||||||
|
"urgentOnBell" = "true";
|
||||||
|
"depth" = "24";
|
||||||
|
"iso14755" = "false";
|
||||||
|
|
||||||
|
"keysym.Shift-Up" = "command:\\033]720;1\\007";
|
||||||
|
"keysym.Shift-Down" = "command:\\033]721;1\\007";
|
||||||
|
"keysym.Control-Up" = "\\033[1;5A";
|
||||||
|
"keysym.Control-Down" = "\\033[1;5B";
|
||||||
|
"keysym.Control-Right" = "\\033[1;5C";
|
||||||
|
"keysym.Control-Left" = "\\033[1;5D";
|
||||||
|
|
||||||
|
"foreground" = "#${base05-hex}";
|
||||||
|
"background" = "#${base00-hex}";
|
||||||
|
"cursorColor" = "#${base05-hex}";
|
||||||
|
"color0" = "#${base00-hex}";
|
||||||
|
"color1" = "#${base08-hex}";
|
||||||
|
"color2" = "#${base0B-hex}";
|
||||||
|
"color3" = "#${base0A-hex}";
|
||||||
|
"color4" = "#${base0D-hex}";
|
||||||
|
"color5" = "#${base0E-hex}";
|
||||||
|
"color6" = "#${base0C-hex}";
|
||||||
|
"color7" = "#${base05-hex}";
|
||||||
|
"color8" = "#${base03-hex}";
|
||||||
|
"color9" = "#${base08-hex}";
|
||||||
|
"color10" = "#${base0B-hex}";
|
||||||
|
"color11" = "#${base0A-hex}";
|
||||||
|
"color12" = "#${base0D-hex}";
|
||||||
|
"color13" = "#${base0E-hex}";
|
||||||
|
"color14" = "#${base0C-hex}";
|
||||||
|
"color15" = "#${base07-hex}";
|
||||||
|
"color16" = "#${base09-hex}";
|
||||||
|
"color17" = "#${base0F-hex}";
|
||||||
|
"color18" = "#${base01-hex}";
|
||||||
|
"color19" = "#${base02-hex}";
|
||||||
|
"color20" = "#${base04-hex}";
|
||||||
|
"color21" = "#${base06-hex}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -1,26 +1,29 @@
|
|||||||
{ pkgs, lib, config, ... }:
|
{ pkgs, lib, config, ... }:
|
||||||
let
|
let
|
||||||
|
thmFile = config.lib.base16.templateFile;
|
||||||
thm = config.lib.base16.theme;
|
thm = config.lib.base16.theme;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
# home-manager.users.alukard.home.file."tests/vscode/themes/thm.base16.json".source =
|
||||||
|
# thmFile { name = "vscode"; };
|
||||||
|
|
||||||
# Support Wal color theme
|
# Support Wal color theme
|
||||||
home-manager.users.alukard.home.file.".cache/wal/colors".text = ''
|
home-manager.users.alukard.home.file.".cache/wal/colors".text = ''
|
||||||
#${thm.base00-hex}
|
#${thm.base00-hex}
|
||||||
#${thm.base01-hex}
|
|
||||||
#${thm.base02-hex}
|
|
||||||
#${thm.base03-hex}
|
|
||||||
#${thm.base04-hex}
|
|
||||||
#${thm.base05-hex}
|
|
||||||
#${thm.base06-hex}
|
|
||||||
#${thm.base07-hex}
|
|
||||||
#${thm.base08-hex}
|
#${thm.base08-hex}
|
||||||
#${thm.base09-hex}
|
|
||||||
#${thm.base0A-hex}
|
|
||||||
#${thm.base0B-hex}
|
#${thm.base0B-hex}
|
||||||
#${thm.base0C-hex}
|
#${thm.base0A-hex}
|
||||||
#${thm.base0D-hex}
|
#${thm.base0D-hex}
|
||||||
#${thm.base0E-hex}
|
#${thm.base0E-hex}
|
||||||
|
#${thm.base0C-hex}
|
||||||
|
#${thm.base05-hex}
|
||||||
|
#${thm.base03-hex}
|
||||||
|
#${thm.base09-hex}
|
||||||
|
#${thm.base01-hex}
|
||||||
|
#${thm.base02-hex}
|
||||||
|
#${thm.base04-hex}
|
||||||
|
#${thm.base06-hex}
|
||||||
#${thm.base0F-hex}
|
#${thm.base0F-hex}
|
||||||
|
#${thm.base07-hex}
|
||||||
'';
|
'';
|
||||||
}
|
}
|
@ -2,9 +2,11 @@ device:
|
|||||||
{ config, lib, ... }: {
|
{ config, lib, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./applications/alacritty.nix
|
./applications/alacritty.nix
|
||||||
|
./applications/mpv.nix
|
||||||
./applications/packages.nix
|
./applications/packages.nix
|
||||||
./applications/qbittorrent
|
./applications/qbittorrent
|
||||||
./applications/rofi.nix
|
./applications/rofi.nix
|
||||||
|
./applications/urxvt.nix
|
||||||
./applications/vscode.nix
|
./applications/vscode.nix
|
||||||
|
|
||||||
# ./workspace/barrier.nix
|
# ./workspace/barrier.nix
|
||||||
@ -17,7 +19,7 @@ device:
|
|||||||
./workspace/light.nix
|
./workspace/light.nix
|
||||||
./workspace/locale.nix
|
./workspace/locale.nix
|
||||||
./workspace/misc.nix
|
./workspace/misc.nix
|
||||||
./workspace/mpv.nix
|
./workspace/picom.nix
|
||||||
./workspace/pulseeffects
|
./workspace/pulseeffects
|
||||||
# ./workspace/spotifyd.nix
|
# ./workspace/spotifyd.nix
|
||||||
./workspace/ssh.nix
|
./workspace/ssh.nix
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ pkgs, lib, config, ... }:
|
{ pkgs, lib, config, ... }:
|
||||||
with rec {
|
with rec {
|
||||||
inherit (config) device deviceSpecific secrets;
|
inherit (config) deviceSpecific secrets;
|
||||||
};
|
};
|
||||||
with deviceSpecific;
|
with deviceSpecific;
|
||||||
# let
|
# let
|
||||||
@ -121,5 +121,20 @@ with deviceSpecific;
|
|||||||
# "x-systemd.after=wg-quick-wg0.service"
|
# "x-systemd.after=wg-quick-wg0.service"
|
||||||
# ];
|
# ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Music folder
|
||||||
|
# TODOL FIXIT
|
||||||
|
"/home/alukard/Music" = {
|
||||||
|
fsType = "none";
|
||||||
|
device = "/media/windows/files/Music";
|
||||||
|
options = [
|
||||||
|
"uid=${toString config.users.users.alukard.uid}"
|
||||||
|
"gid=${toString config.users.groups.users.gid}"
|
||||||
|
"bind"
|
||||||
|
"nofail"
|
||||||
|
"x-systemd.requires-mounts-for=media-windows-files.mount"
|
||||||
|
"_netdev"
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -12,14 +12,15 @@ with deviceSpecific; {
|
|||||||
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
||||||
};
|
};
|
||||||
boot.initrd.kernelModules = if video == "intel" then [ "iHD" ] else [ ];
|
boot.initrd.kernelModules = if video == "intel" then [ "iHD" ] else [ ];
|
||||||
|
# boot.initrd.kernelModules = if video == "intel" then [ "i915" ] else [ ];
|
||||||
hardware.opengl = {
|
hardware.opengl = {
|
||||||
enable = true;
|
enable = true;
|
||||||
driSupport = true;
|
driSupport = true;
|
||||||
driSupport32Bit = true;
|
driSupport32Bit = true;
|
||||||
extraPackages = if video == "intel" then [
|
extraPackages = if video == "intel" then [
|
||||||
pkgs.vaapiIntel
|
# pkgs.vaapiIntel
|
||||||
pkgs.vaapiVdpau
|
# pkgs.vaapiVdpau
|
||||||
pkgs.libvdpau-va-gl
|
# pkgs.libvdpau-va-gl
|
||||||
pkgs.intel-media-driver
|
pkgs.intel-media-driver
|
||||||
] else [ ];
|
] else [ ];
|
||||||
};
|
};
|
||||||
@ -29,7 +30,7 @@ with deviceSpecific; {
|
|||||||
};
|
};
|
||||||
# --- END ---
|
# --- END ---
|
||||||
|
|
||||||
hardware.bluetooth.enable = isLaptop;
|
# hardware.bluetooth.enable = isLaptop;
|
||||||
|
|
||||||
boot.loader = {
|
boot.loader = {
|
||||||
systemd-boot.enable = true;
|
systemd-boot.enable = true;
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
{ pkgs, lib, config, ... }: {
|
{ pkgs, lib, config, ... }:
|
||||||
|
with config.deviceSpecific;
|
||||||
|
{
|
||||||
networking = {
|
networking = {
|
||||||
networkmanager.enable = false;
|
networkmanager.enable = false;
|
||||||
wireless = {
|
wireless = {
|
||||||
enable = config.deviceSpecific.isLaptop;
|
enable = isLaptop;
|
||||||
networks.Alukard_5GHz = {
|
networks.Alukard_5GHz = {
|
||||||
pskRaw = "feee27000fb0d7118d498d4d867416d04d1d9a1a7b5dbdbd888060bbde816fe4";
|
pskRaw = "feee27000fb0d7118d498d4d867416d04d1d9a1a7b5dbdbd888060bbde816fe4";
|
||||||
priority = 1;
|
priority = 1;
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
# spotifyd = super.spotifyd.override { withPulseAudio = true; };
|
spotifyd = super.spotifyd.override { withPulseAudio = true; };
|
||||||
|
|
||||||
# spotify-tui = naersk.buildPackage {
|
# spotify-tui = naersk.buildPackage {
|
||||||
# name = "spotify-tui";
|
# name = "spotify-tui";
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
with rec {
|
with config.deviceSpecific;
|
||||||
inherit (config) deviceSpecific;
|
{
|
||||||
};
|
|
||||||
with deviceSpecific; {
|
|
||||||
users.groups.smbgrp.gid = 2001;
|
users.groups.smbgrp.gid = 2001;
|
||||||
# TODO: add nologin shell to this user
|
# TODO: add nologin shell to this user
|
||||||
users.users.smbuser =
|
users.users.smbuser =
|
||||||
|
@ -12,7 +12,8 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
services.earlyoom = {
|
services.earlyoom = {
|
||||||
enable = device.ram < 16;
|
# enable = device.ram < 16;
|
||||||
|
enable = false;
|
||||||
freeMemThreshold = 5;
|
freeMemThreshold = 5;
|
||||||
freeSwapThreshold = 100;
|
freeSwapThreshold = 100;
|
||||||
};
|
};
|
||||||
@ -28,8 +29,11 @@ in {
|
|||||||
|
|
||||||
services.printing = {
|
services.printing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
drivers = [ pkgs.gutenprint ];
|
drivers = [ pkgs.samsungUnifiedLinuxDriver pkgs.gutenprint ];
|
||||||
};
|
};
|
||||||
|
hardware.sane.enable = true;
|
||||||
|
|
||||||
|
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
|
|
||||||
services.avahi = {
|
services.avahi = {
|
||||||
|
@ -42,14 +42,21 @@ with lib;
|
|||||||
font = "IBM Plex Sans";
|
font = "IBM Plex Sans";
|
||||||
fontMono = "IBM Plex Mono";
|
fontMono = "IBM Plex Mono";
|
||||||
fontSerif = "IBM Plex Serif";
|
fontSerif = "IBM Plex Serif";
|
||||||
|
powerlineFont = "IBM Plex Mono for Powerline";
|
||||||
|
|
||||||
fallbackFont = "Roboto";
|
fallbackFont = "Roboto";
|
||||||
fallbackFontMono = "Roboto Mono";
|
fallbackFontMono = "Roboto Mono";
|
||||||
fallbackFontSerif = "Roboto Slab";
|
fallbackFontSerif = "Roboto Slab";
|
||||||
powerlineFont = "IBM Plex Mono for Powerline";
|
|
||||||
fontSize = "12";
|
|
||||||
headerSize = "14";
|
|
||||||
iconFont = "Font Awesome 5 Free";
|
iconFont = "Font Awesome 5 Free";
|
||||||
fallbackIcon = "Material Icons";
|
fallbackIcon = "Material Icons";
|
||||||
|
|
||||||
|
normalFontSize = "12";
|
||||||
|
headerFontSize = "14";
|
||||||
|
smallFontSize = "11";
|
||||||
|
microFontSize = "10";
|
||||||
|
minimalFontSize = "8";
|
||||||
|
|
||||||
iconsTheme = "Papirus-Dark";
|
iconsTheme = "Papirus-Dark";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
"vboxusers"
|
"vboxusers"
|
||||||
"smbgrp"
|
"smbgrp"
|
||||||
"cdrom"
|
"cdrom"
|
||||||
|
"scanner"
|
||||||
];
|
];
|
||||||
description = "Дмитрий Холкин";
|
description = "Дмитрий Холкин";
|
||||||
uid = 1000;
|
uid = 1000;
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
{ pkgs, config, lib, ... }:
|
{ pkgs, config, lib, ... }:
|
||||||
let thm = config.lib.base16.theme;
|
let
|
||||||
|
thm = config.lib.base16.theme;
|
||||||
in {
|
in {
|
||||||
home-manager.users.alukard = {
|
home-manager.users.alukard = {
|
||||||
services.dunst = {
|
services.dunst = {
|
||||||
@ -14,7 +15,7 @@ in {
|
|||||||
transparency = 10;
|
transparency = 10;
|
||||||
frame_color = "#${thm.base05-hex}";
|
frame_color = "#${thm.base05-hex}";
|
||||||
separator_color = "#${thm.base05-hex}";
|
separator_color = "#${thm.base05-hex}";
|
||||||
font = "${thm.font} ${thm.fontSize}";
|
font = "${thm.font} ${thm.normalFontSize}";
|
||||||
padding = 15;
|
padding = 15;
|
||||||
horizontal_padding = 17;
|
horizontal_padding = 17;
|
||||||
word_wrap = true;
|
word_wrap = true;
|
||||||
@ -25,22 +26,39 @@ in {
|
|||||||
markup = "full";
|
markup = "full";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# urgency_low = {
|
||||||
|
# background = "#${thm.base01-hex}";
|
||||||
|
# foreground = "#${thm.base03-hex}";
|
||||||
|
# timeout = 5;
|
||||||
|
# };
|
||||||
|
|
||||||
|
# urgency_normal = {
|
||||||
|
# background = "#${thm.base02-hex}";
|
||||||
|
# foreground = "#${thm.base05-hex}";
|
||||||
|
# timeout = 10;
|
||||||
|
# };
|
||||||
|
|
||||||
|
# urgency_critical = {
|
||||||
|
# background = "#${thm.base08-hex}";
|
||||||
|
# foreground = "#${thm.base06-hex}";
|
||||||
|
# timeout = 15;
|
||||||
|
# };
|
||||||
urgency_low = {
|
urgency_low = {
|
||||||
background = "#${thm.base01-hex}";
|
background = "#${thm.base01-hex}";
|
||||||
foreground = "#${thm.base03-hex}";
|
foreground = "#${thm.base05-hex}";
|
||||||
timeout = 5;
|
timeout = 8;
|
||||||
};
|
};
|
||||||
|
|
||||||
urgency_normal = {
|
urgency_normal = {
|
||||||
background = "#${thm.base02-hex}";
|
background = "#${thm.base01-hex}";
|
||||||
foreground = "#${thm.base05-hex}";
|
foreground = "#${thm.base08-hex}";
|
||||||
timeout = 10;
|
timeout = 12;
|
||||||
};
|
};
|
||||||
|
|
||||||
urgency_critical = {
|
urgency_critical = {
|
||||||
background = "#${thm.base08-hex}";
|
background = "#${thm.base01-hex}";
|
||||||
foreground = "#${thm.base06-hex}";
|
foreground = "#${thm.base0D-hex}";
|
||||||
timeout = 15;
|
timeout = 20;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -21,9 +21,9 @@ in
|
|||||||
fontconfig = {
|
fontconfig = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultFonts = {
|
defaultFonts = {
|
||||||
monospace = [ "${thm.fontMono} 13" ];
|
monospace = [ "${thm.fontMono} ${thm.normalFontSize}" ];
|
||||||
sansSerif = [ "${thm.font} 13" ];
|
sansSerif = [ "${thm.font} ${thm.normalFontSize}" ];
|
||||||
serif = [ "${thm.fontSerif} 13" ];
|
serif = [ "${thm.fontSerif} ${thm.normalFontSize}" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
enableDefaultFonts = true;
|
enableDefaultFonts = true;
|
||||||
|
@ -58,7 +58,7 @@ in {
|
|||||||
# package = pkgs.flatcolor-gtk-theme;
|
# package = pkgs.flatcolor-gtk-theme;
|
||||||
};
|
};
|
||||||
font = {
|
font = {
|
||||||
name = "${thm.font} 14";
|
name = "${thm.font} ${thm.normalFontSize}";
|
||||||
};
|
};
|
||||||
gtk3.extraConfig.gtk-cursor-theme-name = "bibata_oil";
|
gtk3.extraConfig.gtk-cursor-theme-name = "bibata_oil";
|
||||||
};
|
};
|
||||||
|
@ -11,17 +11,16 @@ in {
|
|||||||
package = pkgs.i3-gaps;
|
package = pkgs.i3-gaps;
|
||||||
config = rec {
|
config = rec {
|
||||||
assigns = {
|
assigns = {
|
||||||
"" = [
|
"" = [
|
||||||
{ class = "Spotify"; }
|
{ class = "Spotify"; }
|
||||||
{ class = "PulseEffects"; }
|
{ class = "PulseEffects"; }
|
||||||
{ class = "spt"; }
|
{ class = "spt"; }
|
||||||
];
|
];
|
||||||
"" = [
|
"" = [
|
||||||
{ class = "^Telegram"; }
|
{ class = "^Telegram"; }
|
||||||
];
|
];
|
||||||
"ﱘ" = [{ class = "cantata"; }];
|
|
||||||
};
|
};
|
||||||
fonts = [ "${thm.fontMono} 9" ];
|
fonts = [ "${thm.fontMono} ${thm.microFontSize}" ];
|
||||||
|
|
||||||
bars = [ ];
|
bars = [ ];
|
||||||
|
|
||||||
@ -84,6 +83,7 @@ in {
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
startup = map (a: { notification = false; } // a) [
|
startup = map (a: { notification = false; } // a) [
|
||||||
|
{ command = "${pkgs.feh}/bin/feh --bg-fill $HOME/.wallpaper"; }
|
||||||
{ command = "${pkgs.xorg.xrdb}/bin/xrdb -merge ~/.Xresources"; }
|
{ command = "${pkgs.xorg.xrdb}/bin/xrdb -merge ~/.Xresources"; }
|
||||||
{ command = "${pkgs.pywal}/bin/wal -R"; }
|
{ command = "${pkgs.pywal}/bin/wal -R"; }
|
||||||
{ command = "${pkgs.tdesktop}/bin/telegram-desktop"; }
|
{ command = "${pkgs.tdesktop}/bin/telegram-desktop"; }
|
||||||
@ -124,7 +124,7 @@ in {
|
|||||||
"${modifier}+j" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
"${modifier}+j" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
||||||
"${modifier}+k" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
"${modifier}+k" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
||||||
"${modifier}+l" = "exec ${pkgs.playerctl}/bin/playerctl next";
|
"${modifier}+l" = "exec ${pkgs.playerctl}/bin/playerctl next";
|
||||||
"${modifier}+m" = "exec ${pkgs.alsaUtils}/bin/amixer set Master toggle";
|
"${modifier}+m" = "exec ${pkgs.pamixer}/bin/pamixer -t";
|
||||||
|
|
||||||
"${modifier}+d" = "exec ${apps.fm.cmd}";
|
"${modifier}+d" = "exec ${apps.fm.cmd}";
|
||||||
"${modifier}+y" = "exec ${pkgs.youtube-to-mpv}/bin/yt-mpv";
|
"${modifier}+y" = "exec ${pkgs.youtube-to-mpv}/bin/yt-mpv";
|
||||||
@ -157,6 +157,11 @@ in {
|
|||||||
"XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
"XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
||||||
"XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
|
"XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
|
||||||
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
||||||
|
"XF86AudioLowerVolume" = "exec ${pkgs.pamixer}/bin/pamixer -d 5";
|
||||||
|
"XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer -i 5";
|
||||||
|
"XF86AudioMute" = "exec ${pkgs.pamixer}/bin/pamixer -t";
|
||||||
|
"${modifier}+XF86AudioLowerVolume" = "exec ${pkgs.pamixer}/bin/pamixer -d 2";
|
||||||
|
"${modifier}+XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer -i 2";
|
||||||
"--release button2" = "kill";
|
"--release button2" = "kill";
|
||||||
"--whole-window ${modifier}+button2" = "kill";
|
"--whole-window ${modifier}+button2" = "kill";
|
||||||
|
|
||||||
@ -166,12 +171,8 @@ in {
|
|||||||
}) workspaces) // builtins.listToAttrs (builtins.map (x: {
|
}) workspaces) // builtins.listToAttrs (builtins.map (x: {
|
||||||
name = "${modifier}+Shift+${builtins.elemAt x 0}";
|
name = "${modifier}+Shift+${builtins.elemAt x 0}";
|
||||||
value = "move container to workspace ${builtins.elemAt x 1}";
|
value = "move container to workspace ${builtins.elemAt x 1}";
|
||||||
}) workspaces));
|
}) workspaces)
|
||||||
keycodebindings = {
|
);
|
||||||
"122" = "exec ${pkgs.pamixer}/bin/pamixer -d 5";
|
|
||||||
"123" = "exec ${pkgs.pamixer}/bin/pamixer -i 5";
|
|
||||||
"121" = "exec ${pkgs.pamixer}/bin/pamixer -t";
|
|
||||||
};
|
|
||||||
workspaceLayout = "tabbed";
|
workspaceLayout = "tabbed";
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
@ -7,154 +7,171 @@ let
|
|||||||
scripts = import ./scripts pkgs config;
|
scripts = import ./scripts pkgs config;
|
||||||
thm = config.lib.base16.theme;
|
thm = config.lib.base16.theme;
|
||||||
in {
|
in {
|
||||||
home-manager.users.alukard.xsession.windowManager.i3.extraConfig = ''
|
home-manager.users.alukard = {
|
||||||
bar {
|
xsession.windowManager.i3.config.bars = [{
|
||||||
id top
|
id = "default";
|
||||||
font pango:${thm.iconFont} Solid 10, ${thm.fallbackIcon} 10, ${thm.powerlineFont} SemiBold 10
|
fonts = [ "${thm.iconFont} Solid ${thm.microFontSize}" "${thm.fallbackIcon} ${thm.microFontSize}" "${thm.powerlineFont} SemiBold ${thm.microFontSize}" ];
|
||||||
mode dock
|
position = "top";
|
||||||
hidden_state hide
|
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs";
|
||||||
position top
|
workspaceNumbers = false;
|
||||||
status_command ${pkgs.i3status-rust}/bin/i3status-rs $HOME/.config/i3status-rust/config.toml
|
colors = {
|
||||||
workspace_buttons yes
|
background = "#${thm.base00-hex}";
|
||||||
strip_workspace_numbers no
|
statusline = "#${thm.base02-hex}";
|
||||||
tray_output primary
|
separator = "#${thm.base04-hex}";
|
||||||
colors {
|
focusedWorkspace = {
|
||||||
background #${thm.base00-hex}
|
background = "#${thm.base00-hex}";
|
||||||
separator #${thm.base02-hex}
|
border = "#${thm.base00-hex}";
|
||||||
statusline #${thm.base04-hex}
|
text = "#${thm.base0D-hex}";
|
||||||
focused_workspace #${thm.base00-hex} #${thm.base00-hex} #${thm.base0D-hex}
|
};
|
||||||
active_workspace #${thm.base00-hex} #${thm.base03-hex} #${thm.base00-hex}
|
activeWorkspace = {
|
||||||
inactive_workspace #${thm.base00-hex} #${thm.base01-hex} #${thm.base05-hex}
|
background = "#${thm.base03-hex}";
|
||||||
urgent_workspace #${thm.base0A-hex} #${thm.base00-hex} #${thm.base05-hex}
|
border = "#${thm.base00-hex}";
|
||||||
binding_mode #${thm.base00-hex} #${thm.base0A-hex} #${thm.base00-hex}
|
text = "#${thm.base00-hex}";
|
||||||
}
|
};
|
||||||
}
|
inactiveWorkspace = {
|
||||||
'';
|
background = "#${thm.base01-hex}";
|
||||||
|
border = "#${thm.base00-hex}";
|
||||||
|
text = "#${thm.base05-hex}";
|
||||||
|
};
|
||||||
|
urgentWorkspace = {
|
||||||
|
background = "#${thm.base00-hex}";
|
||||||
|
border = "#${thm.base0A-hex}";
|
||||||
|
text = "#${thm.base05-hex}";
|
||||||
|
};
|
||||||
|
bindingMode = {
|
||||||
|
background = "#${thm.base0A-hex}";
|
||||||
|
border = "#${thm.base00-hex}";
|
||||||
|
text = "#${thm.base00-hex}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
home-manager.users.alukard.xdg.configFile."i3status-rust/config.toml".text = lib.concatStrings [''
|
}];
|
||||||
|
|
||||||
[theme]
|
xdg.configFile."i3status-rust/config.toml".text = lib.concatStrings [''
|
||||||
name = "solarized-dark"
|
|
||||||
[theme.overrides]
|
[theme]
|
||||||
idle_bg = "#${thm.base00-hex}"
|
name = "solarized-dark"
|
||||||
idle_fg = "#${thm.base05-hex}"
|
[theme.overrides]
|
||||||
info_bg = "#${thm.base0C-hex}"
|
idle_bg = "#${thm.base00-hex}"
|
||||||
info_fg = "#${thm.base00-hex}"
|
idle_fg = "#${thm.base05-hex}"
|
||||||
good_bg = "#${thm.base0B-hex}"
|
info_bg = "#${thm.base0C-hex}"
|
||||||
good_fg = "#${thm.base00-hex}"
|
info_fg = "#${thm.base00-hex}"
|
||||||
warning_bg = "#${thm.base0A-hex}"
|
good_bg = "#${thm.base0B-hex}"
|
||||||
warning_fg = "#${thm.base00-hex}"
|
good_fg = "#${thm.base00-hex}"
|
||||||
critical_bg = "#${thm.base08-hex}"
|
warning_bg = "#${thm.base0A-hex}"
|
||||||
critical_fg = "#${thm.base00-hex}"
|
warning_fg = "#${thm.base00-hex}"
|
||||||
|
critical_bg = "#${thm.base08-hex}"
|
||||||
|
critical_fg = "#${thm.base00-hex}"
|
||||||
|
|
||||||
|
|
||||||
# Material Icons Cheatsheet [https://shanfan.github.io/material-icons-cheatsheet/]
|
# Material Icons Cheatsheet [https://shanfan.github.io/material-icons-cheatsheet/]
|
||||||
# Font Awesome Cheatsheet [https://fontawesome.com/icons?d=gallery&m=free]
|
# Font Awesome Cheatsheet [https://fontawesome.com/icons?d=gallery&m=free]
|
||||||
[icons]
|
[icons]
|
||||||
name = "awesome5"
|
name = "awesome5"
|
||||||
[icons.overrides]
|
[icons.overrides]
|
||||||
# backlight_empty = ""
|
backlight_empty = " 🌑 "
|
||||||
# backlight_full = ""
|
backlight_full = " 🌕 "
|
||||||
# backlight_partial1 = ""
|
backlight_partial1 = " 🌘 "
|
||||||
# backlight_partial2 = ""
|
backlight_partial2 = " 🌗 "
|
||||||
# backlight_partial3 = ""
|
backlight_partial3 = " 🌖 "
|
||||||
# bat_charging = ""
|
# bat_charging = ""
|
||||||
# bat_discharging = ""
|
# bat_discharging = ""
|
||||||
# bat_full = ""
|
# bat_full = ""
|
||||||
# bat = ""
|
# bat = ""
|
||||||
# cogs = ""
|
# cogs = ""
|
||||||
cpu = " "
|
cpu = " "
|
||||||
# gpu = ""
|
# gpu = ""
|
||||||
# mail = ""
|
# mail = ""
|
||||||
memory_mem = " "
|
memory_mem = " "
|
||||||
memory_swap = " "
|
memory_swap = " "
|
||||||
music_next = ""
|
music_next = ""
|
||||||
music_pause = ""
|
music_pause = ""
|
||||||
music_play = ""
|
music_play = ""
|
||||||
music_prev = ""
|
music_prev = ""
|
||||||
music = " "
|
music = " "
|
||||||
net_down = " "
|
net_down = " "
|
||||||
net_up = " "
|
net_up = " "
|
||||||
### net_up = " "
|
### net_up = " "
|
||||||
net_wired = ""
|
net_wired = ""
|
||||||
net_wireless = ""
|
net_wireless = ""
|
||||||
### net_wired = " "
|
### net_wired = " "
|
||||||
### net_wireless = " "
|
### net_wireless = " "
|
||||||
# ping = ""
|
# ping = ""
|
||||||
# thermometer = ""
|
# thermometer = ""
|
||||||
# time = ""
|
# time = ""
|
||||||
# toggle_off = ""
|
# toggle_off = ""
|
||||||
# toggle_on = ""
|
# toggle_on = ""
|
||||||
# update = ""
|
# update = ""
|
||||||
# uptime = ""
|
# uptime = ""
|
||||||
volume_empty = " "
|
volume_empty = " "
|
||||||
volume_full = " "
|
volume_full = " "
|
||||||
volume_half = " "
|
volume_half = " "
|
||||||
volume_muted = " "
|
volume_muted = " "
|
||||||
# weather_clouds = ""
|
# weather_clouds = ""
|
||||||
# weather_default = ""
|
# weather_default = ""
|
||||||
# weather_rain = ""
|
# weather_rain = ""
|
||||||
# weather_snow = ""
|
# weather_snow = ""
|
||||||
# weather_sun = ""
|
# weather_sun = ""
|
||||||
# weather_thunder = ""
|
# weather_thunder = ""
|
||||||
# xrandr = ""
|
# xrandr = ""
|
||||||
|
|
||||||
[[block]]
|
[[block]]
|
||||||
block = "net"
|
block = "music"
|
||||||
''
|
buttons = ["play", "next"]
|
||||||
(if device == "Dell-Laptop" then ''
|
|
||||||
device = "wlo1"
|
|
||||||
'' else "")
|
|
||||||
(if device == "AMD-Workstation" then ''
|
|
||||||
device = "enp9s0"
|
|
||||||
'' else "")
|
|
||||||
(if isLaptop then ''
|
|
||||||
[[block]]
|
|
||||||
block = "battery"
|
|
||||||
interval = 10
|
|
||||||
format = "{percentage}% {time}"
|
|
||||||
|
|
||||||
[[block]]
|
[[block]]
|
||||||
block = "backlight"
|
block = "net"
|
||||||
'' else "")
|
''
|
||||||
''
|
(if device == "Dell-Laptop" then ''
|
||||||
[[block]]
|
device = "wlo1"
|
||||||
block = "custom"
|
'' else "")
|
||||||
command = "${scripts.weather}"
|
(if device == "AMD-Workstation" then ''
|
||||||
interval = 600
|
device = "enp9s0"
|
||||||
|
'' else "")
|
||||||
|
(if isLaptop then ''
|
||||||
|
[[block]]
|
||||||
|
block = "battery"
|
||||||
|
interval = 10
|
||||||
|
format = "{percentage}% {time}"
|
||||||
|
|
||||||
[[block]]
|
[[block]]
|
||||||
block = "music"
|
block = "backlight"
|
||||||
buttons = ["play", "next"]
|
'' else "")
|
||||||
|
''
|
||||||
|
[[block]]
|
||||||
|
block = "custom"
|
||||||
|
command = "${scripts.weather}"
|
||||||
|
interval = 600
|
||||||
|
|
||||||
[[block]]
|
[[block]]
|
||||||
block = "sound"
|
block = "sound"
|
||||||
driver = "auto"
|
driver = "auto"
|
||||||
|
|
||||||
[[block]]
|
[[block]]
|
||||||
block = "cpu"
|
block = "cpu"
|
||||||
interval = 1
|
interval = 1
|
||||||
format = "{utilization}% {frequency}GHz"
|
format = "{utilization}% {frequency}GHz"
|
||||||
|
|
||||||
[[block]]
|
[[block]]
|
||||||
block = "memory"
|
block = "memory"
|
||||||
display_type = "memory"
|
display_type = "memory"
|
||||||
format_mem = "{MAg}GiB"
|
format_mem = "{MAg}GiB"
|
||||||
format_swap = "{SFg}GiB"
|
format_swap = "{SFg}GiB"
|
||||||
|
|
||||||
[[block]]
|
[[block]]
|
||||||
block = "custom"
|
block = "custom"
|
||||||
command = "${scripts.df}"
|
command = "${scripts.df}"
|
||||||
interval = 60
|
interval = 60
|
||||||
|
|
||||||
[[block]]
|
[[block]]
|
||||||
block = "custom"
|
block = "custom"
|
||||||
command = "${scripts.vpn-status}"
|
command = "${scripts.vpn-status}"
|
||||||
interval = 60
|
interval = 60
|
||||||
|
|
||||||
[[block]]
|
[[block]]
|
||||||
block = "time"
|
block = "time"
|
||||||
interval = 1
|
interval = 1
|
||||||
format = "%a %Y/%m/%d %T"
|
format = "%a %Y/%m/%d %T"
|
||||||
''];
|
''];
|
||||||
}
|
};
|
||||||
|
}
|
||||||
|
@ -130,12 +130,12 @@ in
|
|||||||
General = {
|
General = {
|
||||||
ColorScheme = "Generated";
|
ColorScheme = "Generated";
|
||||||
Name = "Generated";
|
Name = "Generated";
|
||||||
fixed = "${thm.fontMono},11,-1,5,50,0,0,0,0,0";
|
fixed = "${thm.fontMono},${thm.smallFontSize},-1,5,50,0,0,0,0,0";
|
||||||
font = "${thm.font},11,-1,5,50,0,0,0,0,0";
|
font = "${thm.font},${thm.smallFontSize},-1,5,50,0,0,0,0,0";
|
||||||
menuFont = "${thm.font},11,-1,5,50,0,0,0,0,0";
|
menuFont = "${thm.font},${thm.smallFontSize},-1,5,50,0,0,0,0,0";
|
||||||
shadeSortColumn = true;
|
shadeSortColumn = true;
|
||||||
smallestReadableFont = "${thm.font},8,-1,5,57,0,0,0,0,0,Medium";
|
smallestReadableFont = "${thm.font},${thm.minimalFontSize},-1,5,57,0,0,0,0,0,Medium";
|
||||||
toolBarFont = "${thm.font},11,-1,5,50,0,0,0,0,0";
|
toolBarFont = "${thm.font},${thm.smallFontSize},-1,5,50,0,0,0,0,0";
|
||||||
};
|
};
|
||||||
KDE = {
|
KDE = {
|
||||||
DoubleClickInterval = 400;
|
DoubleClickInterval = 400;
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
{ config, pkgs, lib, ... }: {
|
{ config, pkgs, lib, ... }:
|
||||||
programs.light.enable = config.deviceSpecific.isLaptop;
|
with config.deviceSpecific;
|
||||||
|
{
|
||||||
|
programs.light.enable = isLaptop;
|
||||||
services.actkbd = {
|
services.actkbd = {
|
||||||
enable = config.deviceSpecific.isLaptop;
|
enable = isLaptop;
|
||||||
bindings = map (x:
|
bindings = map (x:
|
||||||
x // {
|
x // {
|
||||||
events = ["key"];
|
events = ["key"];
|
||||||
|
@ -41,13 +41,13 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
# enable use_flake support
|
# enable use_flake support
|
||||||
# stdlib = ''
|
stdlib = ''
|
||||||
# use_flake() {
|
use_flake() {
|
||||||
# watch_file flake.nix
|
watch_file flake.nix
|
||||||
# watch_file flake.lock
|
watch_file flake.lock
|
||||||
# eval "$(nix print-dev-env --profile "$(direnv_layout_dir)/flake-profile")"
|
eval "$(nix print-dev-env)"
|
||||||
# }
|
}
|
||||||
# '';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
news.display = "silent";
|
news.display = "silent";
|
||||||
|
28
modules/workspace/picom.nix
Normal file
28
modules/workspace/picom.nix
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
{
|
||||||
|
home-manager.users.alukard = {
|
||||||
|
services.picom = {
|
||||||
|
enable = true;
|
||||||
|
activeOpacity = "0.95";
|
||||||
|
inactiveOpacity = "0.95";
|
||||||
|
opacityRule = [
|
||||||
|
"100:class_i ?= 'vivaldi-stable'"
|
||||||
|
"100:class_i = 'mpv'"
|
||||||
|
"90:class_g = 'URxvt' && focused"
|
||||||
|
"70:class_g = 'URxvt' && !focused"
|
||||||
|
];
|
||||||
|
blur = true;
|
||||||
|
shadow = false;
|
||||||
|
vSync = true;
|
||||||
|
experimentalBackends = true;
|
||||||
|
extraOptions = ''
|
||||||
|
blur:
|
||||||
|
{
|
||||||
|
method = "gaussian";
|
||||||
|
size = 10;
|
||||||
|
deviation = 5.0;
|
||||||
|
};
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -21,4 +21,16 @@ in {
|
|||||||
RestartSec = 12;
|
RestartSec = 12;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
# services.spotifyd = {
|
||||||
|
# enable = true;
|
||||||
|
# config = ''
|
||||||
|
# [global]
|
||||||
|
# username = ${config.secrets.spotify.user}
|
||||||
|
# password = ${config.secrets.spotify.password}
|
||||||
|
# use_keyring = false
|
||||||
|
# bitrate = 320
|
||||||
|
# volume_normalisation = false
|
||||||
|
# backend = pulseaudio
|
||||||
|
# '';
|
||||||
|
# };
|
||||||
}
|
}
|
@ -1,10 +1,21 @@
|
|||||||
{ pkgs, lib, config, ... }: {
|
{ pkgs, lib, config, ... }: {
|
||||||
|
|
||||||
# home-manager.users.alukard = {
|
home-manager.users.alukard = {
|
||||||
# programs.ssh = {
|
# programs.ssh = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# };
|
# forwardAgent = true;
|
||||||
# };
|
# extraOptions = {
|
||||||
|
# # Host = "localhost";
|
||||||
|
# AddKeysToAgent = "ask";
|
||||||
|
# }
|
||||||
|
# };
|
||||||
|
home.file.".ssh/config".text = ''
|
||||||
|
Host localhost
|
||||||
|
ForwardAgent yes
|
||||||
|
AddKeysToAgent ask
|
||||||
|
Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
# services.openssh = {
|
# services.openssh = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
@ -26,4 +37,5 @@
|
|||||||
# "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+xd8ClJPvJuAdYC9HlNnjiubEtYfvnKjYr9ROV+UmPVvI3ZITF24OaMI+fxgR0EqGfcUzSGom8528IB53Q3aFMIAaA0vKjW+jrByyB2l/k/+ttpLbH75c9WyOpAcUDTen8BhHKPyXOHoJ1jLu7GFmtPZ+mZo8thFB/VIRrwECHd8DnF0drsSCorkRp1bZC7bAHgztaYHNBUoAVGgJ7nLwW7DotlgbUEDiPJHXOxd/c/ZlXIB/cfUUqF+L5ThbMPhMcwRMspLy+nQdmHhih9k6SkvYqJoNqHT5/XeShb0RkIzvUWT2CYTPop5kAY5mMnatVTOY1FZPhHzk3G8MhOQ3r/elM/ecZxmjL8uozMN9kRGf1IL4DgQZfVqQRILdNSQGb0tfeiyirNZe1RlDw9UvMnZJOw0EkiC9lSSRhBWXXxAmxRrbNFTPQSp+/kiIGDmp2AsGhD11CfTDEU3wcLEUPBUqp1FYSzHncJyEKGy2Dpa5xaUJ0cuyGL4W3WHDXa4sTfY+AIXbQTD88Ujdsbfzyd6lrikG4D/crCurXissrh7q9DuYKWRI24cp5bw9lG33U1EXisnZqFyZNwMAmSj2QEGsHCwSevn0FgyRa2WYXgpZ9hfgY4le+ZSMo2JTosQ6DjGyxMDyQAHJ/ismTTzL67Q2p6U+73toYm62Qqdspw== (none)"
|
# "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+xd8ClJPvJuAdYC9HlNnjiubEtYfvnKjYr9ROV+UmPVvI3ZITF24OaMI+fxgR0EqGfcUzSGom8528IB53Q3aFMIAaA0vKjW+jrByyB2l/k/+ttpLbH75c9WyOpAcUDTen8BhHKPyXOHoJ1jLu7GFmtPZ+mZo8thFB/VIRrwECHd8DnF0drsSCorkRp1bZC7bAHgztaYHNBUoAVGgJ7nLwW7DotlgbUEDiPJHXOxd/c/ZlXIB/cfUUqF+L5ThbMPhMcwRMspLy+nQdmHhih9k6SkvYqJoNqHT5/XeShb0RkIzvUWT2CYTPop5kAY5mMnatVTOY1FZPhHzk3G8MhOQ3r/elM/ecZxmjL8uozMN9kRGf1IL4DgQZfVqQRILdNSQGb0tfeiyirNZe1RlDw9UvMnZJOw0EkiC9lSSRhBWXXxAmxRrbNFTPQSp+/kiIGDmp2AsGhD11CfTDEU3wcLEUPBUqp1FYSzHncJyEKGy2Dpa5xaUJ0cuyGL4W3WHDXa4sTfY+AIXbQTD88Ujdsbfzyd6lrikG4D/crCurXissrh7q9DuYKWRI24cp5bw9lG33U1EXisnZqFyZNwMAmSj2QEGsHCwSevn0FgyRa2WYXgpZ9hfgY4le+ZSMo2JTosQ6DjGyxMDyQAHJ/ismTTzL67Q2p6U+73toYm62Qqdspw== (none)"
|
||||||
# ];
|
# ];
|
||||||
# programs.ssh.askPassword = "${pkgs.plasma5.ksshaskpass}/bin/ksshaskpass";
|
# programs.ssh.askPassword = "${pkgs.plasma5.ksshaskpass}/bin/ksshaskpass";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,8 +3,9 @@
|
|||||||
{
|
{
|
||||||
home-manager.users.alukard = {
|
home-manager.users.alukard = {
|
||||||
xresources.properties = with config.lib.base16.theme; {
|
xresources.properties = with config.lib.base16.theme; {
|
||||||
"*background" = "#${base00-hex}";
|
|
||||||
"*foreground" = "#${base05-hex}";
|
"*foreground" = "#${base05-hex}";
|
||||||
|
"*background" = "#${base00-hex}";
|
||||||
|
"*cursorColor" = "#${base05-hex}";
|
||||||
"*color0" = "#${base00-hex}";
|
"*color0" = "#${base00-hex}";
|
||||||
"*color1" = "#${base08-hex}";
|
"*color1" = "#${base08-hex}";
|
||||||
"*color2" = "#${base0B-hex}";
|
"*color2" = "#${base0B-hex}";
|
||||||
@ -21,32 +22,6 @@
|
|||||||
"*color13" = "#${base06-hex}";
|
"*color13" = "#${base06-hex}";
|
||||||
"*color14" = "#${base0F-hex}";
|
"*color14" = "#${base0F-hex}";
|
||||||
"*color15" = "#${base07-hex}";
|
"*color15" = "#${base07-hex}";
|
||||||
"*cursorColor" = "#${base05-hex}";
|
|
||||||
|
|
||||||
"URxvt.font" = "xft:${powerlineFont}:style=Regular:size=11";
|
|
||||||
"URxvt.boldFont" = "xft:${powerlineFont}:style=Bold:size=11";
|
|
||||||
"URxvt.italicFont" = "xft:${powerlineFont}:style=Italic:size=11";
|
|
||||||
"URxvt.boldItalicfont" = "xft:${powerlineFont}:style=Bold Italic:size=11";
|
|
||||||
|
|
||||||
"URxvt.letterSpace" = "0";
|
|
||||||
"URxvt.lineSpace" = "0";
|
|
||||||
"URxvt.geometry" = "92x24";
|
|
||||||
"URxvt.internalBorder" = "24";
|
|
||||||
"URxvt.cursorBlink" = "true";
|
|
||||||
"URxvt.cursorUnderline" = "false";
|
|
||||||
"URxvt.saveline" = "2048";
|
|
||||||
"URxvt.scrollBar" = "false";
|
|
||||||
"URxvt.scrollBar_right" = "false";
|
|
||||||
"URxvt.urgentOnBell" = "true";
|
|
||||||
"URxvt.depth" = "24";
|
|
||||||
"URxvt.iso14755" = "false";
|
|
||||||
|
|
||||||
"URxvt.keysym.Shift-Up" = "command:\\033]720;1\\007";
|
|
||||||
"URxvt.keysym.Shift-Down" = "command:\\033]721;1\\007";
|
|
||||||
"URxvt.keysym.Control-Up" = "\\033[1;5A";
|
|
||||||
"URxvt.keysym.Control-Down" = "\\033[1;5B";
|
|
||||||
"URxvt.keysym.Control-Right" = "\\033[1;5C";
|
|
||||||
"URxvt.keysym.Control-Left" = "\\033[1;5D";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
@ -26,6 +26,11 @@
|
|||||||
src = inputs.zsh-you-should-use;
|
src = inputs.zsh-you-should-use;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
envExtra = ''
|
||||||
|
SHELL="${pkgs.zsh}/bin/zsh";
|
||||||
|
'';
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
"clr" = "clear";
|
"clr" = "clear";
|
||||||
"weather" = "curl wttr.in/Volzhskiy";
|
"weather" = "curl wttr.in/Volzhskiy";
|
||||||
@ -50,6 +55,7 @@
|
|||||||
"latree" = "exa -lahgFT@ --git";
|
"latree" = "exa -lahgFT@ --git";
|
||||||
};
|
};
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
|
|
||||||
nixify() {
|
nixify() {
|
||||||
if [ ! -e ./.envrc ]; then
|
if [ ! -e ./.envrc ]; then
|
||||||
echo 'use nix' > .envrc
|
echo 'use nix' > .envrc
|
||||||
|
4
todo.md
4
todo.md
@ -5,6 +5,8 @@
|
|||||||
* spotifyd + cli
|
* spotifyd + cli
|
||||||
* generate gtk icons
|
* generate gtk icons
|
||||||
* overlay for my packages
|
* overlay for my packages
|
||||||
* [vscode base16](https://github.com/golf1052/base16-vscode)
|
|
||||||
* config qbittorrent
|
* config qbittorrent
|
||||||
|
* telegram theme
|
||||||
* mount music folder
|
* mount music folder
|
||||||
|
|
||||||
|
xprop WM_CLASS
|
||||||
|
Loading…
x
Reference in New Issue
Block a user