From 1ccceb3415cb214d19d9698d01667dbee274e924 Mon Sep 17 00:00:00 2001 From: materus Date: Sat, 30 Mar 2024 15:34:52 +0100 Subject: [PATCH] configuration: clean, fix genHomes --- configurations/profile/home/browser.nix | 12 +++--- configurations/profile/os/default.nix | 53 +------------------------ configurations/shared/home/genHomes.nix | 2 +- 3 files changed, 9 insertions(+), 58 deletions(-) diff --git a/configurations/profile/home/browser.nix b/configurations/profile/home/browser.nix index 71b09a6..910731f 100644 --- a/configurations/profile/home/browser.nix +++ b/configurations/profile/home/browser.nix @@ -11,11 +11,13 @@ in }; #TODO: Make some config - config.home.packages = [ - (lib.mkIf cfg.firefox.enable config.materus.profile.packages.firefox) - (lib.mkIf cfg.vivaldi.enable pkgs.vivaldi) - (lib.mkIf cfg.brave.enable pkgs.brave) - ]; + config = { + home.packages = [ + (lib.mkIf cfg.firefox.enable config.materus.profile.packages.firefox) + (lib.mkIf cfg.vivaldi.enable pkgs.vivaldi) + (lib.mkIf cfg.brave.enable pkgs.brave) + ]; + }; } diff --git a/configurations/profile/os/default.nix b/configurations/profile/os/default.nix index 68b7260..23b6c4e 100644 --- a/configurations/profile/os/default.nix +++ b/configurations/profile/os/default.nix @@ -6,57 +6,6 @@ ./games ]; - /* - users.users.nixos-rebuild = { - #isSystemUser = true; - isNormalUser = true; - group = "nixos-rebuild"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPEDY+H8Hc/RSLE064AAh8IojvqxPd8BE5gec2aOfYMh materus@podkos.pl" - ]; - home = "/tmp/nixos-rebuild"; - }; - users.groups.nixos-rebuild = { }; - security.sudo.extraRules = [ - { - users = [ "nixos-rebuild" ]; - commands = let path = "/run/current-system/sw/bin/"; in - [ - { - command = - "${path}nixos-rebuild"; - options = [ "NOPASSWD" ]; - } - { - command = - "${path}nix-store"; - options = [ "NOPASSWD" ]; - } - { - command = - "${path}nix-env"; - options = [ "NOPASSWD" ]; - } - { - command = - "${path}nix-build"; - options = [ "NOPASSWD" ]; - } - { - command = - "${path}nix-instantiate"; - options = [ "NOPASSWD" ]; - } - { - command = - "${path}nix-channel"; - options = [ "NOPASSWD" ]; - } - ]; - - - } - ]; - */ + } \ No newline at end of file diff --git a/configurations/shared/home/genHomes.nix b/configurations/shared/home/genHomes.nix index 7913509..92736f0 100644 --- a/configurations/shared/home/genHomes.nix +++ b/configurations/shared/home/genHomes.nix @@ -1,6 +1,6 @@ { inputs, materusFlake, ... }: let - profiles = import ../profile; + profiles = import (materusFlake.selfPath + "/configurations/profile"); hosts = builtins.attrNames materusFlake.nixosConfigurations; genHomes = username: