mirror of
https://github.com/librephoenix/nixos-config
synced 2025-07-06 06:52:13 +05:30
Optimized some specialArgs and module argument use
This commit is contained in:
Emmet
parent
2d75530b6d
commit
18c8365f40
76 changed files with 282 additions and 284 deletions
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# Module installing brave as default browser
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, wmType, font, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# Module installing as default browser
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ config, lib, pkgs, wmType, font, ... }:
|
||||
{ pkgs, userSettings, ... }:
|
||||
|
||||
{
|
||||
# Module installing librewolf as default browser
|
||||
home.packages = if (wmType == "wayland") then [ pkgs.librewolf-wayland ]
|
||||
home.packages = if (userSettings.wmType == "wayland") then [ pkgs.librewolf-wayland ]
|
||||
else [ pkgs.librewolf ];
|
||||
|
||||
home.sessionVariables = if (wmType == "wayland")
|
||||
home.sessionVariables = if (userSettings.wmType == "wayland")
|
||||
then { DEFAULT_BROWSER = "${pkgs.librewolf-wayland}/bin/librewolf";}
|
||||
else
|
||||
{ DEFAULT_BROWSER = "${pkgs.librewolf}/bin/librewolf";};
|
||||
|
||||
home.file.".librewolf/librewolf.overrides.cfg".text = ''
|
||||
defaultPref("font.name.serif.x-western","''+font+''");
|
||||
defaultPref("font.name.serif.x-western","''+userSettings.font+''");
|
||||
|
||||
defaultPref("font.size.variable.x-western",20);
|
||||
defaultPref("browser.toolbars.bookmarks.visibility","always");
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
defaultPref("privacy.clearOnShutdown.cookies",true);
|
||||
defaultPref("gfx.webrender.software.opengl",false);
|
||||
defaultPref("webgl.disabled",true);
|
||||
pref("font.name.serif.x-western","''+font+''");
|
||||
pref("font.name.serif.x-western","''+userSettings.font+''");
|
||||
|
||||
pref("font.size.variable.x-western",20);
|
||||
pref("browser.toolbars.bookmarks.visibility","always");
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkgs, dmenuCmd ? "rofi -dmenu", ... }:
|
||||
{ lib, stdenv, fetchFromGitHub, dmenuCmd ? "rofi -dmenu", ... }:
|
||||
|
||||
let name = "qute-containers";
|
||||
version = "unstable";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, font, qute-containers, ... }:
|
||||
{ config, pkgs, userSettings, ... }:
|
||||
|
||||
{
|
||||
|
||||
|
|
@ -194,7 +194,7 @@ c.colors.tabs.selected.even.fg = base05
|
|||
c.colors.tabs.selected.even.bg = base02
|
||||
c.colors.webpage.bg = base00
|
||||
|
||||
font = "''+font+''"
|
||||
font = "''+userSettings.font+''"
|
||||
|
||||
c.fonts.default_family = font
|
||||
c.fonts.default_size = '14pt'
|
||||
|
|
@ -222,7 +222,7 @@ c.fonts.web.family.cursive = font
|
|||
}
|
||||
/*paragraphs*/
|
||||
p {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:24px;
|
||||
text-align:center;
|
||||
|
|
@ -255,7 +255,7 @@ c.fonts.web.family.cursive = font
|
|||
|
||||
/*xmp tag style for ascii art*/
|
||||
xmp {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:22px;
|
||||
color: #''+config.lib.stylix.colors.base01+''
|
||||
|
|
@ -340,7 +340,7 @@ Bard
|
|||
}
|
||||
/*paragraphs*/
|
||||
p {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:24px;
|
||||
text-align:center;
|
||||
|
|
@ -373,7 +373,7 @@ Bard
|
|||
|
||||
/*xmp tag style for ascii art*/
|
||||
xmp {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:22px;
|
||||
color: #''+config.lib.stylix.colors.base01+''
|
||||
|
|
@ -447,7 +447,7 @@ Bard
|
|||
}
|
||||
/*paragraphs*/
|
||||
p {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:24px;
|
||||
text-align:center;
|
||||
|
|
@ -480,7 +480,7 @@ Bard
|
|||
|
||||
/*xmp tag style for ascii art*/
|
||||
xmp {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:22px;
|
||||
color: #''+config.lib.stylix.colors.base01+''
|
||||
|
|
@ -554,7 +554,7 @@ Bard
|
|||
}
|
||||
/*paragraphs*/
|
||||
p {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:24px;
|
||||
text-align:center;
|
||||
|
|
@ -587,7 +587,7 @@ Bard
|
|||
|
||||
/*xmp tag style for ascii art*/
|
||||
xmp {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:22px;
|
||||
color: #''+config.lib.stylix.colors.base01+''
|
||||
|
|
@ -661,7 +661,7 @@ Bard
|
|||
}
|
||||
/*paragraphs*/
|
||||
p {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:24px;
|
||||
text-align:center;
|
||||
|
|
@ -694,7 +694,7 @@ Bard
|
|||
|
||||
/*xmp tag style for ascii art*/
|
||||
xmp {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:22px;
|
||||
color: #''+config.lib.stylix.colors.base01+''
|
||||
|
|
@ -768,7 +768,7 @@ Bard
|
|||
}
|
||||
/*paragraphs*/
|
||||
p {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:24px;
|
||||
text-align:center;
|
||||
|
|
@ -801,7 +801,7 @@ Bard
|
|||
|
||||
/*xmp tag style for ascii art*/
|
||||
xmp {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:22px;
|
||||
color: #''+config.lib.stylix.colors.base01+''
|
||||
|
|
@ -875,7 +875,7 @@ Bard
|
|||
}
|
||||
/*paragraphs*/
|
||||
p {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:24px;
|
||||
text-align:center;
|
||||
|
|
@ -908,7 +908,7 @@ Bard
|
|||
|
||||
/*xmp tag style for ascii art*/
|
||||
xmp {
|
||||
font-family:''+font+'';
|
||||
font-family:''+userSettings.font+'';
|
||||
|
||||
font-size:22px;
|
||||
color: #''+config.lib.stylix.colors.base01+''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, dmenu_command ? "rofi -show dmenu", ... }:
|
||||
{ pkgs, dmenu_command ? "rofi -show dmenu", ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [ networkmanager_dmenu networkmanagerapplet ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ config, lib, pkgs, eaf, eaf-browser, org-nursery, phscroll, org-yaap, org-side-tree, org-timeblock, theme, font, name, username, email, dotfilesDir, profile, wmType, defaultRoamDir, ... }:
|
||||
{ config, lib, pkgs, userSettings, systemSettings,
|
||||
eaf, eaf-browser, org-nursery, org-yaap,
|
||||
org-side-tree, org-timeblock, phscroll, ... }:
|
||||
let
|
||||
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+theme)+"/polarity.txt"));
|
||||
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
|
||||
dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
|
||||
in
|
||||
{
|
||||
|
|
@ -139,14 +141,14 @@ in
|
|||
|
||||
;; Import relevant variables from flake into emacs
|
||||
|
||||
(setq user-full-name "''+name+''") ; name
|
||||
(setq user-username "''+username+''") ; username
|
||||
(setq user-mail-address "''+email+''") ; email
|
||||
(setq user-home-directory "/home/''+username+''") ; absolute path to home directory as string
|
||||
(setq user-default-roam-dir "''+defaultRoamDir+''") ; absolute path to home directory as string
|
||||
(setq system-nix-profile "''+profile+''") ; what profile am I using?
|
||||
(setq system-wm-type "''+wmType+''") ; wayland or x11?
|
||||
(setq doom-font (font-spec :family "''+font+''" :size 20)) ; import font
|
||||
(setq dotfiles-dir "''+dotfilesDir+''") ; import location of dotfiles directory
|
||||
(setq user-full-name "''+userSettings.name+''") ; name
|
||||
(setq user-username "''+userSettings.username+''") ; username
|
||||
(setq user-mail-address "''+userSettings.email+''") ; email
|
||||
(setq user-home-directory "/home/''+userSettings.username+''") ; absolute path to home directory as string
|
||||
(setq user-default-roam-dir "''+userSettings.defaultRoamDir+''") ; absolute path to home directory as string
|
||||
(setq system-nix-profile "''+systemSettings.profile+''") ; what profile am I using?
|
||||
(setq system-wm-type "''+userSettings.wmType+''") ; wayland or x11?
|
||||
(setq doom-font (font-spec :family "''+userSettings.font+''" :size 20)) ; import font
|
||||
(setq dotfiles-dir "''+userSettings.dotfilesDir+''") ; import location of dotfiles directory
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1982,9 +1982,11 @@ Any git package can be configured for a particular commit or branch:
|
|||
* Nix Integration
|
||||
In order to have Nix load my Doom Emacs configuration [[./doom.nix][doom.nix]], which I source in the =imports= block of my [[../../../profiles/work/home.nix][home.nix]].
|
||||
#+BEGIN_SRC nix :tangle doom.nix
|
||||
{ config, lib, pkgs, eaf, eaf-browser, org-nursery, phscroll, org-yaap, org-side-tree, org-timeblock, theme, font, name, username, email, dotfilesDir, profile, wmType, defaultRoamDir, ... }:
|
||||
{ config, lib, pkgs, userSettings, systemSettings,
|
||||
eaf, eaf-browser, org-nursery, org-yaap,
|
||||
org-side-tree, org-timeblock, phscroll, ... }:
|
||||
let
|
||||
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+theme)+"/polarity.txt"));
|
||||
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
|
||||
dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
|
||||
in
|
||||
{
|
||||
|
|
@ -2123,15 +2125,15 @@ in
|
|||
|
||||
;; Import relevant variables from flake into emacs
|
||||
|
||||
(setq user-full-name "''+name+''") ; name
|
||||
(setq user-username "''+username+''") ; username
|
||||
(setq user-mail-address "''+email+''") ; email
|
||||
(setq user-home-directory "/home/''+username+''") ; absolute path to home directory as string
|
||||
(setq user-default-roam-dir "''+defaultRoamDir+''") ; absolute path to home directory as string
|
||||
(setq system-nix-profile "''+profile+''") ; what profile am I using?
|
||||
(setq system-wm-type "''+wmType+''") ; wayland or x11?
|
||||
(setq doom-font (font-spec :family "''+font+''" :size 20)) ; import font
|
||||
(setq dotfiles-dir "''+dotfilesDir+''") ; import location of dotfiles directory
|
||||
(setq user-full-name "''+userSettings.name+''") ; name
|
||||
(setq user-username "''+userSettings.username+''") ; username
|
||||
(setq user-mail-address "''+userSettings.email+''") ; email
|
||||
(setq user-home-directory "/home/''+userSettings.username+''") ; absolute path to home directory as string
|
||||
(setq user-default-roam-dir "''+userSettings.defaultRoamDir+''") ; absolute path to home directory as string
|
||||
(setq system-nix-profile "''+systemSettings.profile+''") ; what profile am I using?
|
||||
(setq system-wm-type "''+userSettings.wmType+''") ; wayland or x11?
|
||||
(setq doom-font (font-spec :family "''+userSettings.font+''" :size 20)) ; import font
|
||||
(setq dotfiles-dir "''+userSettings.dotfilesDir+''") ; import location of dotfiles directory
|
||||
'';
|
||||
}
|
||||
#+END_SRC
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = [ pkgs.flatpak ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
myRetroarch =
|
||||
(pkgs.retroarch.override {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ config, lib, pkgs, name, email, ... }:
|
||||
{ config, pkgs, userSettings, ... }:
|
||||
|
||||
{
|
||||
home.packages = [ pkgs.git ];
|
||||
programs.git.enable = true;
|
||||
programs.git.userName = name;
|
||||
programs.git.userEmail = email;
|
||||
programs.git.userName = userSettings.name;
|
||||
programs.git.userEmail = userSettings.email;
|
||||
programs.git.extraConfig = {
|
||||
init.defaultBranch = "main";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
# nixpkgs.overlays = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
let myCbxScript = ''
|
||||
# TODO fix this for wayland
|
||||
#!/bin/sh
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Various packages related to virtualization, compatability and sandboxing
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, username, dotfilesDir, ... }:
|
||||
{ pkgs, userSettings, ... }:
|
||||
|
||||
let
|
||||
# This sets up my "phoenix" script with my configuration paths
|
||||
|
|
@ -43,7 +43,7 @@ let
|
|||
}
|
||||
function sync_system {
|
||||
echo -e "$ORANGE### Syncing system configuration ###$NC"
|
||||
pushd ''+dotfilesDir+'' &> /dev/null;
|
||||
pushd ''+userSettings.dotfilesDir+'' &> /dev/null;
|
||||
if [ "$1" = "verbose" ]; then
|
||||
echo "Syncing system configuration (stack traces will be shown):"
|
||||
sudo systemd-run --no-ask-password --uid=0 --system --scope -p MemoryLimit=16000M -p CPUQuota=60% nixos-rebuild switch --flake .#system --show-trace;
|
||||
|
|
@ -81,7 +81,7 @@ let
|
|||
}
|
||||
function sync_user {
|
||||
echo -e "$BLUE### Syncing user configuration ###$NC"
|
||||
pushd ''+dotfilesDir+'' &> /dev/null;
|
||||
pushd ''+userSettings.dotfilesDir+'' &> /dev/null;
|
||||
if [ "$1" = "verbose" ]; then
|
||||
echo "Syncing user configuration (stack traces will be shown):"
|
||||
echo "Running home-manager switch --flake .#user --show-trace"
|
||||
|
|
@ -107,7 +107,7 @@ let
|
|||
}
|
||||
function update_flake {
|
||||
echo -e "$CYAN### Updating flake and other package managers$NC";
|
||||
pushd ''+dotfilesDir+'' &> /dev/null;
|
||||
pushd ''+userSettings.dotfilesDir+'' &> /dev/null;
|
||||
if [ "$1" = "verbose" ]; then
|
||||
echo "Updating flake inputs";
|
||||
echo "Running nix flake update";
|
||||
|
|
@ -123,7 +123,7 @@ let
|
|||
npm install darkreader @mozilla/readability;
|
||||
echo "Running rm package*.json";
|
||||
rm package*.json;
|
||||
echo "Returning to ''+dotfilesDir+''"
|
||||
echo "Returning to ''+userSettings.dotfilesDir+''"
|
||||
popd &> /dev/null;
|
||||
fi
|
||||
echo ""
|
||||
|
|
@ -173,7 +173,7 @@ let
|
|||
fi
|
||||
popd &> /dev/null;
|
||||
echo -e "$CYAN### Flake and other updates finished ###$NC";
|
||||
echo -e "Please run$GREEN git$NC diff HEAD flake.lock inside ''+dotfilesDir+(" "+'' to see flake input changes";'')+
|
||||
echo -e "Please run$GREEN git$NC diff HEAD flake.lock inside ''+userSettings.dotfilesDir+(" "+'' to see flake input changes";'')+
|
||||
''}
|
||||
if [ "$1" = "sync" ]; then
|
||||
if [ "$#" = 1 ]; then
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
myYtpScript = ''
|
||||
#!/bin/sh
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# Python packages
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, stdenv, fetchurl, appimageTools, makeWrapper, electron_22, lib, pkgs, ... }:
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
|
|
@ -53,4 +53,6 @@
|
|||
}
|
||||
)
|
||||
];
|
||||
|
||||
home.packages = [ pkgs.blockbench-electron ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# THIS DOES NOT WORK YET!
|
||||
{ lib, stdenv, buildPythonPackage, pkgs, ... }:
|
||||
{ lib, buildPythonPackage, pkgs, ... }:
|
||||
|
||||
let name = "Impressive";
|
||||
_name = "impressive";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# THIS DOES NOT WORK YET!
|
||||
{ lib, stdenv, pkgs, ... }:
|
||||
{ stdenv, pkgs, ... }:
|
||||
|
||||
let name = "rogauracore";
|
||||
owner = "wroberts";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# Collection of useful CLI apps
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
|
||||
# My shell aliases
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ config, lib, pkgs, theme, font, fontPkg, wmType, ... }:
|
||||
{ config, lib, pkgs, userSettings, ... }:
|
||||
|
||||
let
|
||||
themePath = "../../../themes"+("/"+theme+"/"+theme)+".yaml";
|
||||
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../themes"+("/"+theme)+"/polarity.txt"));
|
||||
backgroundUrl = builtins.readFile (./. + "../../../themes"+("/"+theme)+"/backgroundurl.txt");
|
||||
backgroundSha256 = builtins.readFile (./. + "../../../themes/"+("/"+theme)+"/backgroundsha256.txt");
|
||||
themePath = "../../../themes"+("/"+userSettings.theme+"/"+userSettings.theme)+".yaml";
|
||||
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
|
||||
backgroundUrl = builtins.readFile (./. + "../../../themes"+("/"+userSettings.theme)+"/backgroundurl.txt");
|
||||
backgroundSha256 = builtins.readFile (./. + "../../../themes/"+("/"+userSettings.theme)+"/backgroundsha256.txt");
|
||||
in
|
||||
{
|
||||
home.file.".currenttheme".text = theme;
|
||||
home.file.".currenttheme".text = userSettings.theme;
|
||||
stylix.autoEnable = false;
|
||||
stylix.polarity = themePolarity;
|
||||
stylix.image = pkgs.fetchurl {
|
||||
|
|
@ -18,16 +18,16 @@ in
|
|||
|
||||
stylix.fonts = {
|
||||
monospace = {
|
||||
name = font;
|
||||
package = fontPkg;
|
||||
name = userSettings.font;
|
||||
package = userSettings.fontPkg;
|
||||
};
|
||||
serif = {
|
||||
name = font;
|
||||
package = fontPkg;
|
||||
name = userSettings.font;
|
||||
package = userSettings.fontPkg;
|
||||
};
|
||||
sansSerif = {
|
||||
name = font;
|
||||
package = fontPkg;
|
||||
name = userSettings.font;
|
||||
package = userSettings.fontPkg;
|
||||
};
|
||||
emoji = {
|
||||
name = "Noto Color Emoji";
|
||||
|
|
@ -72,8 +72,8 @@ in
|
|||
};
|
||||
stylix.targets.kitty.enable = true;
|
||||
stylix.targets.gtk.enable = true;
|
||||
stylix.targets.rofi.enable = if (wmType == "x11") then true else false;
|
||||
stylix.targets.feh.enable = if (wmType == "x11") then true else false;
|
||||
stylix.targets.rofi.enable = if (userSettings.wmType == "x11") then true else false;
|
||||
stylix.targets.feh.enable = if (userSettings.wmType == "x11") then true else false;
|
||||
programs.feh.enable = true;
|
||||
home.file.".fehbg-stylix".text = ''
|
||||
#!/bin/sh
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, stdenv, toString, browser, term, spawnEditor, font, hyprland-plugins, ... }:
|
||||
{ config, lib, pkgs, userSettings, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
|
|
@ -20,9 +20,7 @@
|
|||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
plugins = [
|
||||
# (pkgs.callPackage ./hyprbars.nix { inherit hyprland-plugins; } )
|
||||
];
|
||||
plugins = [ ];
|
||||
settings = { };
|
||||
extraConfig = ''
|
||||
exec-once = dbus-update-activation-environment DISPLAY XAUTHORITY WAYLAND_DISPLAY
|
||||
|
|
@ -67,7 +65,7 @@
|
|||
|
||||
# col.text = 0xff''+ config.lib.stylix.colors.base05 + ''
|
||||
|
||||
# bar_text_font = '' + font + ''
|
||||
# bar_text_font = '' + userSettings.font + ''
|
||||
|
||||
# bar_text_size = 12
|
||||
|
||||
|
|
@ -91,11 +89,11 @@
|
|||
bind = SUPER,R,pass,^(com\.obsproject\.Studio)$
|
||||
bind = SUPERSHIFT,R,pass,^(com\.obsproject\.Studio)$
|
||||
|
||||
bind=SUPER,RETURN,exec,'' + term + ''
|
||||
bind=SUPER,RETURN,exec,'' + userSettings.term + ''
|
||||
|
||||
bind=SUPER,A,exec,'' + spawnEditor + ''
|
||||
bind=SUPER,A,exec,'' + userSettings.spawnEditor + ''
|
||||
|
||||
bind=SUPER,S,exec,'' + browser + ''
|
||||
bind=SUPER,S,exec,'' + userSettings.browser + ''
|
||||
|
||||
bind=SUPERCTRL,S,exec,container-open # qutebrowser only
|
||||
|
||||
|
|
@ -551,7 +549,7 @@
|
|||
style = ''
|
||||
* {
|
||||
/* `otf-font-awesome` is required to be installed for icons */
|
||||
font-family: FontAwesome, ''+font+'';
|
||||
font-family: FontAwesome, ''+userSettings.font+'';
|
||||
|
||||
font-size: 20px;
|
||||
}
|
||||
|
|
@ -741,7 +739,7 @@
|
|||
programs.fuzzel.enable = true;
|
||||
programs.fuzzel.settings = {
|
||||
main = {
|
||||
font = font + ":size=13";
|
||||
font = userSettings.font + ":size=13";
|
||||
terminal = "${pkgs.alacritty}/bin/alacritty";
|
||||
};
|
||||
colors = {
|
||||
|
|
@ -764,9 +762,9 @@
|
|||
anchor = "bottom-right";
|
||||
stacking-order = "top-down";
|
||||
min-width = 400;
|
||||
title-font = font + ":size=14";
|
||||
summary-font = font + ":size=12";
|
||||
body-font = font + ":size=11";
|
||||
title-font = userSettings.font + ":size=14";
|
||||
summary-font = userSettings.font + ":size=12";
|
||||
body-font = userSettings.font + ":size=11";
|
||||
border-size = 0;
|
||||
};
|
||||
low = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
../../lang/haskell/haskell.nix
|
||||
../../app/terminal/alacritty.nix
|
||||
../../app/terminal/kitty.nix
|
||||
( import ../../app/dmenu-scripts/networkmanager-dmenu.nix {dmenu_command = "rofi -show dmenu"; inherit config lib pkgs;})
|
||||
( import ../../app/dmenu-scripts/networkmanager-dmenu.nix {dmenu_command = "rofi -show dmenu"; inherit pkgs;})
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -779,7 +779,7 @@ while true
|
|||
* Nix Integration
|
||||
In order to have Nix put my xmonad/xmobar configuration in the proper places, I have [[./xmonad.nix][xmonad.nix]], which I source in the =imports= block of my [[../../home.nix][home.nix]].
|
||||
#+BEGIN_SRC nix :tangle xmonad.nix
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
|
|
@ -787,7 +787,7 @@ In order to have Nix put my xmonad/xmobar configuration in the proper places, I
|
|||
../../lang/haskell/haskell.nix
|
||||
../../app/terminal/alacritty.nix
|
||||
../../app/terminal/kitty.nix
|
||||
( import ../../app/dmenu-scripts/networkmanager-dmenu.nix {dmenu_command = "rofi -show dmenu"; inherit config lib pkgs;})
|
||||
( import ../../app/dmenu-scripts/networkmanager-dmenu.nix {dmenu_command = "rofi -show dmenu"; inherit pkgs;})
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue