From 76b06e0530414bb7e698afe41e01c0a045119c2b Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 25 Mar 2025 15:54:16 +0100
Subject: [PATCH] several small adjustments
---
configs/thilo-pc/home.nix | 7 ++-----
configs/thilo-pc/nixos.nix | 22 +++++++++++++++++-----
flake.nix | 1 -
home-manager/modules/packages.nix | 6 ------
home-manager/programs/syncthing.nix | 2 +-
5 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix
index e1c0a12..f9dd94f 100644
--- a/configs/thilo-pc/home.nix
+++ b/configs/thilo-pc/home.nix
@@ -13,10 +13,7 @@
extraSpecialArgs = {
inherit inputs;
};
-
- sharedModules = [
- inputs.distrobox4nix.homeManagerModule
- ];
+ backupFileExtension = ".bak";
users.thilo = {
imports = [ ./../../home-manager/modules/machine.nix ];
@@ -49,7 +46,7 @@
];
programs.distrobox = {
- enable = true;
+ enable = lib.mkForce true;
containers = {
arch = {
image = "arch-toolbox";
diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix
index eb76819..532e028 100644
--- a/configs/thilo-pc/nixos.nix
+++ b/configs/thilo-pc/nixos.nix
@@ -1,7 +1,12 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
-{ pkgs, inputs, ... }:
+{
+ pkgs,
+ inputs,
+ lib,
+ ...
+}:
{
imports = [
@@ -161,10 +166,16 @@
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
- jovian = {
- steam = {
- enable = true;
- user = "thilo";
+ specialisation = {
+ game-console.configuration = {
+ services.displayManager.sddm.enable = lib.mkForce false;
+ jovian = {
+ steam = {
+ autoStart = true;
+ enable = true;
+ user = "thilo";
+ };
+ };
};
};
@@ -176,6 +187,7 @@
environment.systemPackages = with pkgs; [
kdePackages.skanpage
+ qt5.qtwayland
];
services.resolved = {
diff --git a/flake.nix b/flake.nix
index 88b5367..efe3419 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,6 @@
};
nix-alien.url = "github:thiagokokada/nix-alien";
jovian-nixos.url = "github:Jovian-Experiments/Jovian-NixOS/development";
- distrobox4nix.url = "github:aguirre-matteo/distrobox4nix";
};
nixConfig = {
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 9117039..7169253 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -66,9 +66,7 @@ in
ddev
act
mkcert
- # pulumi
kubectl
- pulumiPackages.pulumi-language-nodejs
ncdu
devenv
inputs.nixpkgs-update.packages.x86_64-linux.nixpkgs-update
@@ -78,7 +76,6 @@ in
nixd
unrar
# inputs.w17.packages.x86_64-linux.default
- aichat
nix-output-monitor
nodePackages.pnpm
npm-check-updates
@@ -94,8 +91,6 @@ in
php
(lib.hiPrio phpPackages.composer)
-
- nixfmt-rfc-style
]
++ (
if (!config.machine.isGeneric) then
@@ -155,7 +150,6 @@ in
inkscape
musescore
obsidian
- syncthingtray
reaper
yabridge
torzu
diff --git a/home-manager/programs/syncthing.nix b/home-manager/programs/syncthing.nix
index 2ab81c9..1bdb3d1 100644
--- a/home-manager/programs/syncthing.nix
+++ b/home-manager/programs/syncthing.nix
@@ -1,5 +1,5 @@
{
services.syncthing = {
- enable = true;
+ enable = false;
};
}