modularize config

This commit is contained in:
DashieTM 2024-07-10 17:03:31 +02:00
parent 09c4625fbb
commit 7a4e46e04f
33 changed files with 230 additions and 168 deletions

View file

@ -91,8 +91,7 @@
#typst
typst
typst-lsp
typstfmt
tinymist
ltex-ls
#java

View file

@ -1,10 +1,12 @@
{ pkgs
, inputs
, lib
, username
, config
, ...
}:
let callPackage = lib.callPackageWith (pkgs);
let
callPackage = lib.callPackageWith (pkgs);
username = config.conf.username;
in
{
manual = {
@ -53,9 +55,6 @@ in
flake-checker
ffmpeg
system-config-printer
(callPackage
../override/streamdeck.nix
{ })
(callPackage
../override/cambalache.nix
{ })

View file

@ -1,4 +1,4 @@
{ inputs, pkgs, mod, username, ... }:
{ inputs, pkgs, mod, config, ... }:
let
base_imports = [
inputs.anyrun.homeManagerModules.default
@ -14,6 +14,7 @@ let
inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.sops-nix.homeManagerModules.sops
];
username = config.conf.username;
in
{
xdg.portal.config.common.default = "*";

View file

@ -1,12 +1,8 @@
{ pkgs
, lib
, config
, ...
}: {
imports = [
# ./anyrun.nix
# ./config.nix
];
}: lib.mkIf config.conf.gaming.enable {
environment.systemPackages = with pkgs; [
gamemode
steam
@ -25,7 +21,7 @@
};
gpu = {
apply_gpu_optimisations = "accept-responsibility";
gpu_device = config.programs.gamemode.device;
gpu_device = config.conf.gaming.device;
amd_performance_level = "high";
};
custom = {

View file

@ -1,14 +1,11 @@
{ pkgs
, inputs
, username
, config
{ config
, ...
}:
{
wayland.windowManager.hyprland.enable = true;
wayland.windowManager.hyprland.settings = {
"$mod" = "SUPER";
"source" = "/home/${username}/.config/reset/keyboard.conf";
"source" = "/home/${config.conf.username}/.config/reset/keyboard.conf";
bindm = [
"$mod, mouse:272, movewindow"

View file

@ -15,7 +15,7 @@
input-field = [
{
monitor = "${config.programs.ironbar.monitor}";
monitor = "${config.conf.monitor}";
placeholder_text = "password or something";
}
@ -23,7 +23,7 @@
label = [
{
monitor = "${config.programs.ironbar.monitor}";
monitor = "${config.conf.monitor}";
text = "$TIME";
font_size = 50;
position = "0, 200";

View file

@ -1,4 +1,8 @@
{ config, username, ... }: {
{ config, ... }:
let
username = config.conf.username;
in
{
programs.ironbar =
{
@ -141,8 +145,8 @@
#"another_feature"
];
config = {
monitors."${config.programs.ironbar.monitor}" = {
end = config.programs.ironbar.battery ++ [
monitors."${config.conf.monitor}" = {
end = config.conf.battery ++ [
{
type = "sys_info";
format = [

View file

@ -1,4 +1,4 @@
{ pkgs, username, ... }: {
{ pkgs, config, ... }: {
programs.firefox = {
enable = true;
@ -13,7 +13,7 @@
DisplayBookmarksToolbar = "never";
DisplayMenuBar = "default-off";
};
profiles.${username} = {
profiles.${config.conf.username} = {
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
ublock-origin
darkreader

View file

@ -1,4 +1,4 @@
{ username, ... }: {
{ config, ... }: {
xdg.configFile."fish/config.fish" = {
text =
''
@ -15,7 +15,7 @@
set EDITOR "neovide --no-fork"
alias rebuild='sudo nixos-rebuild switch --flake /home/${username}/gits/dotFiles/nix/.'
alias rebuild='sudo nixos-rebuild switch --flake /home/${config.conf.username}/gits/dotFiles/nix/.'
abbr --add ls 'lsd'
abbr --add :q 'exit'
abbr --add gh 'git push origin'

View file

@ -114,9 +114,9 @@ return {
"Sdk:IncludePrereleases=true",
},
},
typst_lsp = {
tinymist = {
settings = {
experimentalFormatterMode = "on",
formatterMode = "typstyle",
exportPdf = "onSave",
},
mason = false,
@ -225,7 +225,6 @@ return {
},
},
formatters_by_ft = {
typst = { "typstfmt" },
nix = { "nixpkgs-fmt" },
lua = { "stylua" },
sh = { "shfmt" },

View file

@ -1,8 +1,8 @@
{ username, ... }: {
{ config, ... }: {
xdg.configFile."oxinoti/style.css" = {
text = /*css*/
''
@import url("/home/${username}/.config/gtk-3.0/gtk.css");
@import url("/home/${config.conf.username}/.config/gtk-3.0/gtk.css");
#MainWindow {
background-color: transparent;

View file

@ -1,5 +1,6 @@
{ username, ... }:
{ config, ... }:
let
username = config.conf.username;
color = ''
[ColorScheme]
active_colors=#ffc0caf5, #ff1a1b26, #ff373949, #ff2b2c3b, #ff1a1b26, #ff2b2c3b, #ffc0caf5, #ffc0caf5, #ffc0caf5, #ff1a1b26, #ff1a1b26, #19000000, #ff2b2c3b, #ffc0caf5, #ff3584e4, #ff1b6acb, #ff1a1b26, #ff242530, #ff1a1b26, #ffc0caf5, #ffc0caf5