thilobillerbeck/dotfiles
1
0
Fork 0
mirror of https://github.com/thilobillerbeck/dotfiles.git synced 2024-09-16 22:20:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

modularize nix version choice

Browse source
This commit is contained in:
Thilo Billerbeck 2024-06-05 01:00:27 +02:00
parent df6cecdc98
commit 1e4fd788ed
5 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configs/thilo-laptop/home.nix
View file

@ -21,6 +21,12 @@
home.sessionVariables = { home.sessionVariables = {
LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
}; };
nix = {
package = pkgs.nixVersions.latest;
};
home.packages = with pkgs; [ pkgs.nixVersions.latest ];
}; };
}; };
} }

17
configs/thilo-pc/home.nix
View file

@ -1,4 +1,9 @@
{ inputs, pkgs, ... }: {
inputs,
pkgs,
config,
...
}:
{ {
home-manager = { home-manager = {
@ -16,6 +21,7 @@
isGnome = false; isGnome = false;
noiseSuppression.enable = true; noiseSuppression.enable = true;
isGraphical = true; isGraphical = true;
nixVersion = pkgs.lix;
}; };
/* /*
@ -30,7 +36,14 @@
LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
}; };
home.packages = with pkgs; [ libsForQt5.discover ]; nix = {
package = pkgs.lix;
};
home.packages = with pkgs; [
pkgs.lix
libsForQt5.discover
];
}; };
}; };
} }

6
configs/wsl/home.nix
View file

@ -12,4 +12,10 @@
}; };
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix = {
package = pkgs.nixVersions.latest;
};
home.packages = with pkgs; [ pkgs.nixVersions.latest ];
} }

4
home-manager/modules/machine.nix
View file

@ -60,6 +60,10 @@ with lib;
default = false; default = false;
description = "Whether to enable noise suppression or not"; description = "Whether to enable noise suppression or not";
}; };
nixVersion = mkOption {
type = types.package;
default = pkgs.nixVersions.latest;
};
}; };
nixGLPrefix = lib.mkOption { nixGLPrefix = lib.mkOption {
type = lib.types.str; type = lib.types.str;

3
home-manager/modules/packages.nix
View file

@ -24,7 +24,6 @@ in
home.packages = home.packages =
with pkgs; with pkgs;
[ [
pkgs.nixVersions.latest # because remotely invoked updates are fun ;)
up up
htop htop
rustc rustc
@ -52,7 +51,7 @@ in
(pkgs.writeShellScriptBin "yt-dlp-audio" (builtins.readFile ./../scripts/yt-dlp-audio.sh)) (pkgs.writeShellScriptBin "yt-dlp-audio" (builtins.readFile ./../scripts/yt-dlp-audio.sh))
(pkgs.writeShellScriptBin "nix-shell-init" (builtins.readFile ./../scripts/nix-shell-init.sh)) (pkgs.writeShellScriptBin "nix-shell-init" (builtins.readFile ./../scripts/nix-shell-init.sh))
(pkgs.writeShellScriptBin "http-server" '' (pkgs.writeShellScriptBin "http-server" ''
${pkgs.caddy}/bin/caddy file-server --listen :2345 ${pkgs.caddy}/bin/caddy file-server --listen :2345z
'') '')
(pkgs.writeShellScriptBin "nix-build-default" '' (pkgs.writeShellScriptBin "nix-build-default" ''
nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }' nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'