lelgenio/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 2 Releases Packages Wiki Activity Actions

treewide: remove variables from pkgs

Browse source
This commit is contained in:
Leonardo Eugênio 2024-06-05 01:18:48 -03:00
parent 36a717072a
commit 2f67b084d2
38 changed files with 60 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

3
overlays/default.nix
View file

@ -6,7 +6,6 @@ rec {
themes themes
new-packages new-packages
patches patches
variables
lib_extended lib_extended
]; ];
@ -80,8 +79,6 @@ rec {
} }
); );
variables = (final: prev: { uservars = import ../user/variables.nix; });
lib_extended = ( lib_extended = (
final: prev: { final: prev: {
lib = prev.lib // rec { lib = prev.lib // rec {

10
scripts/wdmenu.nix
View file

@ -1,12 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
let
inherit (pkgs.uservars) dmenu;
available_menus = {
bmenu = "bmenu";
rofi = "rofi -dmenu -sort";
};
menu_cmd = available_menus.${dmenu};
in
pkgs.writeShellScriptBin "wdmenu" '' pkgs.writeShellScriptBin "wdmenu" ''
exec ${menu_cmd} "$@" exec bmenu "$@"
'' ''

2
scripts/wfile-picker.nix
View file

@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
let let
inherit (pkgs.uservars) dmenu; inherit (config.my) dmenu;
available_menus = { available_menus = {
bmenu = "bmenu run"; bmenu = "bmenu run";
rofi = "rofi -show drun -sort"; rofi = "rofi -show drun -sort";

10
scripts/wlauncher.nix
View file

@ -1,12 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
let
inherit (pkgs.uservars) dmenu;
available_menus = {
bmenu = "bmenu run";
rofi = "rofi -show drun -sort";
};
menu_cmd = available_menus.${dmenu};
in
pkgs.writeShellScriptBin "wlauncher" '' pkgs.writeShellScriptBin "wlauncher" ''
exec ${menu_cmd} "$@" exec bmenu run "$@"
'' ''

6
settings/default.nix Normal file
View file

@ -0,0 +1,6 @@
{ lib, ... }:
{
options = {
my = lib.mkOption { };
};
}

2
system/boot.nix
View file

@ -43,7 +43,7 @@
}; };
plymouth = { plymouth = {
enable = true; enable = true;
theme = lib.mkIf (pkgs.uservars.desktop == "sway") "red_loader"; theme = lib.mkIf (config.my.desktop == "sway") "red_loader";
themePackages = with pkgs; [ themePackages = with pkgs; [
(adi1090x-plymouth-themes.override { selected_themes = [ "red_loader" ]; }) (adi1090x-plymouth-themes.override { selected_themes = [ "red_loader" ]; })
]; ];

3
system/configuration.nix
View file

@ -22,8 +22,11 @@
./users.nix ./users.nix
./containers.nix ./containers.nix
./network.nix ./network.nix
../settings
]; ];
my = import ../user/variables.nix;
zramSwap.enable = true; zramSwap.enable = true;
programs.adb.enable = true; programs.adb.enable = true;

2
system/greetd.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
accent accent
font font

2
user/alacritty.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
theme theme
accent accent

2
user/bmenu.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
theme theme
accent accent

2
user/firefox.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) desktop browser; inherit (config.my) desktop browser;
bugfixedFirefox = pkgs.firefox-esr-unwrapped // { bugfixedFirefox = pkgs.firefox-esr-unwrapped // {
requireSigning = false; requireSigning = false;
allowAddonSideload = true; allowAddonSideload = true;

10
user/fish/default.nix
View file

@ -5,15 +5,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my) accent editor desktop;
key
theme
color
accent
font
editor
desktop
;
in in
{ {
config = { config = {

2
user/fzf.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
theme theme
accent accent

2
user/git.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) username mail; inherit (config.my) username mail;
in in
{ {
config = { config = {

3
user/gnome.nix
View file

@ -2,9 +2,10 @@
pkgs, pkgs,
lib, lib,
inputs, inputs,
config,
... ...
}: }:
lib.mkIf (pkgs.uservars.desktop == "gnome") { lib.mkIf (config.my.desktop == "gnome") {
home.pointerCursor = { home.pointerCursor = {
name = "Adwaita"; name = "Adwaita";

9
user/helix.nix
View file

@ -1,6 +1,11 @@
{ pkgs, lib, ... }: {
pkgs,
lib,
config,
...
}:
let let
inherit (pkgs.uservars) accent theme editor; inherit (config.my) accent theme editor;
inherit (theme) color; inherit (theme) color;
in in
{ {

3
user/home.nix
View file

@ -44,8 +44,11 @@
./xdg-dirs.nix ./xdg-dirs.nix
inputs.hyprland.homeManagerModules.default inputs.hyprland.homeManagerModules.default
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.hmModules.nix-index
../settings
]; ];
my = import ./variables.nix;
# Home Manager needs a bit of information about you and the # Home Manager needs a bit of information about you and the
# paths it should manage. # paths it should manage.
home.username = "lelgenio"; home.username = "lelgenio";

2
user/hyprland.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
{ {
config = lib.mkIf (pkgs.uservars.desktop == "hyprland") { config = lib.mkIf (config.my.desktop == "hyprland") {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = false; enable = false;
extraConfig = '' extraConfig = ''

2
user/kakoune/default.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
dmenu dmenu
editor editor

2
user/man.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
theme theme
color color

2
user/mangohud.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
theme theme
color color

2
user/mimeapps.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) browser; inherit (config.my) browser;
cfg = config.xdg.defaultApplications; cfg = config.xdg.defaultApplications;
in in
{ {

2
user/mpd.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
{ {
config = lib.mkIf (pkgs.uservars.desktop != "gnome") { config = lib.mkIf (config.my.desktop != "gnome") {
services.mpd = { services.mpd = {
enable = true; enable = true;
musicDirectory = config.home.homeDirectory + "/Música"; musicDirectory = config.home.homeDirectory + "/Música";

2
user/pqiv.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
theme theme
color color

2
user/rofi.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
theme theme
accent accent

2
user/ssh.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) username mail; inherit (config.my) username mail;
in in
{ {
config = { config = {

4
user/sway/default.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
accent accent
font font
@ -24,7 +24,7 @@ in
./swaylock.nix ./swaylock.nix
./theme.nix ./theme.nix
]; ];
config = lib.mkIf (pkgs.uservars.desktop == "sway") { config = lib.mkIf (config.my.desktop == "sway") {
services.mako.enable = true; services.mako.enable = true;
services.swayidle.enable = true; services.swayidle.enable = true;
services.kanshi.enable = true; services.kanshi.enable = true;

2
user/sway/kanshi.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
accent accent
font font

2
user/sway/mako.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
accent accent
font font

2
user/sway/sway-assigns.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
in in
# inherit (pkgs.uservars) key accent font theme; # inherit (config.my) key accent font theme;
# inherit (theme) color; # inherit (theme) color;
# inherit (pkgs) lib; # inherit (pkgs) lib;
# mod = "Mod4"; # mod = "Mod4";

2
user/sway/sway-binds.nix
View file

@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
accent accent
font font

2
user/sway/sway-modes.nix
View file

@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
accent accent
font font

2
user/sway/swayidle.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
accent accent
font font

2
user/sway/swaylock.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
accent accent
font font

2
user/sway/theme.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) theme font desktop; inherit (config.my) theme font desktop;
inherit (theme) inherit (theme)
color color
gtk_theme gtk_theme

9
user/vdir.nix
View file

@ -1,6 +1,11 @@
{ pkgs, lib, ... }: {
pkgs,
lib,
config,
...
}:
let let
inherit (pkgs.uservars) nextcloud; inherit (config.my) nextcloud;
pass_cmd = ( pass_cmd = (
pkgs.writeShellScript "get_pass" '' pkgs.writeShellScript "get_pass" ''
pass "${nextcloud.pass}" | head -n1 pass "${nextcloud.pass}" | head -n1

2
user/waybar/default.nix
View file

@ -7,7 +7,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
theme theme
accent accent

2
user/zathura.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
inherit (pkgs.uservars) inherit (config.my)
key key
accent accent
font font