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

some fixes

Browse Source
This commit is contained in:
Dmitriy Kholkin 2020-08-09 02:57:10 +04:00
parent a4a02134dd
commit f18b5ac912
6 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/applications/flatcolor-gtk-theme.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
stdenv.mkDerivation rec {
name = "flatcolor-gtk-theme";
src = fetchFromGitHub {
owner = "deviantfero";
repo = "wpgtk-templates";
rev = "90da48ecb26a0b36423db7fb8076615b43b72b47";
sha256 = "1k7navk73mzw9lgvgikj96mqdkfb2icw60mdc59dq51rd0nk6d2b";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
installPhase = ''
mkdir -p $out/share/themes
cp -r FlatColor $out/share/themes
rm $out/share/themes/FlatColor/LICENSE
'';
}

7
modules/applications/packages.nix
View File

@ -64,9 +64,10 @@ in {
# cli # cli
ranger ranger
youtube-dl youtube-dl
pywal wpgtk
python27Packages.pygtk # pywal GTK2 reload # pywal
python2 # pywal GTK2 reload # python27Packages.pygtk # pywal GTK2 reload
# python2 # pywal GTK2 reload
# ncmpcpp # ncmpcpp
(youtube-to-mpv.override { isLaptop = isLaptop; }) (youtube-to-mpv.override { isLaptop = isLaptop; })

13
modules/packages.nix
View File

@ -29,6 +29,13 @@
# src = inputs.micro; # src = inputs.micro;
# }); # });
wpgtk = super.wpgtk.overrideAttrs (old: rec {
propagatedBuildInputs = with pkgs; [
python2 python27Packages.pygtk
python3Packages.pygobject3 python3Packages.pillow python3Packages.pywal
];
});
discord = super.discord.overrideAttrs (old: rec { discord = super.discord.overrideAttrs (old: rec {
version = "0.0.11"; version = "0.0.11";
src = pkgs.fetchurl { src = pkgs.fetchurl {
@ -36,16 +43,12 @@
sha256 = "1saqwigi1gjgy4q8rgnwyni57aaszi0w9vqssgyvfgzff8fpcx54"; sha256 = "1saqwigi1gjgy4q8rgnwyni57aaszi0w9vqssgyvfgzff8fpcx54";
}; };
}); });
# git-with-libsecret = super.git.override { withLibsecret = true; }; # git-with-libsecret = super.git.override { withLibsecret = true; };
# spotifyd = super.spotifyd.override { withPulseAudio = true; }; # spotifyd = super.spotifyd.override { withPulseAudio = true; };
# tlp = pkgs.callPackage ./applications/tlp { };
# spotify-tui = pkgs.callPackage ./applications/spotify-tui.nix { };
# spotify-tui = naersk.buildPackage { # spotify-tui = naersk.buildPackage {
# name = "spotify-tui"; # name = "spotify-tui";
# src = pkgs.imports.spotify-tui; # src = pkgs.imports.spotify-tui;

8
modules/workspace/gtk.nix
View File

@ -46,7 +46,6 @@ in {
})]; })];
services.dbus.packages = with pkgs; [ gnome3.dconf ]; services.dbus.packages = with pkgs; [ gnome3.dconf ];
home-manager.users.alukard = { home-manager.users.alukard = {
# home.packages = [pkgs.generated-gtk-theme];
gtk = { gtk = {
enable = true; enable = true;
iconTheme = { iconTheme = {
@ -56,15 +55,16 @@ in {
theme = { theme = {
name = "Generated"; name = "Generated";
package = pkgs.generated-gtk-theme; package = pkgs.generated-gtk-theme;
# name = "FlatColor";
# package = pkgs.flatcolor-gtk-theme;
}; };
font = { font = {
name = "Roboto 12"; name = "Roboto 12";
# package = pkgs.roboto;
}; };
gtk3.extraConfig.gtk-cursor-theme-name = "bibata_oil"; gtk3.extraConfig.gtk-cursor-theme-name = "bibata_oil";
}; };
home.sessionVariables.GTK_THEME = "Generated"; 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";
}; };
# environment.sessionVariables.GTK_THEME = "Generated";
# environment.sessionVariables.GDK_BACKEND = "x11";
} }

16
modules/workspace/i3status-rust/default.nix
View File

@ -18,14 +18,14 @@ in {
strip_workspace_numbers no strip_workspace_numbers no
tray_output primary tray_output primary
colors { colors {
background ${config.themes.colors.bg} background $bg
statusline ${config.themes.colors.fg} statusline $fg
separator ${config.themes.colors.alt} separator $alt
focused_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.blue} focused_workspace $bg $bg $blue
active_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.green} active_workspace $bg $bg $green
inactive_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.fg} inactive_workspace $bg $bg $fg
urgent_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.orange} urgent_workspace $bg $bg $orange
binding_mode ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.yellow} binding_mode $bg $bg $yellow
} }
} }
''; '';

3
modules/workspace/rofi.nix
View File

@ -2,8 +2,7 @@
home-manager.users.alukard.programs.rofi = { home-manager.users.alukard.programs.rofi = {
enable = true; enable = true;
font = "Roboto Mono 14"; font = "Roboto Mono 14";
terminal = "\${rxvt_unicode}/bin/urxvt"; terminal = config.defaultApplications.term.cmd;
# theme = "custom.rasi";
theme = "~/.cache/wal/colors-rofi-dark.rasi"; theme = "~/.cache/wal/colors-rofi-dark.rasi";
}; };
} }