diff --git a/bootstrap.sh b/bootstrap.sh index df41c29..60290a4 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p bitwarden-cli git gnupg jq nixFlakes +#! nix-shell -i bash -p bitwarden-cli git gnupg jq nix # Command failure is script failure set -e diff --git a/home/git/default.nix b/home/git/default.nix index 9f59d52..c78b25b 100644 --- a/home/git/default.nix +++ b/home/git/default.nix @@ -9,10 +9,10 @@ in enable = mkDisableOption "git configuration"; }; - config.home.packages = with pkgs.gitAndTools; lib.mkIf cfg.enable [ - gitAndTools.git-absorb - gitAndTools.git-revise - gitAndTools.tig + config.home.packages = with pkgs; lib.mkIf cfg.enable [ + git-absorb + git-revise + tig ]; config.programs.git = lib.mkIf cfg.enable { @@ -23,7 +23,7 @@ in userName = "Bruno BELANYI"; # I want the full experience - package = pkgs.gitAndTools.gitFull; + package = pkgs.gitFull; aliases = { git = "!git"; diff --git a/home/wm/i3bar/default.nix b/home/wm/i3bar/default.nix index a330134..8c1e879 100644 --- a/home/wm/i3bar/default.nix +++ b/home/wm/i3bar/default.nix @@ -5,7 +5,7 @@ in { config = lib.mkIf cfg.enable { home.packages = with pkgs; [ - alsaUtils # Used by `sound` block + alsa-utils # Used by `sound` block lm_sensors # Used by `temperature` block font-awesome # Icon font ]; diff --git a/machines/porthos/install.sh b/machines/porthos/install.sh index 44ea787..de87aa7 100644 --- a/machines/porthos/install.sh +++ b/machines/porthos/install.sh @@ -46,7 +46,7 @@ vim /mnt/etc/nixos/hardware-configuration.nix mkdir -p /mnt/home/ambroisie/git/nix/config cd /mnt/home/ambroisie/git/nix/config -nix-env -iA nixos.git nixos.nixFlakes nixos.git-crypt +nix-env -iA nixos.git nixos.nix nixos.git-crypt git clone . # Assuming you set up GPG key correctly git crypt unlock diff --git a/modules/programs/steam/default.nix b/modules/programs/steam/default.nix index dbdc0ce..f52effe 100644 --- a/modules/programs/steam/default.nix +++ b/modules/programs/steam/default.nix @@ -32,7 +32,7 @@ in (pkgs.writeScriptBin "steam-run" '' #!/bin/sh mkdir -p "${cfg.dataDir}" - HOME="${cfg.dataDir}" exec ${pkgs.steam-run-native}/bin/steam-run "$@" + HOME="${cfg.dataDir}" exec ${pkgs.steam-run}/bin/steam-run "$@" '') ]; }; diff --git a/modules/services/drone/runner-exec/default.nix b/modules/services/drone/runner-exec/default.nix index 6c776b4..f0dddb9 100644 --- a/modules/services/drone/runner-exec/default.nix +++ b/modules/services/drone/runner-exec/default.nix @@ -15,14 +15,14 @@ in git gnutar bash - nixUnstable + nix gzip ]; path = with pkgs; [ git gnutar bash - nixUnstable + nix gzip ]; serviceConfig = { diff --git a/modules/system/nix/default.nix b/modules/system/nix/default.nix index 16db0b4..1203450 100644 --- a/modules/system/nix/default.nix +++ b/modules/system/nix/default.nix @@ -15,7 +15,7 @@ in config = lib.mkIf cfg.enable (lib.mkMerge [ { nix = { - package = pkgs.nixFlakes; + package = pkgs.nix; settings = { experimental-features = [ "nix-command" "flakes" ]; diff --git a/profiles/x/default.nix b/profiles/x/default.nix index e9d9cfd..ea77939 100644 --- a/profiles/x/default.nix +++ b/profiles/x/default.nix @@ -13,7 +13,7 @@ in # Nice wallpaper services.xserver.displayManager.lightdm.background = let - wallpapers = "${pkgs.plasma-workspace-wallpapers}/share/wallpapers"; + wallpapers = "${pkgs.plasma5Packages.plasma-workspace-wallpapers}/share/wallpapers"; in "${wallpapers}/summer_1am/contents/images/2560x1600.jpg";