greg/nixos
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of gh:greg-hellings/nixos-config

Browse Source
This commit is contained in:
Greg Hellings
2024-08-04 19:07:44 -05:00
parent 7b67f63295 ed7f397903
commit 042c3a5a6b
39 changed files with 93 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+9 -9
View File
@@ -286,11 +286,11 @@
]
},
"locked": {
"lastModified": 1717931644,
"narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
"lastModified": 1722462338,
"narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
"rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
"type": "github"
},
"original": {
@@ -413,11 +413,11 @@
},
"nixunstable": {
"locked": {
"lastModified": 1720957393,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github"
},
"original": {
@@ -454,11 +454,11 @@
},
"nurpkgs": {
"locked": {
"lastModified": 1718026702,
"narHash": "sha256-B62vRJYFK7x5pJKDvXCIRgKcAS9K/KwoTBYAECfb81A=",
"lastModified": 1722483963,
"narHash": "sha256-YHzqiXEptvpB6npuEyg+C8NkIpiHqbrbhuBaq66DxwU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "f7e5fe023ea5742a1db039b6ba17f717ef24cc0f",
"rev": "c7c930c6dff8e35e6a232b8e9bd19b091ad15f10",
"type": "github"
},
"original": {
home/home.nix
+2 -9
View File
@@ -7,18 +7,11 @@ let
system = pkgs.system;
in
{
nixpkgs.config.allowUnfreePredicate = (_: true);
imports = [
inputs.nixvim.homeManagerModules.default
./modules
./ansible.nix
./bash.nix
./direnv.nix
./git.nix
./ssh.nix
./vim.nix
./xonsh.nix
./hosts/${host}
];
] ++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ];
programs.tmux = {
home/hosts/genesis/default.nix
-5
View File
@@ -1,5 +0,0 @@
{ ... }:
{
}
home/hosts/hosea/default.nix
-5
View File
@@ -1,5 +0,0 @@
{ ... }:
{
}
home/hosts/iso/default.nix
-5
View File
@@ -1,5 +0,0 @@
{ ... }:
{
}
home/hosts/ivr/default.nix
+4 -5
View File
@@ -11,11 +11,10 @@ let
tox
]);
in {
imports = [
../../vscodium.nix
];
greg.pypackage = py;
greg = {
pypackage = py;
vscodium = true;
};
home = {
packages = with pkgs; [
aacs
home/hosts/jeremiah/default.nix
-4
View File
@@ -1,4 +0,0 @@
{ pkgs, config, ... }:
{
}
home/hosts/jude/default.nix
+7 -7
View File
@@ -1,16 +1,16 @@
{ pkgs, ... }:
{
imports = [
../../vscodium.nix
];
home.packages = with pkgs; [
(mumble.override { pulseSupport = true; })
logseq
#logseq
];
greg.gui = true;
greg.sway = false;
greg.gnome = false;
greg = {
gui = true;
sway = false;
gnome = false;
vscodium = true;
};
programs.xonsh.sessionVariables.EFI_DIR = "${pkgs.OVMF.fd}/FV/";
}
home/hosts/linode/default.nix
-5
View File
@@ -1,5 +0,0 @@
{ ... }:
{
}
home/hosts/ls23003/default.nix
-4
View File
@@ -1,4 +0,0 @@
{ ... }:
{
}
home/hosts/myself/default.nix
-4
View File
@@ -1,4 +0,0 @@
{ ... }:
{
}
home/hosts/work/default.nix
+1 -3
View File
@@ -1,9 +1,7 @@
{ pkgs, ... }:
{
imports = [
../../vscodium.nix
];
greg.vscodium.enable = true;
home.packages = with pkgs; [
brew
home/hosts/wsl/default.nix
-5
View File
@@ -1,5 +0,0 @@
{ ... }:
{
}
home/ansible.nix → home/modules/baseline/ansible.nix
View File
home/bash.nix → home/modules/baseline/bash.nix
View File
home/modules/baseline/default.nix
+13
View File
@@ -0,0 +1,13 @@
{ ... }:
{
imports = [
./ansible.nix
./bash.nix
./direnv.nix
./git.nix
./ssh.nix
./vim.nix
./xonsh.nix
];
}
home/direnv.nix → home/modules/baseline/direnv.nix
View File
home/git.nix → home/modules/baseline/git.nix
View File
home/ssh.nix → home/modules/baseline/ssh.nix
View File
home/vim.nix → home/modules/baseline/vim.nix
View File
home/vim/extra.lua → home/modules/baseline/vim/extra.lua
View File
home/vim/extra.vimrc → home/modules/baseline/vim/extra.vimrc
View File
home/vim/init.lua → home/modules/baseline/vim/init.lua
View File
home/vim/vimrc → home/modules/baseline/vim/vimrc
View File
home/xonsh.nix → home/modules/baseline/xonsh.nix
View File
home/xonsh_footer.xsh → home/modules/baseline/xonsh_footer.xsh
+5
View File
@@ -44,6 +44,10 @@ def _cfetch(args):
$CIRCLECI_CLI_TOKEN=$(bw get password CircleCI)
compass workspace exec bazel run src/go/compass.com/tools/circleci_results_cache/fetch/cmd/fetch:fetch
def _aws_creds(args):
$AWS_ACCESS_KEY_ID=$(bw get username "AWS Access Key")
$AWS_SECRET_ACCESS_KEY=$(bw get password "AWS Access Key")
def _rebuild(args):
system = uname()
if system.sysname == 'Darwin':
@@ -92,6 +96,7 @@ def _bake(args):
git clone src:greg/copier-templates.git ~/.copier-templates
copier copy @(str(templates / args[0])) .
aliases['aws_creds'] = _aws_creds
aliases['glrestart'] = _glrestart
aliases['bake'] = _bake
aliases['unlock'] = _unlock
home/xonsh_header.xsh → home/modules/baseline/xonsh_header.xsh
View File
home/modules/default.nix
+2
View File
@@ -2,11 +2,13 @@
{
imports = [
./baseline
./development.nix
./gnome.nix
./gui.nix
./python.nix
./sway.nix
./vscodium.nix
./xonsh.nix
];
}
home/modules/gui.nix
+1 -1
View File
@@ -56,7 +56,7 @@ in {
programs.firefox = {
enable = (! pkgs.stdenv.hostPlatform.isDarwin);
package = ffPkgs;
#package = ffPkgs;
profiles = {
default = {
settings = {
home/modules/vscodium.nix
+32
View File
@@ -0,0 +1,32 @@
{ pkgs, config, lib, ... }:
let
cfg = config.greg.vscodium;
in {
options.greg.vscodium = lib.mkEnableOption "Enable installation of VSCodium on the host";
config = lib.mkIf cfg {
home.packages = with pkgs; [
buildifier
gopls
];
# An alternative editor to vim, when I need it for some things
programs.vscode = {
enable = true;
package = pkgs.vscodium;
extensions = with pkgs.vscode-extensions; [
arrterian.nix-env-selector
asvetliakov.vscode-neovim
bungcip.better-toml
golang.go
jnoortheen.nix-ide
mkhl.direnv
ms-python.python
vscjava.vscode-java-test
vscjava.vscode-java-dependency
vscjava.vscode-java-debug
];
};
};
}
home/vscodium.nix
-26
View File
@@ -1,26 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
buildifier
gopls
];
# An alternative editor to vim, when I need it for some things
programs.vscode = {
enable = true;
package = pkgs.vscodium;
extensions = with pkgs.vscode-extensions; [
arrterian.nix-env-selector
asvetliakov.vscode-neovim
bungcip.better-toml
golang.go
jnoortheen.nix-ide
mkhl.direnv
ms-python.python
vscjava.vscode-java-test
vscjava.vscode-java-dependency
vscjava.vscode-java-debug
];
};
}
hosts/jeremiah/default.nix
+1
View File
@@ -109,6 +109,7 @@
enableExtensionPack = true;
enableHardening = false;
headless = true;
enableWebService = true;
};
systemd.services."gitlab-runner" = {
hosts/jude/default.nix
-4
View File
@@ -47,7 +47,6 @@
[
bind # For things like nslookup
create_ssl
darktable
distrobox
expect
gimp
@@ -63,11 +62,8 @@
libxml2
linode-cli
makemkv
nix-du
nix-tree
oathToolkit
synology-drive-client
terraform
usbutils
vagrant
ventoy
hosts/myself/container-git.nix
+12 -17
View File
@@ -177,23 +177,18 @@ in {
# Do not start nginx until we have tailscaled up and running, so it can bind
# to the 100.* addresses
systemd.services.nginx = {
after = [
"tailscaled.service"
"network.target"
"network-online.target"
];
wants = [
"tailscaled.service"
"network.target"
"network-online.target"
];
requires = [
"tailscaled.service"
];
preStart = ''
sleep 5 # tailscaled is up before it's ACTUALLY up... try waiting?
'';
systemd.services = {
nginx = rec {
after = [
"network-online.target"
];
wants = after;
serviceConfig = {
RestartMaxDelaySec = "30s";
RestartSteps = "5";
};
};
tailscaled.partOf = [ "network-online.target" ];
};
system.stateVersion = lib.mkForce "24.05";
}
hosts/myself/container-runner.nix
+1 -1
View File
@@ -67,7 +67,7 @@ lib.attrsets.recursiveUpdate {
registrationConfigFile = config.age.secrets.runner-reg.path;
environmentVariables = {
EFI_DIR = "${pkgs.OVMF.fd}/FV/";
STORAGE_URL = "http://localhost:9000";
STORAGE_URL = "http://minio-01.thehellings.lan:9000";
};
};
};
modules/baseline.nix
-4
View File
@@ -36,13 +36,10 @@ in
# Base packages that need to be in all my hosts
environment.systemPackages = with pkgs; [
agenix
android-file-transfer
bitwarden-cli
bmon
configure_aws_creds
diffutils
git
gh
gnupatch
gregpy
findutils
@@ -54,7 +51,6 @@ in
nano
pciutils
pwgen
transcrypt
unzip
wget
];
modules/nixos/gnome.nix
+3 -3
View File
@@ -49,9 +49,9 @@ in with lib; {
# Enable some Gnome plugins that I like
environment.systemPackages = with pkgs; [
gnome3.adwaita-icon-theme
gnome3.gnome-tweaks
gnome3.dconf-editor
adwaita-icon-theme
gnome-tweaks
dconf-editor
gnomeExtensions.appindicator
gnomeExtensions.clipboard-indicator
gnomeExtensions.dash-to-dock
overlays/configure_aws_creds.nix
-12
View File
@@ -1,12 +0,0 @@
{ pkgs, ... }:
let
bw = "${pkgs.bitwarden-cli}/bin/bw";
in pkgs.writeShellScriptBin "configure_aws_creds" ''
set -ex -o pipefail
session="$(${bw} unlock | grep -e '$ export' | awk -F\" '{print $2}')"
export BW_SESSION="''${session}"
export AWS_ACCESS_KEY_ID="$(${bw} get username "AWS Access Key")"
export AWS_SECRET_ACCESS_KEY="$(${bw} get password "AWS Access Key")"
''
overlays/default.nix
-1
View File
@@ -45,7 +45,6 @@ in rec {
# My own packages
aacs = prev.callPackage ./aacs.nix {};
configure_aws_creds = prev.callPackage ./configure_aws_creds.nix {};
create_ssl = prev.callPackage ./create_ssl.nix {};
enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
hms = prev.callPackage ./hms {