noa/nixconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

this work?

Browse source
This commit is contained in:
Noa Aarts 2025-03-29 21:50:25 +01:00
parent 230e50436d
commit c6ce360e08
Signed by: noa
GPG key ID: 1850932741EFF672
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
common/home/default.nix
View file

@ -10,11 +10,12 @@
displays ? [ ], displays ? [ ],
# is there any extra specific config necessary (like nvidia on lambdaOS) # is there any extra specific config necessary (like nvidia on lambdaOS)
extraConfig ? { }, extraConfig ? { },
# inputs of this flake
local_inputs,
}: }:
{ {
config, config,
pkgs, pkgs,
inputs,
lib, lib,
... ...
}: }:
@ -75,8 +76,8 @@ in
] ]
# FLURRY AND TSUNAMI :3 (I made these) # FLURRY AND TSUNAMI :3 (I made these)
++ lib.optionals enableFlut [ ++ lib.optionals enableFlut [
inputs.flurry.packages.${system}.default local_inputs.flurry.packages.${system}.default
inputs.tsunami.packages.${system}.default local_inputs.tsunami.packages.${system}.default
] ]
# and ofc the things that are only logical with graphics # and ofc the things that are only logical with graphics
++ lib.optionals enableGraphical [ ++ lib.optionals enableGraphical [
@ -146,8 +147,9 @@ in
# If I have a monitor I want niri with my config, but niri wants it at that spot # If I have a monitor I want niri with my config, but niri wants it at that spot
configFile = lib.mkIf enableGraphical { configFile = lib.mkIf enableGraphical {
"niri/config.kdl".source = import ../../packages/niri-config/default.nix { "niri/config.kdl".source = import ../../packages/niri-config/default.nix {
inherit pkgs inputs displays; inherit pkgs displays;
self-pkgs = inputs.self.packages.${pkgs.system}; inputs = local_inputs;
self-pkgs = local_inputs.self.packages.${pkgs.system};
}; };
}; };
}; };
@ -296,8 +298,8 @@ in
let let
display-shader = pkgs.substituteAll { display-shader = pkgs.substituteAll {
src = ../../modules/automapaper/display-with_vars.glsl; src = ../../modules/automapaper/display-with_vars.glsl;
background = inputs.nix-colors.lib.conversions.hexToGLSLVec "0a000a"; background = local_inputs.nix-colors.lib.conversions.hexToGLSLVec "0a000a";
foreground = inputs.nix-colors.lib.conversions.hexToGLSLVec "192291"; foreground = local_inputs.nix-colors.lib.conversions.hexToGLSLVec "192291";
}; };
state-shader = ../../modules/automapaper/state-game_of_life.glsl; state-shader = ../../modules/automapaper/state-game_of_life.glsl;
init-shader = ../../modules/automapaper/init.glsl; init-shader = ../../modules/automapaper/init.glsl;
@ -334,7 +336,7 @@ in
Service = { Service = {
ExecStart = "${ ExecStart = "${
inputs.automapaper.packages.${pkgs.system}.automapaper local_inputs.automapaper.packages.${pkgs.system}.automapaper
}/bin/automapaper -C ${display_config}/config.toml"; }/bin/automapaper -C ${display_config}/config.toml";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 15; RestartSec = 15;

2
flake.nix
View file

@ -154,7 +154,6 @@
let let
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = nixpkgs.legacyPackages.x86_64-linux;
in in
(import ./common/home { (import ./common/home {
enableGraphical = true; enableGraphical = true;
enableFlut = false; enableFlut = false;
@ -170,6 +169,7 @@
scale = "1"; scale = "1";
} }
]; ];
local_inputs = inputs;
extraConfig = { extraConfig = {
programs.btop.package = pkgs.btop.overrideAttrs (oldAttrs: { programs.btop.package = pkgs.btop.overrideAttrs (oldAttrs: {
cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [ cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [