Attempting to fix infinite recursion

Main
Johannes Hendrik Gerard van der Weide 2024-02-21 14:11:02 +01:00
parent 4bd33ebe3d
commit b510522ae5
9 changed files with 13 additions and 11 deletions

View File

@ -36,12 +36,14 @@
in { in {
# Laptop NixOS configuration # Laptop NixOS configuration
nixosConfigurations = { nixosConfigurations = {
default = lib.nixosSystem { puter = lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = [
nixos-hardware.nixosModules.framework-11th-gen-intel
./system ./system
./programs ./programs
./hertog/user.nix ./hertog/user.nix
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;

View File

@ -1,4 +1,4 @@
{ pkgs, inputs }: { pkgs, inputs, ... }:
{ {
programs.home-manage.enable = true; programs.home-manage.enable = true;

View File

@ -1,6 +1,6 @@
{ config, lib }: { pkgs, config }:
let let
config = import ../../theming/colorScheme.nix; config.colorScheme = import ../../theming/colorScheme.nix;
modifierKey = config.wayland.windowManager.sway.config.modifier; modifierKey = config.wayland.windowManager.sway.config.modifier;
in in
{ {
@ -18,7 +18,7 @@ in
{command = "swaybg -i /etc/nixos/theming/background.svg";} {command = "swaybg -i /etc/nixos/theming/background.svg";}
{command = "keepassxc /home/hertog/Documents/Belangrijk/Wachtwoorden.kdbx";} {command = "keepassxc /home/hertog/Documents/Belangrijk/Wachtwoorden.kdbx";}
]; ];
keybindings = lib.mkOptionDefault { keybindings = pkgs.lib.mkOptionDefault {
"XF86MonBrightnessUp" = "exec light -A 5"; "XF86MonBrightnessUp" = "exec light -A 5";
"XF86MonBrightnessDown" = "exec light -U 5"; "XF86MonBrightnessDown" = "exec light -U 5";
"XF86AudioMute" = "exec pamixer -t"; "XF86AudioMute" = "exec pamixer -t";

View File

@ -1,6 +1,6 @@
{ config }: { config }:
let let
config = import ../../theming/colorScheme.nix; config.colorScheme = import ../../theming/colorScheme.nix;
in in
{ {
programs.waybar = { programs.waybar = {

View File

@ -1,6 +1,6 @@
{ config }: { config }:
let let
config = import ../../theming/colorScheme.nix; config.colorScheme = import ../../theming/colorScheme.nix;
in in
{ {
programs.wofi = { programs.wofi = {

View File

@ -10,7 +10,7 @@
shellAliases = { shellAliases = {
ll = "ls -l"; ll = "ls -l";
please = "sudo"; please = "sudo";
update = "sudo nixos-rebuild switch --flake /etc/nixos/#laptop"; update = "sudo nixos-rebuild switch --flake /etc/nixos/#puter";
vim = "nix run git+https://git.saragerretsen.nl/Hertog/HertogVim"; vim = "nix run git+https://git.saragerretsen.nl/Hertog/HertogVim";
vimUpdate = "nix run --refresh git+https://git.saragerretsen.nl/Hertog/HertogVim"; vimUpdate = "nix run --refresh git+https://git.saragerretsen.nl/Hertog/HertogVim";
sudovim = "sudo nix run git+https://git.saragerretsen.nl/Hertog/HertogVim"; sudovim = "sudo nix run git+https://git.saragerretsen.nl/Hertog/HertogVim";

View File

@ -1,4 +1,4 @@
{ pkgs, nix-flatpak }: { pkgs, nix-flatpak, ... }:
let let
mini-text = pkgs.callPackage ../../Programs/MiniText { }; mini-text = pkgs.callPackage ../../Programs/MiniText { };
hyperplane = pkgs.callPackage ../../Programs/Hyperplane { }; hyperplane = pkgs.callPackage ../../Programs/Hyperplane { };

View File

@ -1,4 +1,4 @@
{ pkgs }: { pkgs, ... }:
{ {
security = { security = {

View File

@ -1,4 +1,4 @@
{ pkgs }: { pkgs, ... }:
{ {
services.xserver = { services.xserver = {