merge north master

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2024-07-23 17:45:11 +02:00
10 changed files with 49 additions and 66 deletions

View File

@@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, inputs, ... }:
{ pkgs, pkgs-unstable, lib, inputs, allowed, nvidia, ... }:
{
imports = [
inputs.sops-nix.nixosModules.sops
@@ -17,7 +17,7 @@
./system-modules/gpg.nix
./system-modules/sops.nix
./system-modules/syncthing.nix
# ./system-modules/hsmw.nix # old
./system-modules/hsmw.nix # old
./system-modules/docker.nix
./system-modules/health_reminder.nix
./system-modules/ydotool.nix
@@ -62,7 +62,7 @@
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
environment.systemPackages = with pkgs; ([
git
lazygit # home-manager module is bugged
git-crypt
@@ -80,8 +80,8 @@
blueman
dmidecode
file
] ++ (with pkgs-unstable; [
sendme
# ]) ++ (with pkgs-unstable; [
# # sendme
]);
environment.variables = {
@@ -100,7 +100,6 @@
nix.settings.experimental-features = [ "nix-command" "flakes" ];
programs.bash.shellInit = ''
source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
'';