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
2023-12-11 21:30:10 +00:00
parent 4bbe20e5a3 e4e96d3625
commit f2f70505e4
16 changed files with 87 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-iso.sh
Executable
+5
View File
@@ -0,0 +1,5 @@
#!/usr/bin/env bash
beta="${1}"
nix build ".#nixosConfigurations.iso${beta}.config.system.build.isoImage"
darwin/default.nix
+2 -1
View File
@@ -4,6 +4,7 @@ let
system ? "aarch64-darwin",
name,
channel ? inputs.nixunstable,
hm ? inputs.hmunstable,
extraMods ? []
}:
let
@@ -15,7 +16,7 @@ let
specialArgs = { inherit nixpkgs; };
modules = [
{ nixpkgs.overlays = overlays; }
inputs.hm.darwinModules.home-manager
hm.darwinModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
darwin/work/default.nix
+1
View File
@@ -8,6 +8,7 @@
];
casks = [
"gnucash"
"insomnia"
"onlyoffice"
"pgadmin4"
"postman"
flake.lock
Generated
+12 -12
View File
@@ -49,11 +49,11 @@
]
},
"locked": {
"lastModified": 1692248770,
"narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=",
"lastModified": 1697723594,
"narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b",
"rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980",
"type": "github"
},
"original": {
@@ -180,11 +180,11 @@
]
},
"locked": {
"lastModified": 1698896213,
"narHash": "sha256-u42NZt52F3o7pM5V7sYlLOp5tSN8z9+fO2wFcOs0EOQ=",
"lastModified": 1701728041,
"narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "831b4fa31749208e576050c563e9773aafd04941",
"rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf",
"type": "github"
},
"original": {
@@ -406,11 +406,11 @@
},
"nixunstable": {
"locked": {
"lastModified": 1698924604,
"narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
"lastModified": 1701436327,
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40",
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
"type": "github"
},
"original": {
@@ -454,11 +454,11 @@
},
"nurpkgs": {
"locked": {
"lastModified": 1699022487,
"narHash": "sha256-YgBYhtv4mH/vY19ez/KK+NE931ziZqFKTp+hB6fAqxo=",
"lastModified": 1701837124,
"narHash": "sha256-+qPorEJXhoJcByNM/W1pHTTYvzZA3EhcXYjElR9VZV8=",
"owner": "nix-community",
"repo": "NUR",
"rev": "cbfae2db1a6fc777c4bcbf4de7b1c02f404b28a8",
"rev": "adfe50da3f5f7e2eb864d1c07654b5482b4d2327",
"type": "github"
},
"original": {
home/gui/firefox.nix
+1 -1
View File
@@ -28,7 +28,7 @@ in with lib;
};
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
bitwarden
pkgs.bypass-paywalls
bypass-paywalls-clean
gsconnect
foxyproxy-standard
multi-account-containers
home/hosts/ivr/default.nix
+1
View File
@@ -12,6 +12,7 @@
bruno
direnv
home-manager
insomnia
pipenv
];
file.".pip/pip.conf".text = (lib.strings.concatStringsSep "\n" [
home/hosts/jude/default.nix
+3
View File
@@ -4,4 +4,7 @@
imports = [
../../vscodium.nix
];
home.packages = [
(pkgs.mumble.override { pulseSupport = true; })
];
}
home/modules/gnome.nix
+1 -1
View File
@@ -12,7 +12,7 @@ in {
enable = true;
showMenubar = true;
themeVariant = "dark";
profile.default = {
profile."95f3c68e-82f3-4f44-ac85-6e075fed80b0" = {
default = true;
visibleName = "greg";
};
home/xonsh.nix
+8 -9
View File
@@ -32,23 +32,22 @@
aliases = {
ac = "vox activate";
cbazel = "compass workspace exec bazel";
cblack = "compass workspace run src/python3/uc/tools:run_black --";
cbuild = "compass workspace build";
cci = "./scripts/circleci-checks.py";
cci = "compass workspace run src/python3/uc/tools:circleci-checks";
ccover = "compass workspace cover --extra-cmd-args=\"--test_output=errors\"";
cexec = "compass workspace exec";
cfetch = "compass workspace exec bazel run src/go/compass.com/tools/circleci_results_cache:fetch";
cgh = "$GH_CONFIG_DIR=\"${config.home.homeDirectory}/.config/gh/compass\" gh";
cpip = "compass workspace run src/python3/uc/tools:run_pip_compile";
crun = "compass workspace run";
ctest = "compass workspace test --extra-cmd-args=\"--test_output=errors\"";
ccover = "compass workspace cover --extra-cmd-args=\"--test_output=errors\"";
cylint = "./scripts/run_yaml_lint.py";
cpip = "compass workspace run src/python3/uc/tools:run_pip_compile";
cexec = "compass workspace exec";
cbazel = "compass workspace exec bazel";
cylint = "compass workspace run src/python3/uc/tools:run_yaml_lint";
gazelle = "compass workspace exec bazel run :gazelle";
cfetch = "compass workspace exec bazel run src/go/compass.com/tools/circleci_results_cache:fetch";
cleanup = "nix-collect-garbage --delete-older-than 30d && nix store optimise";
cleanup = "sudo nix-collect-garbage --delete-older-than 30d && nix store optimise";
d = "vox deactivate";
devroles = "cd ~/src/ansible_collections/devroles";
dirflake = "nix flake new -t github:nix-community/nix-direnv";
gh-personal = "$GH_CONFIG_DIR=\"${config.home.homeDirectory}/.config/gh/personal\" gh";
ls = "ls --color";
hosts/default.nix
+1
View File
@@ -52,6 +52,7 @@ in {
lappy = machine { name = "lappy"; };
mm = unstable { name = "mm"; };
iso = machine { name = "iso"; };
iso-beta = unstable { name = "iso"; };
# nix build '.#nixosConfigurations.wsl.config.system.build.installer'
nixos = wsl { name = "wsl"; system = "aarch64-linux"; };
# nix build '.#nixosConfigurations.wsl-aarch.config.system.build.installer'
hosts/iso/default.nix
+3
View File
@@ -9,4 +9,7 @@
networking.networkmanager.enable = lib.mkForce false;
users.users.greg.initialPassword = "";
#services.getty.autologinUser = lib.mkForce "greg";
environment.systemPackages = with pkgs; [
tree
];
}
hosts/jude/boot.nix
+17 -2
View File
@@ -1,18 +1,33 @@
{ lib, ... }:
{ lib, pkgs, ... }:
{
# Use the systemd-boot EFI boot loader.
boot = {
supportedFilesystems = [ "ntfs" ];
loader = {
timeout = 15;
systemd-boot = {
enable = true;
configurationLimit = 10;
configurationLimit = 20;
extraEntries = {
"Windows.conf" = (lib.strings.concatStringsSep "\n" [
"title Windows"
"efi /EFI/Microsoft/EFI/bootmgfw.efi"
]);
"Win2.conf" = (lib.strings.concatStringsSep "\n" [
"title Windows 11"
"efi /shellx64.efi"
"options -nointerrupt -noconsolein -noconsoleout windows11.nsh"
]);
"Shell.conf" = (lib.strings.concatStringsSep "\n" [
"title EFI Shell"
"efi /shell.efi"
]);
};
extraFiles = {
"windows11.nsh" = (pkgs.writeText "windows11.nsh" (lib.strings.concatStringsSep "\n" [
]));
"shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi";
};
};
grub = {
hosts/jude/default.nix
+24 -10
View File
@@ -58,20 +58,34 @@
fsType = "auto";
};
"/windows" = {
device = "/dev/nvme0n1p3";
device = "/dev/nvme0n1p5";
fsType = "ntfs-3g";
};
"/windows11" = {
device = "/dev/nvme1n1p2";
fsType = "ntfs-3g";
};
};
# Let's do a sound thing
services.pipewire = {
enable = true;
alsa.enable = true;
audio.enable = true;
jack.enable = true;
pulse.enable = true;
wireplumber.enable = true;
services = {
pipewire = {
enable = true;
alsa.enable = true;
audio.enable = true;
jack.enable = true;
pulse.enable = true;
wireplumber.enable = true;
};
xserver.videoDrivers = [ "nvidia" ];
};
hardware = {
nvidia = {
modesetting.enable = true;
nvidiaSettings = true;
open = true;
};
pulseaudio.enable = false; # This conflicts with pipewire
system76.enableAll = true;
};
hardware.pulseaudio.enable = false; # This conflicts with pipewire
}
hosts/jude/hardware-configuration.nix
+2 -1
View File
@@ -14,7 +14,8 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/27ae91ed-32e9-411e-8227-0d99e360fbbf";
{ #device = "/dev/disk/by-uuid/27ae91ed-32e9-411e-8227-0d99e360fbbf";
device = "/dev/nvme0n1p4";
fsType = "btrfs";
};
modules-all/default.nix
+2 -12
View File
@@ -4,18 +4,6 @@
# Enable flakes
nix = {
package = pkgs.nixFlakes;
buildMachines = [
{
hostName = "dns.me.ts";
system = "aarch64-linux";
}
{
hostName = "jude.me.ts";
system = "x86_64-linux";
}
];
gc = {
automatic = true;
# Scheduling of them is different in nixos vs nix-darwin, so check for
@@ -32,9 +20,11 @@
max-free = (toString (5 * 1024 * 1024 * 1024) );
substituters = [
"https://cache.garnix.io"
"https://ai.cachix.org"
];
trusted-public-keys = [
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
];
};
};
overlays/default.nix
+4 -6
View File
@@ -28,11 +28,6 @@ let
in rec {
gregpy = myPython;
bypass-paywalls = final.nur.repos.rycee.firefox-addons.bypass-paywalls-clean.override {
version = "3.2.6.0";
url = "https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-3.2.6.0-custom.xpi";
sha256 = "sha256-dEdqg0q4w+evky7oZ4l33GPEBEc/PFG2dCsQkVY9/3g=";
};
## Testing adding python packages in the correct manner
pythonPackagesExtensions = (prev.pythonPackagesExtensions or []) ++ [
@@ -58,7 +53,7 @@ in rec {
};
inject = prev.callPackage ./inject.nix { inherit (final) pkgs; };
jinja2-cli = prev.python3.pkgs.callPackage ./jinja2-cli.nix {};
libbluray = prev.libbluray.override {
libbluray-custom = prev.libbluray.override {
withAACS = true;
withBDplus = true;
};
@@ -66,6 +61,9 @@ in rec {
pkgs = final.pkgs;
};
template = prev.callPackage ./template.nix { };
handbrake = prev.handbrake.override {
libbluray = libbluray-custom;
};
xonsh = prev.xonsh.overridePythonAttrs (old: rec{
python3 = final.gregpy;