feat: update configuration files to streamline imports and enhance package management

This commit is contained in:
2025-06-08 09:36:44 +02:00
parent 30e75d0ad5
commit 0b8619bf64
3 changed files with 26 additions and 39 deletions

View File

@@ -12,17 +12,15 @@ in {
security.pki.certificates = [ "/home/dominik/.local/share/mkcert/rootCA.pem" ]; security.pki.certificates = [ "/home/dominik/.local/share/mkcert/rootCA.pem" ];
imports = imports =
[ # Include the results of the hardware scan. [
"${impermanence}/nixos.nix" "${impermanence}/nixos.nix"
# (import <nix-snapd>).nixosModules.default
./utils/bento.nix ./utils/bento.nix
./utils/modules/sops.nix ./utils/modules/sops.nix
./utils/modules/nur.nix ./utils/modules/nur.nix
./modules/appimage.nix ./modules/appimage.nix
./modules/desktop ./modules/desktop
./modules/development/default.nix ./modules/development
# ./modules/printer.nix
# ./modules/cyberghost.nix # ./modules/cyberghost.nix
./utils/modules/autoupgrade.nix ./utils/modules/autoupgrade.nix
./modules/puppeteer.nix ./modules/puppeteer.nix
@@ -30,19 +28,14 @@ in {
./modules/ollama.nix ./modules/ollama.nix
./modules/qdrant.nix ./modules/qdrant.nix
# ./modules/development
./cachix.nix ./cachix.nix
./users ./users
# coding
# ./modules/steam.nix # ./modules/steam.nix
./modules/fingerprint.nix ./modules/fingerprint.nix
./modules/set-nix-channel.nix # Automatically manage nix-channel from /var/bento/channel ./modules/set-nix-channel.nix
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
# services.snap.enable = true; # services.snap.enable = true;
@@ -173,7 +166,6 @@ in {
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
networking.extraHosts = '' networking.extraHosts = ''
77.119.230.30 vpn.cloonar.com 77.119.230.30 vpn.cloonar.com
10.25.0.25 archive.zeichnemit.at
''; '';
# Set your time zone. # Set your time zone.
@@ -188,20 +180,7 @@ in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
alsa-utils alsa-utils
bento sshpass
docker-compose
drone-cli
git-filter-repo
nix-prefetch-git
openaudible
openmanus
unzip
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
wget
wireguard-tools
wineWowPackages.stable
wineWowPackages.fonts
winetricks
pinentry-curses pinentry-curses
# ykfde # ykfde
]; ];
@@ -283,7 +262,7 @@ in {
# autoOptimiseStore = true; # autoOptimiseStore = true;
gc = { gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "daily";
options = "--delete-older-than 30d"; options = "--delete-older-than 30d";
}; };
# Free up to 1GiB whenever there is less than 100MiB left. # Free up to 1GiB whenever there is less than 100MiB left.

View File

@@ -1,8 +1,5 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
apache-ds-pin = import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/9aec01027f7ea2bca07bb51d5ed83e78088871c1.tar.gz";
}) {};
in { in {
imports = [ imports = [
../sway/sway.nix ../sway/sway.nix
@@ -16,7 +13,7 @@ in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
alacritty alacritty
apache-ds-pin.apache-directory-studio apache-directory-studio
cryptomator cryptomator
fontforge fontforge
freecad freecad

View File

@@ -13,27 +13,38 @@ in {
./nvim/default.nix ./nvim/default.nix
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
ddev
gcc
git
glib
go
nodejs_22
rbw
bento bento
ddev
docker-compose docker-compose
drone-cli drone-cli
gcc
git
git-filter-repo git-filter-repo
nix-prefetch-git glib
go
jq jq
mkcert mkcert
mqttui mqttui
nix-prefetch-git
nodejs_22
rbw
sops
unzip
vim vim
wget wget
wireguard-tools wireguard-tools
unzip
wol wol
]; ];
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
virtualisation.libvirtd = {
enable = true; # Turn on the libvirtd daemon
qemu = {
ovmf = {
enable = true; # Enable OVMF firmware support
};
# swtpm.enable = true; # enable if you need TPM emulation, etc.
};
};
} }