mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2024-11-25 01:08:50 +01:00
adjusted some config for flakes compatibility
This commit is contained in:
parent
1e2e9b4c63
commit
0ea46ec3a4
3 changed files with 6 additions and 17 deletions
|
@ -8,7 +8,6 @@
|
|||
machine = {
|
||||
username = "thilo";
|
||||
isGeneric = false;
|
||||
nixPackage = pkgs.nixUnstable;
|
||||
isGnome = false;
|
||||
noiseSuppression.enable = true;
|
||||
isGraphical = true;
|
||||
|
|
|
@ -32,11 +32,6 @@ with lib;
|
|||
default = false;
|
||||
description = "Whether the system is generic or not";
|
||||
};
|
||||
nixPackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.nixUnstable;
|
||||
description = "The version of nix to use";
|
||||
};
|
||||
isGraphical = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
|
@ -56,7 +51,6 @@ with lib;
|
|||
};
|
||||
|
||||
config = {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
news.display = "silent";
|
||||
targets.genericLinux.enable = config.machine.isGeneric;
|
||||
|
||||
|
@ -130,16 +124,12 @@ with lib;
|
|||
programs.home-manager.enable = true;
|
||||
|
||||
nix = {
|
||||
package = config.machine.nixPackage;
|
||||
package = mkDefault pkgs.nixUnstable;
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
};
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"electron-24.8.6"
|
||||
];
|
||||
|
||||
gtk = {
|
||||
enable = config.machine.isGnome;
|
||||
theme = {
|
||||
|
@ -149,3 +139,4 @@ with lib;
|
|||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ with lib;
|
|||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
quickemu = prev.quickemu.overrideAttrs (old: {
|
||||
patches = (old.patches or []) ++ [
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
./../patches/quickemu.patch
|
||||
];
|
||||
});
|
||||
|
@ -56,8 +56,6 @@ with lib;
|
|||
(callPackage ./../pkgs/toggl-time-grouper/package.nix {
|
||||
inherit lib;
|
||||
})
|
||||
(import (fetchTarball
|
||||
"https://github.com/cachix/devenv/archive/v0.6.2.tar.gz")).default
|
||||
nixpkgs-fmt
|
||||
toolbox
|
||||
distrobox
|
||||
|
@ -67,6 +65,7 @@ with lib;
|
|||
pulumi
|
||||
kubectl
|
||||
pulumiPackages.pulumi-language-nodejs
|
||||
ncdu
|
||||
] ++ (if config.machine.isGraphical then [
|
||||
(pkgs.nerdfonts.override {
|
||||
fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
|
||||
|
@ -83,12 +82,12 @@ with lib;
|
|||
spotify
|
||||
(lutris.override {
|
||||
extraLibraries = pkgs: [
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
extraPkgs = pkgs: [
|
||||
wineWowPackages.full
|
||||
winetricks
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
})
|
||||
bottles
|
||||
|
|
Loading…
Reference in a new issue