Compare commits

...

3 commits

Author SHA1 Message Date
733f09578b Merge branch 'main' of https://github.com/thilobillerbeck/dotfiles 2024-06-05 01:01:45 +02:00
1e4fd788ed modularize nix version choice 2024-06-05 01:00:27 +02:00
df6cecdc98 flake.lock: Update
Flake lock file updates:

• Updated input 'dagger':
    'github:dagger/nix/9e26b2f73eebf9e3b9fbc1a31c378ccb2daf84cd?narHash=sha256-n1UnQ7RbJwDAUX1fq4%2BhUNVVIWDlZKvAsUp/muSkV3g%3D' (2024-05-28)
  → 'github:dagger/nix/b806c06b83310040821771278fc5bcd745c8934a?narHash=sha256-6hJbR3t2qZi/ozZpfTB9eZRuE5BxtNOR9pTxEm7bYbY%3D' (2024-05-30)
• Updated input 'home-manager':
    'github:nix-community/home-manager/373ead20606efa9181cd15ba19a5deac7ead1492?narHash=sha256-Zl6e/sEVDh07K47XxDGPsXTYT4nI6llUDbQ4xMIwp7k%3D' (2024-05-28)
  → 'github:nix-community/home-manager/2cacdd6a27477f1fa46b7026dd806de30f164d3b?narHash=sha256-Xr/oYk3vmyv2a/nY8o/Wd0MdLsI5vaC38Kris7CWunM%3D' (2024-06-04)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac?narHash=sha256-Idcye44UW%2BEgjbjCoklf2IDF%2BXrehV6CVYvxR1omst4%3D' (2024-05-27)
  → 'github:nix-community/nix-index-database/972a52bee3991ae1f1899e6452e0d7c01ee566d9?narHash=sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0%3D' (2024-06-02)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/bfb7a882678e518398ce9a31a881538679f6f092?narHash=sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8%3D' (2024-05-24)
  → 'github:NixOS/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8?narHash=sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0%3D' (2024-05-31)
2024-06-04 12:56:44 +02:00
5 changed files with 32 additions and 4 deletions

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 ];
}; };
}; };
} }

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
];
}; };
}; };
} }

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 ];
} }

View file

@ -61,6 +61,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;

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 { }'