Some massive changes to make flakiness better
Renamed the @inputs to @top. This was a misguided attempt to make a
different change, but it's going to stick, now.
Began moving packages to their own folder rather than being intermingled
with overlays
Created a local overlay that just includes my personal packages
Cleaned up some dead code
Moved to just using the raw 'imports' instead of needing to explicitly
call out the `foo = import foo.nix {};` syntax
This commit is contained in:
+10
-8
@@ -1,20 +1,22 @@
|
||||
{ inputs
|
||||
, overlays
|
||||
, ...
|
||||
}:
|
||||
{ top, overlays, ... }:
|
||||
|
||||
rec {
|
||||
greghellings =
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = (import inputs.nixunstable { inherit system overlays; config.allowUnfree = true; });
|
||||
pkgs = (
|
||||
import top.nixunstable {
|
||||
inherit system overlays;
|
||||
config.allowUnfree = true;
|
||||
}
|
||||
);
|
||||
in
|
||||
inputs.hmunstable.lib.homeManagerConfiguration {
|
||||
top.hmunstable.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = [ ./home.nix ];
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
nixvim = inputs.nixvimunstable;
|
||||
inherit top;
|
||||
nixvim = top.nixvimunstable;
|
||||
gui = false;
|
||||
gnome = false;
|
||||
host = "ivr";
|
||||
|
||||
+39
-30
@@ -1,26 +1,35 @@
|
||||
{ pkgs, lib, inputs, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
top,
|
||||
...
|
||||
}:
|
||||
let
|
||||
nix23 = import inputs.nix23_05 {
|
||||
nix23 = import top.nix23_05 {
|
||||
inherit (pkgs.stdenv) system;
|
||||
overlays = [ inputs.self.overlays.default ];
|
||||
overlays = [ top.self.overlays.default ];
|
||||
};
|
||||
py = nix23.python311.withPackages (p: with p; [
|
||||
django
|
||||
djangorestframework
|
||||
django-rapyd-modernauth
|
||||
environs
|
||||
mysqlclient
|
||||
pyyaml
|
||||
ruamel-yaml
|
||||
tox
|
||||
]);
|
||||
py = nix23.python311.withPackages (
|
||||
p: with p; [
|
||||
django
|
||||
djangorestframework
|
||||
django-rapyd-modernauth
|
||||
environs
|
||||
mysqlclient
|
||||
pyyaml
|
||||
ruamel-yaml
|
||||
tox
|
||||
]
|
||||
);
|
||||
x = pkgs.xonsh.override {
|
||||
extraPackages = (ps: [
|
||||
pkgs.nur.repos.xonsh-xontribs.xonsh-direnv
|
||||
pkgs.nur.repos.xonsh-xontribs.xontrib-vox
|
||||
ps.xonsh-apipenv
|
||||
pkgs.pipenv-ivr
|
||||
]);
|
||||
extraPackages = (
|
||||
ps: [
|
||||
pkgs.nur.repos.xonsh-xontribs.xonsh-direnv
|
||||
pkgs.nur.repos.xonsh-xontribs.xontrib-vox
|
||||
ps.xonsh-apipenv
|
||||
pkgs.pipenv-ivr
|
||||
]
|
||||
);
|
||||
};
|
||||
in
|
||||
{
|
||||
@@ -33,9 +42,7 @@ in
|
||||
|
||||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"jitsi-meet-1.0.8043"
|
||||
];
|
||||
permittedInsecurePackages = [ "jitsi-meet-1.0.8043" ];
|
||||
};
|
||||
|
||||
home = {
|
||||
@@ -51,14 +58,16 @@ in
|
||||
robo3t
|
||||
x
|
||||
];
|
||||
file.".pip/pip.conf".text = (lib.strings.concatStringsSep "\n" [
|
||||
"[global]"
|
||||
"retries = 1"
|
||||
"index-url = https://pypi.python.org/simple"
|
||||
"extra-index-url ="
|
||||
" https://pypi.ivrtechnology.com/simple/"
|
||||
" https://pypidev.ivrtechnology.com/simple/"
|
||||
]);
|
||||
file.".pip/pip.conf".text = (
|
||||
lib.strings.concatStringsSep "\n" [
|
||||
"[global]"
|
||||
"retries = 1"
|
||||
"index-url = https://pypi.python.org/simple"
|
||||
"extra-index-url ="
|
||||
" https://pypi.ivrtechnology.com/simple/"
|
||||
" https://pypidev.ivrtechnology.com/simple/"
|
||||
]
|
||||
);
|
||||
username = "gregory.hellings";
|
||||
homeDirectory = lib.mkForce "/home/gregory.hellings";
|
||||
};
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ pkgs, config, lib, inputs, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
top,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.greg.vscodium;
|
||||
@@ -17,7 +23,7 @@ in
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
extensions = with inputs.vsext.extensions."${pkgs.stdenv.system}".vscode-marketplace; [
|
||||
extensions = with top.vsext.extensions."${pkgs.stdenv.system}".vscode-marketplace; [
|
||||
arrterian.nix-env-selector
|
||||
asvetliakov.vscode-neovim
|
||||
batisteo.vscode-django
|
||||
@@ -49,9 +55,7 @@ in
|
||||
"terminal.integrated.defaultProfile.linux" = "tmux";
|
||||
"vscode-neovim.neovimInitVimPaths.darwin" = "~/.config/nvim/init.lua";
|
||||
"vscode-neovim.neovimInitVimPaths.linux" = "~/.config/nvim/init.lua";
|
||||
"workbench.settings.applyToAllProfiles" = [
|
||||
"direnv.path.executable"
|
||||
];
|
||||
"workbench.settings.applyToAllProfiles" = [ "direnv.path.executable" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user