From 1e2e9b4c639ef269d896afffa45c2c36f9b1a88a Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sat, 28 Oct 2023 00:21:38 +0200 Subject: [PATCH] adapted some configs --- machines/desktop.nix | 5 ++++- modules/machine.nix | 4 ++++ modules/packages.nix | 19 ++++++++----------- programs/beets.nix | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/machines/desktop.nix b/machines/desktop.nix index 10b796e..54bc3a8 100644 --- a/machines/desktop.nix +++ b/machines/desktop.nix @@ -9,8 +9,11 @@ username = "thilo"; isGeneric = false; nixPackage = pkgs.nixUnstable; - isGnome = true; + isGnome = false; noiseSuppression.enable = true; isGraphical = true; }; + + services.kdeconnect.enable = true; + services.kdeconnect.indicator = true; } diff --git a/modules/machine.nix b/modules/machine.nix index 2b00eaa..a974d54 100644 --- a/modules/machine.nix +++ b/modules/machine.nix @@ -136,6 +136,10 @@ with lib; ''; }; + nixpkgs.config.permittedInsecurePackages = [ + "electron-24.8.6" + ]; + gtk = { enable = config.machine.isGnome; theme = { diff --git a/modules/packages.nix b/modules/packages.nix index e24e75a..b9261d4 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -1,14 +1,7 @@ { config, pkgs, lib, ... }: with lib; -let - nix-software-center = import (pkgs.fetchFromGitHub { - owner = "vlinkz"; - repo = "nix-software-center"; - rev = "0.1.2"; - sha256 = "xiqF1mP8wFubdsAQ1BmfjzCgOD3YZf7EGWl9i69FTls="; - }) {}; -in { +{ config = { nixpkgs.overlays = [ (final: prev: { @@ -72,7 +65,6 @@ in { act mkcert pulumi - dagger kubectl pulumiPackages.pulumi-language-nodejs ] ++ (if config.machine.isGraphical then [ @@ -88,19 +80,24 @@ in { dbeaver insomnia onlyoffice-bin - nix-software-center spotify (lutris.override { + extraLibraries = pkgs: [ + gnome3.adwaita-icon-theme + ]; extraPkgs = pkgs: [ wineWowPackages.full winetricks + gnome3.adwaita-icon-theme ]; }) + bottles + protontricks + heroic google-chrome chromium vscode discord - obsidian chromium quickemu quickgui diff --git a/programs/beets.nix b/programs/beets.nix index 6bfd422..dcdba9b 100644 --- a/programs/beets.nix +++ b/programs/beets.nix @@ -2,7 +2,7 @@ { programs.beets = { - enable = true; + enable = false; settings = { directory = "~/Music/dj/Library"; library = "~/Music/dj/library.db";