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-11-08 05:11:23 +00:00
parent 103493082f 1eec4494d9
commit 4bbe20e5a3
14 changed files with 174 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+102 -57
View File
@@ -84,11 +84,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1692799911,
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@@ -102,11 +102,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1692799911,
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@@ -133,21 +133,22 @@
"type": "github"
}
},
"flake-utils_4": {
"haumea": {
"inputs": {
"systems": "systems_4"
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"lastModified": 1685133229,
"narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=",
"owner": "nix-community",
"repo": "haumea",
"rev": "34dd58385092a23018748b50f9b23de6266dffc2",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"owner": "nix-community",
"ref": "v0.2.2",
"repo": "haumea",
"type": "github"
}
},
@@ -158,11 +159,11 @@
]
},
"locked": {
"lastModified": 1693208669,
"narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
"lastModified": 1695108154,
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
"rev": "07682fff75d41f18327a871088d20af2710d4744",
"type": "github"
},
"original": {
@@ -172,6 +173,27 @@
"type": "github"
}
},
"hmunstable": {
"inputs": {
"nixpkgs": [
"nixstable"
]
},
"locked": {
"lastModified": 1698896213,
"narHash": "sha256-u42NZt52F3o7pM5V7sYlLOp5tSN8z9+fO2wFcOs0EOQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "831b4fa31749208e576050c563e9773aafd04941",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -201,11 +223,11 @@
]
},
"locked": {
"lastModified": 1693108765,
"narHash": "sha256-U1btmyF7SMX+y80EXYva5Xj6lpn20xPbHbuoe/2bSIw=",
"lastModified": 1698873617,
"narHash": "sha256-FfGFcfbULwbK1vD+H0rslIOfmy4g8f2hXiPkQG3ZCTk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9706fb8e441a7c56c68bb079480938ed505e8102",
"rev": "48b0a30202516e25d9885525fbb200a045f23f26",
"type": "github"
},
"original": {
@@ -255,19 +277,20 @@
"nixneovim": {
"inputs": {
"flake-utils": "flake-utils_2",
"haumea": "haumea",
"home-manager": "home-manager_2",
"nix-flake-tests": "nix-flake-tests",
"nixneovimplugins": "nixneovimplugins",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"nmd": "nmd",
"nmt": "nmt"
},
"locked": {
"lastModified": 1693145871,
"narHash": "sha256-4ukNPl1wS8KVXDgGvzHdOVna2SmoMNEvSRG1+vJB4/0=",
"lastModified": 1698934863,
"narHash": "sha256-eKw9zCMAzypdijWc75MraJHZhEIi2yFre1wbpsRNdqI=",
"owner": "NixNeovim",
"repo": "NixNeovim",
"rev": "56bd12a614c6b4d58804eea617caa98040f4609b",
"rev": "d723943a86703293fdaa69534d8ccc2f7aa29d88",
"type": "github"
},
"original": {
@@ -289,11 +312,11 @@
"poetry2nix": "poetry2nix"
},
"locked": {
"lastModified": 1692886753,
"narHash": "sha256-8trl3fqUXHSaRBj9db4dy8hDfS6dGEpeYlgKdScA1Zo=",
"lastModified": 1698934839,
"narHash": "sha256-bKchHdgkYOl+6g9VHyPDueHa25pJfNX5HOOhy0IcRgU=",
"owner": "nixneovim",
"repo": "nixneovimplugins",
"rev": "bae2f935ea46475c9360edaca313a5cd5720e2d9",
"rev": "89ef1bd2cc97607875c01c6a369989d4f1f278c6",
"type": "github"
},
"original": {
@@ -320,11 +343,26 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1693003285,
"narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=",
"lastModified": 1681001314,
"narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1698611440,
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7",
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"type": "github"
},
"original": {
@@ -334,6 +372,22 @@
"type": "github"
}
},
"nixpy311": {
"locked": {
"lastModified": 1698696950,
"narHash": "sha256-FHFL58t6lMumvWqwundC8fDDDLOIvc+JJBNIAlPjrDY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "017ef2132a5bda50bd713aeabce8f918502d4ec1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixstable": {
"locked": {
"lastModified": 1697226376,
@@ -352,11 +406,11 @@
},
"nixunstable": {
"locked": {
"lastModified": 1693663421,
"narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=",
"lastModified": 1698924604,
"narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e56990880811a451abd32515698c712788be5720",
"rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40",
"type": "github"
},
"original": {
@@ -385,11 +439,11 @@
"nmt": {
"flake": false,
"locked": {
"lastModified": 1683843030,
"narHash": "sha256-2K9tFpypgSORyUTRAL7MFRKCXU4GykmhIDrrIydtPdI=",
"lastModified": 1694274695,
"narHash": "sha256-PufoLMSuBYkga8hTqYf/cIQzSuy2lfFj+cdKcp2nLEI=",
"owner": "jooooscha",
"repo": "nmt",
"rev": "f30b96093eb056f1bcc60199545344b4e4a72c5a",
"rev": "29595267923b4a6ce766ff0d85afaa930842b88d",
"type": "github"
},
"original": {
@@ -400,11 +454,11 @@
},
"nurpkgs": {
"locked": {
"lastModified": 1693319998,
"narHash": "sha256-GjdunTxfEcvWn7N6RrDLE+X35M/nJfmZdK2Cq2Lvk/0=",
"lastModified": 1699022487,
"narHash": "sha256-YgBYhtv4mH/vY19ez/KK+NE931ziZqFKTp+hB6fAqxo=",
"owner": "nix-community",
"repo": "NUR",
"rev": "f944f5befe39d7cf27cd0b41960ace172f9241b3",
"rev": "cbfae2db1a6fc777c4bcbf4de7b1c02f404b28a8",
"type": "github"
},
"original": {
@@ -415,7 +469,11 @@
},
"poetry2nix": {
"inputs": {
"flake-utils": "flake-utils_3",
"flake-utils": [
"nixneovim",
"nixneovimplugins",
"flake-utils"
],
"nix-github-actions": "nix-github-actions",
"nixpkgs": [
"nixneovim",
@@ -443,7 +501,9 @@
"darwin": "darwin_2",
"flake-utils": "flake-utils",
"hm": "hm",
"hmunstable": "hmunstable",
"nixneovim": "nixneovim",
"nixpy311": "nixpy311",
"nixstable": "nixstable",
"nixunstable": "nixunstable",
"nurpkgs": "nurpkgs",
@@ -495,25 +555,10 @@
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"wsl": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixunstable"
]
flake.nix
+9
View File
@@ -15,7 +15,12 @@
url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixstable";
};
hmunstable = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixstable";
};
nixneovim.url = "github:NixNeovim/NixNeovim";
nixpy311.url = "github:NixOS/nixpkgs/nixos-23.05";
nixstable.url = "github:nixos/nixpkgs/nixos-23.05";
nixunstable.url = "github:nixos/nixpkgs/nixos-unstable";
nurpkgs.url = "github:nix-community/NUR";
@@ -30,7 +35,9 @@
darwin,
flake-utils,
hm,
hmunstable,
nixneovim,
nixpy311,
nixstable,
nixunstable,
nurpkgs,
@@ -58,6 +65,8 @@
darwinConfigurations = (import ./darwin { inherit inputs overlays; });
homeConfigurations = (import ./home { inherit inputs overlays; });
devShell = (flake-utils.lib.eachSystemMap flake-utils.lib.allSystems (system: let
pkgs = import nixunstable { inherit system overlays; };
in pkgs.mkShell {
home/default.nix
+15 -56
View File
@@ -4,61 +4,20 @@
...
}:
let
# I'm "greg" everywhere except Darwin where I'm "gregory.hellings"
user = system:
( if ( inputs.nixstable.lib.hasSuffix "-darwin" system ) then "gregory.hellings" else "greg" );
home = system: username:
if username == "root" then "/root" else
( if ( inputs.nixstable.lib.hasSuffix "-darwin" system ) then "/Users/${username}" else "/home/${username}" );
mkhome = {
system,
gui,
gnome,
username
}:
let
stateVersion = "23.05";
homeDirectory = home system username;
cfg = { home = { inherit username homeDirectory stateVersion; }; };
configDir = "${homeDirectory}/.config";
pkgs = import inputs.nixstable {
inherit overlays system;
config.allowUnfree = true;
config.xdg.configHome = configDir;
};
in inputs.hm.lib.homeManagerConfiguration rec {
inherit pkgs;
modules = [
(import ./home.nix {
inherit inputs pkgs gui gnome;
inherit (pkgs) config lib stdenv;
})
cfg
];
{
"gregory.hellings" =
let
system = "x86_64-linux";
pkgs = (import inputs.nixunstable { inherit system overlays; });
in inputs.hmunstable.lib.homeManagerConfiguration {
inherit pkgs;
modules = [ ./home.nix ];
extraSpecialArgs = {
inherit inputs;
gui = false;
gnome = false;
host = "ivr";
username = "gregory.hellings";
};
in inputs.flake-utils.lib.eachDefaultSystem (system: {
gui = mkhome {
inherit system;
gui = true;
gnome = false;
username = user system;
};
gdm = mkhome {
inherit system;
gui = true;
gnome = true;
username = user system;
};
cli = mkhome {
inherit system;
gui = false;
gnome = false;
username = user system;
};
})
}
home/home.nix
+1
View File
@@ -38,6 +38,7 @@
copier
diffutils
findutils
gh
git
gnupatch
gregpy
home/hosts/ivr/default.nix
+21 -13
View File
@@ -1,20 +1,28 @@
{ pkgs, lib, ...}:
{ pkgs, lib, inputs, ...}:
{
imports = [
../../vscodium.nix
];
home.packages = with pkgs; [
aacs
brew
];
home.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/"
]);
home = {
packages = with pkgs; [
aacs
bitwarden-cli
bruno
direnv
home-manager
pipenv
];
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 = "/home/gregory.hellings";
};
}
home/ssh/authorized_keys
+1
View File
@@ -6,3 +6,4 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDR4vmc5TiymSjMB7E+oYsiTxOg+2xwnLAILYjQKPA7
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINAX6pNx5mbwIa8X+GzktyNijfYmJUpgROFpRxSW9js0 greg@linode
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQCXP9nxL5Hg1R1AtT78zJl+ObCDZsnWWAqAYhTVjpRvYpiTbODvCf2IImvUsLGMdgo/xdSSzNqQcK6+KZVeNbvRSsw0ssWw7ggYnhw/yyv/KDZwnqXsppeucicnwpQNvts154yOqAvuuMaOYCTTQoOVvecDdgtA3svIpfxL3vVB/Mq/Ns/NwoE9XKz3NBYlWytqDcvSwR6Les7RzbMIs6axSfMVNwm9w41dG1NqDMteLjKlQ8bFfrtWXZ4QHKlnEWatOgJIzbP1hU91JvvzfypjleGuE9EBCSayqhu9PuxJ1/yxMJKSMaXUl8SoPMLsPNr1ZS5ZNjkNCvZK4fI+CqyAXtbgeSGKIKqZhg9z6/fR9SG0l3Gh3Prtw+AEuE+Xzb99Bi4IAe8lTaL+lw+z+CmsXR+kcJ4nnNrmf1fnDsI4l1EctVGb3Yt3tutV6GjB4mDjIYKwNBxuIx8hlugmZIy3oEUGrh85o5wnXlJQzmhszS4eas99dj1L5tj5dF4O/ED7SyQI5e7V9Pb5AgolcvLLXcFzDuy43oU8kWvQJMMvbEIFr6qPXWmp8MvrSTucRQCCzWJVudhrYhodXA56tRoJvFIRs0s12p/YXzsmJbKxPiVwLGOlCd2CqbdM2rCqN2LkUeOAQitb/8wv4njRKZ4lgqhjyXnBtoD2Nm/NmuIERoUY9J21dOhc2tg0zLvH120xVKa+WN5HVOOG9LyKl7koyc8nqdSDKFhcN4joYmnZKfyJUJzQIhiQayEfvWfTNJiNVkMIE2OqQ4O64s/7QzOHeHSMzY4TCO7+5bK9ecOqPxCDHLHhO0xVA3/w4FscRkObjkQ6zv3UCFJTSbr4YkdUIk8OtRR2KN9y9txrt/OS1l1DigVyuYUdz/L83+Y8E8d3l0hq/S1YLMwlkCbHE8hm0HxlLuyTA3OqXizRxNk7w4ku9OC4+nHrj03i2apNG0Z/ojcGsJxSBLhPGlPWbDJ2h7YL+lkDZFitdhBZHjIQKC2dNoretA8zEzNk48Pi829NFRuXqjSsq3iOJ1sXP/lMAZvdzbZOQ8CrH5SWb9GDeWR0uh76RXzKXvv5UTtu1PpYj/BHToApc8kUAxpUh3ypjt6bS7XLYtk74PEZHD3HXbpBYBnMNPUp2ecDw6rxpLxq3rnzROriX4Uvy0sOx8Q13ZgrZwxLeEWImlK9qQT4SYytGGxt4vwG0R2B8zS1xNiNC/B8jnBrK4GwnYSuJwNMrJ8vk1u9gn1pCj51RslBsldVzVB30jxNU74iD/WQGJudJrUAYkQ5EpArKZK0GQfaRXM6VzsvyLBA02CZJkeIU0jUc6Q1Nms+C8teKrP8+EKXONT/igsLXwfLMiR2CqVP greg@nixos
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFWPSFQT0AH77wrwRhiskcBS0w4ZakBRdJywYYBsnm3S greg@genesis
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMYzms+KIe5/bYF3uCyFjA5e1AgMPLIA3c4k417coqBe gregory.hellings@ls23003
home/vim.nix
+6 -7
View File
@@ -80,23 +80,22 @@ in
};
};
plugins = {
airline.enable = true;
airline = {
enable = true;
theme = "gruvbox";
};
gitgutter.enable = true;
gruvbox.enable = true;
fugitive.enable = true;
notify.enable = true;
packer = {
enable = true;
plugins = [
];
};
};
extraConfigLua = builtins.readFile ./vim/extra.lua;
extraConfigVim = builtins.readFile ./vim/extra.vimrc;
extraPlugins = with pkgs.vimPlugins; [
bufexplorer
gruvbox
nerdtree
nvim-cmp
packer-nvim
#jedi-vim
home/xonsh.nix
+4
View File
@@ -41,6 +41,10 @@
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";
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";
d = "vox deactivate";
hosts/default.nix
+7 -3
View File
@@ -1,14 +1,18 @@
{ inputs, overlays, ... }:
let
wsl = args: (unstable (args // { extraMods = [ inputs.wsl.nixosModules.wsl ]; }));
unstable = args: (machine (args // { channel = inputs.nixunstable; }));
unstable = args: (machine (args // {
channel = inputs.nixunstable;
hm = inputs.hmunstable;
}));
machine = {
channel ? inputs.nixstable,
extraMods ? [],
gnome ? false,
gui ? false,
name,
system ? "x86_64-linux"
system ? "x86_64-linux",
hm ? inputs.hm
}:
let
nixpkgs = import channel {
@@ -30,7 +34,7 @@ let
};
}
inputs.agenix.nixosModules.default
inputs.hm.nixosModules.home-manager
hm.nixosModules.home-manager
../modules-all
../modules-linux
./${name}
hosts/jude/boot.nix
-2
View File
@@ -2,7 +2,6 @@
{
# Use the systemd-boot EFI boot loader.
#boot.loader.systemd-boot.enable = true;
boot = {
supportedFilesystems = [ "ntfs" ];
loader = {
@@ -31,5 +30,4 @@
#efi.canTouchEfiVariables = true;
};
};
networking.interfaces.enp4s0.useDHCP = true;
}
hosts/jude/default.nix
+1 -1
View File
@@ -16,8 +16,8 @@
networking = {
hostName = "jude";
enableIPv6 = false;
interfaces.enp37s0.useDHCP = true;
};
#systemd.oomd.enable = false;
greg = {
tailscale.enable = true;
gnome.enable = true;
modules-linux/default.nix
+1
View File
@@ -17,6 +17,7 @@
environment.systemPackages = with pkgs; [
coreutils-full
efibootmgr
psmisc
lshw
];
overlays/hms.sh
+4 -26
View File
@@ -2,35 +2,13 @@
set -eo pipefail
# Build different targets with GUI or not
arch="$(uname -m)"
if [ "$(uname -s)" == "Darwin" ]; then
# On macOS
src="${HOME}/.config/darwin/"
flavor="gui"
if [ "${arch}" == "arm64" ]; then
arch=aarch64
fi
arch="${arch}-darwin"
elif [ x"${WSL_DISTRO_NAME}" != "x" ]; then
src=/etc/nixos
flavor="cli"
arch="${arch}-linux"
else
# On Linux systems
if [ -z "${DISPLAY}" ]; then
flavor="cli"
else
flavor="gdm"
fi
src=/etc/nixos
arch="${arch}-linux"
fi
# Build and switch
echo "Building ${flavor}.${arch}"
user="$(whoami)"
src="${HOME}/.config/nix"
echo "Building ${user}"
dest=$(mktemp -d)
pushd "${dest}" > /dev/null
nix build "${src}#homeConfigurations.${flavor}.${arch}.activationPackage"
nix build "${src}#homeConfigurations.\"${user}\".activationPackage"
./result/activate
popd > /dev/null
rm -r "${dest}"
overlays/setup-ssh.nix
+2 -2
View File
@@ -1,3 +1,3 @@
{ pkgs, ... }:
{ pkgs, gh, ... }:
pkgs.writeShellScriptBin "setup-ssh" (builtins.readFile ./setup-ssh.sh)
pkgs.writeShellScriptBin "setup-ssh" (builtins.replaceStrings ["gh "] ["${gh}/bin/gh "] (builtins.readFile ./setup-ssh.sh))