Compare commits

...

3 commits

5 changed files with 36 additions and 108 deletions

View file

@ -1,7 +1,9 @@
{ pkgs { pkgs
, inputs , inputs
, const , const
, lib
, util , util
, config
, secret , secret
, ... } @args: let , ... } @args: let
# Path where Termux stores user data. # Path where Termux stores user data.
@ -17,6 +19,7 @@
bash = import ../module/common/bash args; bash = import ../module/common/bash args;
nvim = import ../module/common/nvim args; nvim = import ../module/common/nvim args;
ssh = import ../module/common/ssh args; ssh = import ../module/common/ssh args;
stylix = import ../module/common/Stylix.nix args;
tmux = import ../module/common/tmux args; tmux = import ../module/common/tmux args;
yazi = import ../user/common/yazi args; yazi = import ../user/common/yazi args;
in { in {
@ -27,7 +30,12 @@ in {
# Install packages. # Install packages.
environment.packages = package.list; environment.packages = package.list;
home-manager.config = { # Home manager config.
home-manager.config = stylix // {
imports = [
inputs.stylix.homeManagerModules.stylix
];
home = { home = {
# Release version. # Release version.
stateVersion = const.droidStateVersion; stateVersion = const.droidStateVersion;
@ -50,6 +58,8 @@ in {
# Special app configuration. # Special app configuration.
programs = { programs = {
home-manager.enable = true;
bash = { bash = {
enable = true; enable = true;
bashrcExtra = bash.config + termux.initScript; bashrcExtra = bash.config + termux.initScript;

View file

@ -1,81 +0,0 @@
{ lib, ... }: with lib; let
mkTypeOption = default: type: mkOption { inherit default type; };
mkStrOption = default: mkTypeOption default types.str;
mkIntOption = default: mkTypeOption default types.int;
mkFloatOption = default: mkTypeOption default types.float;
in {
options.style = {
color = {
bg = {
dark = mkStrOption "1d2021";
light = mkStrOption "504945";
regular = mkStrOption "3c3836";
};
fg = {
dark = mkStrOption "a89984";
light = mkStrOption "fbf1c7";
regular = mkStrOption "ebdbb2";
};
accent = mkStrOption "b8bb26";
heading = mkStrOption "d5c4a1";
hl = mkStrOption "98971a";
keyword = mkStrOption "98971a";
link = mkStrOption "076678";
misc = mkStrOption "808080";
negative = mkStrOption "cc241d";
neutral = mkStrOption "458588";
positive = mkStrOption "87af87";
selection = mkStrOption "87af87";
transparent = mkStrOption "ffffff00";
accent-b = mkStrOption "38";
accent-g = mkStrOption "187";
accent-r = mkStrOption "184";
negative-b = mkStrOption "29";
negative-g = mkStrOption "36";
negative-r = mkStrOption "204";
neutral-b = mkStrOption "136";
neutral-g = mkStrOption "133";
neutral-r = mkStrOption "69";
positive-b = mkStrOption "135";
positive-g = mkStrOption "175";
positive-r = mkStrOption "135";
bg-b = mkStrOption "33";
bg-g = mkStrOption "32";
bg-r = mkStrOption "29";
fg-b = mkStrOption "199";
fg-g = mkStrOption "241";
fg-r = mkStrOption "251";
border = mkStrOption "3c3836";
border-b = mkStrOption "54";
border-g = mkStrOption "56";
border-r = mkStrOption "60";
};
fonts = {
monospace.name = mkStrOption "Terminess Nerd Font Mono";
emoji.name = mkStrOption "Noto Color Emoji";
serif.name = mkStrOption "SF Pro Display";
sansSerif.name = mkStrOption "SF Pro Display";
sizes = {
applications = mkIntOption 12;
terminal = mkIntOption 12;
popups = mkIntOption 12;
desktop = mkIntOption 12;
};
};
opacity = {
application = mkFloatOption 1.0;
desktop = mkFloatOption 1.0;
popup = mkFloatOption 1.0;
terminal = mkFloatOption 1.0;
};
};
}

View file

@ -247,20 +247,20 @@
# Android. # Android.
nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
modules = [ modules = let
lib = nixpkgs.lib;
config = self.nixOnDroidConfigurations.default.config;
in [
# Android release version. # Android release version.
{ system.stateVersion = inputs.self.const.droidStateVersion; } { system.stateVersion = self.const.droidStateVersion; }
# I put all my Android configuration there. # I put all my Android configuration there.
./android ./android
./android/style/Gruvbox.nix
# Some common modules. # Some common modules.
./module/common/Setting.nix ./module/common/Setting.nix
# ./module/common/Style.nix ./module/common/Wallpaper.nix
(import ./module/common/Style.nix { inherit lib; inherit (config.home-manager) config; })
# Stylix.
# inputs.stylix.homeManagerModules.stylix
]; ];
# SpecialArgs allows you to pass objects down to other configuration. # SpecialArgs allows you to pass objects down to other configuration.

View file

@ -1,11 +1,8 @@
{ pkgs, config, ... }: { { pkgs, config, ... }: {
# Add a permanent link for the wallpaper to /etc/wallpaper.
environment.etc.wallpaper.source = config.module.common.wallpaper.path;
stylix = { stylix = {
enable = true; enable = true;
image = config.module.common.wallpaper.path; image = config.module.common.wallpaper.path;
autoEnable = true; autoEnable = false;
polarity = "dark"; polarity = "dark";
opacity = { opacity = {
applications = 0.85; applications = 0.85;
@ -18,18 +15,20 @@
package = pkgs.gnome3.adwaita-icon-theme; package = pkgs.gnome3.adwaita-icon-theme;
size = 14; size = 14;
}; };
fonts = { fonts = let
serif = {
package = (pkgs.callPackage ./applefont {});
name = "SF Pro Display";
};
in {
inherit serif;
sizes = { sizes = {
applications = 12; applications = 12;
terminal = 14; terminal = 14;
popups = 12; popups = 12;
desktop = 14; desktop = 14;
}; };
serif = { sansSerif = serif;
package = (pkgs.callPackage ./applefont {});
name = "SF Pro Display";
};
sansSerif = config.stylix.fonts.serif;
monospace = { monospace = {
package = (pkgs.nerdfonts.override { fonts = [ "Terminus" ]; }); package = (pkgs.nerdfonts.override { fonts = [ "Terminus" ]; });
name = "Terminess Nerd Font Mono"; name = "Terminess Nerd Font Mono";

View file

@ -4,22 +4,22 @@
{ lib, stdenv, fetchurl, p7zip }: let { lib, stdenv, fetchurl, p7zip }: let
pro = fetchurl { pro = fetchurl {
url = "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"; url = "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg";
sha256 = "sha256-Mu0pmx3OWiKBmMEYLNg+u2MxFERK07BQGe3WAhEec5Q="; sha256 = "sha256-B8xljBAqOoRFXvSOkOKDDWeYUebtMmQLJ8lF05iFnXk=";
}; };
compact = fetchurl { compact = fetchurl {
url = "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"; url = "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg";
sha256 = "sha256-Mkf+GK4iuUhZdUdzMW0VUOmXcXcISejhMeZVm0uaRwY="; sha256 = "sha256-L4oLQ34Epw1/wLehU9sXQwUe/LaeKjHRxQAF6u2pfTo=";
}; };
mono = fetchurl { mono = fetchurl {
url = "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"; url = "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg";
sha256 = "sha256-tZHV6g427zqYzrNf3wCwiCh5Vjo8PAai9uEvayYPsjM="; sha256 = "sha256-Uarx1TKO7g5yVBXAx6Yki065rz/wRuYiHPzzi6cTTl8=";
}; };
ny = fetchurl { ny = fetchurl {
url = "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"; url = "https://devimages-cdn.apple.com/design/resources/download/NY.dmg";
sha256 = "sha256-tn1QLCSjgo5q4PwE/we80pJavr3nHVgFWrZ8cp29qBk="; sha256 = "sha256-yYyqkox2x9nQ842laXCqA3UwOpUGyIfUuprX975OsLA=";
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "applefont"; name = "applefont";