thilobillerbeck/dotfiles
1
0
Fork 0
mirror of https://github.com/thilobillerbeck/dotfiles.git synced 2024-11-22 07:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

adjusted some config for flakes compatibility

Browse source
This commit is contained in:
Thilo Billerbeck 2023-10-28 22:49:07 +02:00
parent 1e2e9b4c63
commit 0ea46ec3a4
3 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
machines/desktop.nix
View file

@ -8,7 +8,6 @@
machine = { machine = {
username = "thilo"; username = "thilo";
isGeneric = false; isGeneric = false;
nixPackage = pkgs.nixUnstable;
isGnome = false; isGnome = false;
noiseSuppression.enable = true; noiseSuppression.enable = true;
isGraphical = true; isGraphical = true;

13
modules/machine.nix
View file

@ -32,11 +32,6 @@ with lib;
default = false; default = false;
description = "Whether the system is generic or not"; 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 { isGraphical = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -56,7 +51,6 @@ with lib;
}; };
config = { config = {
nixpkgs.config.allowUnfree = true;
news.display = "silent"; news.display = "silent";
targets.genericLinux.enable = config.machine.isGeneric; targets.genericLinux.enable = config.machine.isGeneric;
@ -130,16 +124,12 @@ with lib;
programs.home-manager.enable = true; programs.home-manager.enable = true;
nix = { nix = {
package = config.machine.nixPackage; package = mkDefault pkgs.nixUnstable;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';
}; };
nixpkgs.config.permittedInsecurePackages = [
"electron-24.8.6"
];
gtk = { gtk = {
enable = config.machine.isGnome; enable = config.machine.isGnome;
theme = { theme = {
@ -149,3 +139,4 @@ with lib;
}; };
}; };
} }

9
modules/packages.nix
View file

@ -6,7 +6,7 @@ with lib;
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
quickemu = prev.quickemu.overrideAttrs (old: { quickemu = prev.quickemu.overrideAttrs (old: {
patches = (old.patches or []) ++ [ patches = (old.patches or [ ]) ++ [
./../patches/quickemu.patch ./../patches/quickemu.patch
]; ];
}); });
@ -56,8 +56,6 @@ with lib;
(callPackage ./../pkgs/toggl-time-grouper/package.nix { (callPackage ./../pkgs/toggl-time-grouper/package.nix {
inherit lib; inherit lib;
}) })
(import (fetchTarball
"https://github.com/cachix/devenv/archive/v0.6.2.tar.gz")).default
nixpkgs-fmt nixpkgs-fmt
toolbox toolbox
distrobox distrobox
@ -67,6 +65,7 @@ with lib;
pulumi pulumi
kubectl kubectl
pulumiPackages.pulumi-language-nodejs pulumiPackages.pulumi-language-nodejs
ncdu
] ++ (if config.machine.isGraphical then [ ] ++ (if config.machine.isGraphical then [
(pkgs.nerdfonts.override { (pkgs.nerdfonts.override {
fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ]; fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
@ -83,12 +82,12 @@ with lib;
spotify spotify
(lutris.override { (lutris.override {
extraLibraries = pkgs: [ extraLibraries = pkgs: [
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
]; ];
extraPkgs = pkgs: [ extraPkgs = pkgs: [
wineWowPackages.full wineWowPackages.full
winetricks winetricks
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
]; ];
}) })
bottles bottles