AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update, change terminal

Browse Source
This commit is contained in:
Dmitriy Kholkin 2020-11-10 00:09:40 +04:00
parent 105af0fac2
commit d7670907af
14 changed files with 82 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
flake.lock generated
View File

@ -39,11 +39,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1600992519,
"narHash": "sha256-Y9wlciB/g1QUquVpTZXQq23I5r8qJ4nZArfczTYBo24=",
"lastModified": 1603662906,
"narHash": "sha256-d9Ww4Fa9WB00JLaqXN/cp41rVxF/MXGr3SbhMY5f11k=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "abfb4cde51856dbee909f373b59cd941f51c2170",
"rev": "28eb093a1e6999d52e60811008b4bfc7e20cc591",
"type": "github"
},
"original": {
@ -71,11 +71,11 @@
"materia-theme": {
"flake": false,
"locked": {
"lastModified": 1600267825,
"narHash": "sha256-5Fit4XWacj21KqX5XpurwIxxZNlegvy0F+0Xq53qXWE=",
"lastModified": 1601330353,
"narHash": "sha256-zOi6nwJ23UdPbIvEc4gAHk/6aFVkK1Uuy2D/65gvuOI=",
"owner": "nana-4",
"repo": "materia-theme",
"rev": "f85cac721b892d052724c72c2f5fb42df0e00264",
"rev": "e329aaee160c82e85fe91a6467c666c7f9f2a7df",
"type": "github"
},
"original": {
@ -102,11 +102,11 @@
"nixpkgs-mozilla": {
"flake": false,
"locked": {
"lastModified": 1594829078,
"narHash": "sha256-yRCkO499a5gucHmxgWb/QDqPt/UBTbuPURuPZ9DLmIc=",
"lastModified": 1603906276,
"narHash": "sha256-RsNPnEKd7BcogwkqhaV5kI/HuNC4flH/OQCC/4W5y/8=",
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"rev": "efda5b357451dbb0431f983cca679ae3cd9b9829",
"rev": "8c007b60731c07dd7a052cce508de3bb1ae849b4",
"type": "github"
},
"original": {
@ -133,11 +133,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1600997075,
"narHash": "sha256-S3Bdk2fmx3kD/wzWL4FYadRYPMHY96lhFleOyWoasNI=",
"lastModified": 1603910308,
"narHash": "sha256-cfD63yk3bkXKTfWT7SfkB7FvBBavzcDCDvvDBocIJ/4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e247ea75622a94766aaca655d460ec2e175abc29",
"rev": "ca45bb574ddd7c4e4a855bc41a7154f0b6edddd9",
"type": "github"
},
"original": {
@ -147,11 +147,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1600573085,
"narHash": "sha256-w5SGosyuTbFCBoUzgy2gyVcxYxRUvZ6SgHsRIPkZXgI=",
"lastModified": 1603758576,
"narHash": "sha256-xKFmWVx+rFInBao3gtmvXcd0LjHD1+0c1Ef5PJDrbuM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1179840f9a88b8a548f4b11d1a03aa25a790c379",
"rev": "1dc37370c489b610f8b91d7fdd40633163ffbafd",
"type": "github"
},
"original": {
@ -180,11 +180,11 @@
"spotify-tui": {
"flake": false,
"locked": {
"lastModified": 1600893283,
"narHash": "sha256-viwU9nPY6pmwOWcwGbkiE+wvEru/EZJXUDR5SklWeoY=",
"lastModified": 1603791861,
"narHash": "sha256-sDsUa5tx2/XM8hcusapnEgKVcOsaExG00b6dVuL2pSM=",
"owner": "Rigellute",
"repo": "spotify-tui",
"rev": "0e8f3723ad3b91725d04b460ae6b511ac6ffac1c",
"rev": "c8603131e8635030ae23a47d63ddb3cc741f2a34",
"type": "github"
},
"original": {

BIN
misc/Passwords.kdbx
View File

Binary file not shown.

4
modules/applications.nix
View File

@ -8,8 +8,8 @@ with config.deviceSpecific;
config = rec {
defaultApplications = {
term = if isLaptop then {
cmd = "${pkgs.rxvt_unicode}/bin/urxvt";
desktop = "urxvt";
cmd = "${pkgs.kitty}/bin/kitty";
desktop = "kitty";
} else {
cmd = "${pkgs.alacritty}/bin/alacritty";
desktop = "alacritty";

52
modules/applications/kitty.nix Normal file
View File

@ -0,0 +1,52 @@
{ pkgs, lib, config, ... }:
let
thm = config.lib.base16.theme;
in
with config.deviceSpecific;
{
home-manager.users.alukard = {
programs.kitty = {
enable = isLaptop;
font.name = "${thm.powerlineFont} ${thm.smallFontSize}";
# keybindings = ''
# '';
settings = {
foreground = "#${base05-hex}";
background = "#${base00-hex}";
selection_background = "#${base05-hex}";
selection_foreground = "#${base00-hex}";
url_color = "#${base04-hex}";
active_border_color = "#${base03-hex}";
inactive_border_color = "#${base01-hex}";
active_tab_background = "#${base00-hex}";
active_tab_foreground = "#${base05-hex}";
inactive_tab_background = "#${base01-hex}";
inactive_tab_foreground = "#${base04-hex}";
tab_bar_background = "#${base01-hex}";
cursor = "#${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
modules/applications/packages.nix
View File

@ -21,6 +21,7 @@ with deviceSpecific; {
lnav
neofetch
nix-prefetch-git
nix-prefetch-github
nomino
(p7zip.override { enableUnfree = true; })
pciutils

BIN
modules/applications/qbittorrent/darkstylesheet.qbtheme
View File

Binary file not shown.

8
modules/applications/qbittorrent/default.nix
View File

@ -1,8 +0,0 @@
{ config, lib, pkgs, ... }:
{
home-manager.users.alukard = {
home.file.".config/qBittorrent/darkstylesheet.qbtheme" = {
source = ./darkstylesheet.qbtheme;
};
};
}

2
modules/default.nix
View File

@ -2,9 +2,9 @@ device:
{ config, lib, ... }: {
imports = [
./applications/alacritty.nix
./applications/kitty.nix
./applications/mpv.nix
./applications/packages.nix
./applications/qbittorrent
./applications/rofi.nix
./applications/urxvt.nix
./applications/vscode.nix

1
modules/filesystems.nix
View File

@ -70,6 +70,7 @@ with deviceSpecific;
};
"/media/files" = if isHost then {
# Samba host
fsType = "ntfs";
device = "/dev/disk/by-partuuid/8a1d933c-302b-4e62-b9af-a45ecd05777f";
options = [

2
modules/sound/default.nix
View File

@ -3,7 +3,7 @@
imports = [
./pulseaudio.nix
./mopidy.nix
# ./mopidy.nix
];

2
modules/sound/mopidy.nix
View File

@ -1,7 +1,7 @@
{ pkgs, config, lib, ... }: {
# TODO: FIXIT!
services.mopidy = {
enable = false;
enable = true;
# extensionPackages = with pkgs; [ mopidy-gmusic mopidy-youtube ];
configuration = ''
[mpd]

8
modules/workspace/gtk.nix
View File

@ -54,8 +54,6 @@ in {
theme = {
name = "Generated";
package = pkgs.generated-gtk-theme;
# name = "FlatColor";
# package = pkgs.flatcolor-gtk-theme;
};
font = {
name = "${thm.font} ${thm.normalFontSize}";
@ -63,7 +61,9 @@ in {
gtk3.extraConfig.gtk-cursor-theme-name = "bibata_oil";
};
home.sessionVariables.GTK_THEME = "Generated";
home.sessionVariables.XDG_DATA_DIRS = "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS";
# home.sessionVariables.GTK_THEME = "FlatColor";
home.sessionVariables.XDG_DATA_DIRS = [
"${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}"
"${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}"
];
};
}

3
modules/workspace/i3/default.nix
View File

@ -84,8 +84,7 @@ in {
};
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.pywal}/bin/wal -R"; }
# { command = "${pkgs.xorg.xrdb}/bin/xrdb -merge ~/.Xresources"; }
{ command = "${pkgs.tdesktop}/bin/telegram-desktop"; }
{
command =

1
modules/workspace/ssh.nix
View File

@ -38,4 +38,3 @@
# ];
# programs.ssh.askPassword = "${pkgs.plasma5.ksshaskpass}/bin/ksshaskpass";
}