steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pr/nixpath-device-version' into 'master'

Browse source 
Pr/nixpath device version

See merge request steveeJ/infra!56
This commit is contained in:
steveej 2020-10-16 20:34:01 +00:00
commit 6d809d40fc
12 changed files with 79 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Justfile
View file

@ -15,7 +15,7 @@ update-default-versions:
esh -o ${outfile} ${template}
_get_nix_path versionsPath:
echo $(set -x; nix-build --no-link --show-trace {{invocation_directory()}}/nix/default.nix -A channelSources --argstr versionsPath {{versionsPath}} --argstr rebuildarg "dummy")
echo $(set -x; nix-build --no-link --show-trace {{invocation_directory()}}/nix/default.nix -A channelSources --argstr versionsPath {{versionsPath}})
_device recipe dir +moreargs="":
#!/usr/bin/env bash

17
nix/default.nix
View file

@ -1,8 +1,6 @@
{ versionsPath }:
{
channelSources =
let
let
channelVersions = (import versionsPath);
mkChannelSource = channel:
let
@ -17,7 +15,7 @@
ref = (builtins.getAttr channel channelVersions)."ref";
rev = (builtins.getAttr channel channelVersions)."rev";
};
nix_path = builtins.foldl' (sum: elem: sum +":" + builtins.concatStringsSep "=" elem) "" [
nixPath = builtins.foldl' (sum: elem: sum +":" + builtins.concatStringsSep "=" elem) "" [
[ "nixpkgs" (mkChannelSource "channelsNixosStable") ]
[ "nixos" (mkChannelSource "channelsNixosStable" + "/nixos") ]
[ "channels-nixos-stable" (mkChannelSource "channelsNixosStable") ]
@ -25,7 +23,12 @@
[ "nixpkgs-master" (mkChannelSource "nixpkgsMaster") ]
[ "home-manager-module" (mkChannelSource "homeManagerModule") ]
];
in (import (mkChannelSource "channelsNixosStable") {}).writeText "channels.rc" ''
export NIX_PATH=${nix_path}
pkgs = import (mkChannelSource "channelsNixosStable") {};
in
{
inherit nixPath;
channelSources = pkgs.writeText "channels.rc" ''
export NIX_PATH=${nixPath}
'';
}
}

12
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -1,3 +1,9 @@
{ pkgs }:
let
zshCurried = import ../programs/zsh.nix { inherit pkgs; };
in
{ pkgs
, config
, ... }:
@ -20,7 +26,7 @@ in {
../programs/libreoffice.nix
../programs/neovim.nix
../programs/pass.nix
../programs/zsh.nix
zshCurried
];
nixpkgs.config = {
@ -65,10 +71,6 @@ in {
PATH=pkgs.lib.concatStringsSep ":" [
"$HOME/.local/bin"
"$HOME/.cargo/bin"
"$HOME/.gem/ruby/2.3.0/bin"
"$HOME/.npm-packages/bin"
"$GOPATH/bin"
"$PATH"
];
};

8
nix/home-manager/configuration/graphical-removable.nix
View file

@ -1,3 +1,9 @@
{ pkgs }:
let
zshCurried = import ../programs/zsh.nix { inherit pkgs; };
in
{ pkgs
, config,
... }:
@ -17,7 +23,7 @@ in {
../programs/libreoffice.nix
../programs/neovim.nix
../programs/pass.nix
../programs/zsh.nix
zshCurried
];
nixpkgs.config = {

8
nix/home-manager/configuration/text-minimal.nix
View file

@ -1,3 +1,9 @@
{ pkgs }:
let
zshCurried = import ../programs/zsh.nix { inherit pkgs; };
in
{ pkgs
, config
, ... }:
@ -9,7 +15,7 @@ in {
../profiles/common.nix
../profiles/nix-channels.nix
../programs/neovim.nix
../programs/zsh.nix
zshCurried
];
nixpkgs.config = {

13
nix/home-manager/programs/zsh.nix
View file

@ -1,13 +1,8 @@
{ pkgs
, config
, ...
}:
{ pkgs }:
{ ... }:
let
channelSources = (import ../../default.nix {
versionsPath = ../../variables/versions.nix;
}).channelSources;
just-plugin =
let
plugin_file = pkgs.writeText "_just" ''
@ -71,7 +66,7 @@ in {
# don't cd into directories when executed
unsetopt AUTO_CD
source ${channelSources}
export NIX_PATH="${pkgs.nixPath}"
# print lines without termination
setopt PROMPT_CR

9
nix/os/devices/steveej-t480s-work/pkg.nix
View file

@ -1,9 +1,12 @@
{
...
{ pkgs
, ...
}:
{
home-manager.users.steveej = import ../../../home-manager/configuration/graphical-fullblown.nix;
nixpkgs.config.packageOverrides = pkgs: with pkgs; {
nixPath = (import ../../../default.nix { versionsPath = ./versions.nix; }).nixPath;
};
home-manager.users.steveej = import ../../../home-manager/configuration/graphical-fullblown.nix { inherit pkgs; };
services.teamviewer.enable = true;
system.stateVersion = "19.09";
}

2
nix/os/devices/steveej-t480s-work/versions.nix
View file

@ -10,7 +10,7 @@
nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "e7add4afc1615e12474a79098b897e11686953b7";
rev = "c0e65c63401c9c75c403df207e4bd6439b965cb4";
};
homeManagerModule = {
url = "https://github.com/rycee/home-manager";

5
nix/os/devices/vmd32387.contaboserver.net/pkg.nix
View file

@ -5,7 +5,10 @@
}:
{
home-manager.users.steveej = import ../../../home-manager/configuration/text-minimal.nix;
nixpkgs.config.packageOverrides = pkgs: with pkgs; {
nixPath = (import ../../../default.nix { versionsPath = ./versions.nix; }).nixPath;
};
home-manager.users.steveej = import ../../../home-manager/configuration/text-minimal.nix { inherit pkgs; };
services.hydra = {
enable = false;

2
nix/os/profiles/common/pkg.nix
View file

@ -6,7 +6,7 @@
imports = [
"${<home-manager-module>}/nixos"
];
home-manager.users.root = import ../../../home-manager/configuration/text-minimal.nix;
home-manager.users.root = import ../../../home-manager/configuration/text-minimal.nix { inherit pkgs; };
nixpkgs.config = {
allowBroken = false;

4
nix/os/profiles/common/system.nix
View file

@ -29,6 +29,10 @@
}
'';
environment.variables = {
NIX_PATH = lib.mkForce pkgs.nixPath;
};
# Fonts, I18N, Date ...
fonts.fonts = [
pkgs.corefonts

9
nix/os/profiles/removable-medium/pkg.nix
View file

@ -1,7 +1,10 @@
{
...
{ pkgs
, ...
}:
{
home-manager.users.steveej = import ../../../home-manager/configuration/graphical-removable.nix;
nixpkgs.config.packageOverrides = pkgs: with pkgs; {
nixPath = (import ../../../default.nix { versionsPath = ./versions.nix; }).nixPath;
};
home-manager.users.steveej = import ../../../home-manager/configuration/graphical-removable.nix { inherit pkgs; };
}