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
2022-06-10 01:12:34 -05:00
parent b93650b198 899cfba9eb
commit 622645a57a
12 changed files with 92 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+14 -14
View File
@@ -25,16 +25,16 @@
]
},
"locked": {
"lastModified": 1651519540,
"narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=",
"lastModified": 1654113405,
"narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0",
"rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-21.11",
"ref": "release-22.05",
"repo": "home-manager",
"type": "github"
}
@@ -57,27 +57,27 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1652881001,
"narHash": "sha256-k9JmPCojaJnqGz4aRXXT1HZqJKHCXijoMfBAb24abXk=",
"lastModified": 1654005557,
"narHash": "sha256-J6elwUzPoco+r5qWPHhvS2EHVWomUtNcxzkfdAQOwEU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2d474d6a4a43a0348b78db68dc00c491032cf5cf",
"rev": "08950a6e29cf7bddee466592eb790a417550f7f9",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.11",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixunstable": {
"locked": {
"lastModified": 1652794215,
"narHash": "sha256-erVj41IcCPDWdt8CwT60ygD+SY/uhqip3RXwiESOCVk=",
"lastModified": 1653931853,
"narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "242efdc5a5aff8222c1152c0e4b9262bd02915b6",
"rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457",
"type": "github"
},
"original": {
@@ -89,11 +89,11 @@
},
"nur": {
"locked": {
"lastModified": 1652997257,
"narHash": "sha256-vF4ji8t3ZgwjhGH0nrlO1n4AhsOfL7H4eGSP10BKj/k=",
"lastModified": 1654123271,
"narHash": "sha256-xM85/VFYu8I8jZiZ7U0CmZO/98sHO7+f7PIMxQVZXCM=",
"owner": "nix-community",
"repo": "NUR",
"rev": "4ab0b3bc0bcfa401360cac1f77a4355589c465f7",
"rev": "4c83235ccca7cfcf34fee9f49023f21c0e9db128",
"type": "github"
},
"original": {
flake.nix
+10 -9
View File
@@ -5,38 +5,39 @@
description = "Greg's machines!";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
nixunstable.url = "github:nixos/nixpkgs/nixos-unstable";
agenix.url = "github:ryantm/agenix";
home-manager = {
url = "github:nix-community/home-manager/release-21.11";
url = "github:nix-community/home-manager/release-22.05";
inputs.nixpkgs.follows = "nixpkgs";
};
nur.url = "github:nix-community/NUR";
};
outputs = inputs:
outputs = {nixpkgs, nixunstable, agenix, home-manager, nur, self}@inputs:
let
local_overlay = import ./overlays;
mods = hostname: [
{ nixpkgs.overlays = [ inputs.nur.overlay local_overlay ]; }
inputs.agenix.nixosModule
{ nixpkgs.overlays = [ nur.overlay local_overlay ]; }
agenix.nixosModule
./modules
./profiles/base
./hosts/${hostname}
inputs.home-manager.nixosModules.home-manager {
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.greg = import ./home/home.nix "greg";
home-manager.users.root = import ./home/home.nix "root";
home-manager.extraSpecialArgs = {
nixunstable = inputs.nixunstable;
inherit nixunstable;
};
}
];
machine = system: name: inputs.nixpkgs.lib.nixosSystem {
system = system;
machine = system: name: nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = inputs;
modules = mods name;
};
home/ansible.nix
+28
View File
@@ -0,0 +1,28 @@
{ ... }:
{
home.file.".ansible.cfg".text = ''
[defaults]
forks=10
host_key_checking=False
# Also available: profile_roles
callback_enabled=timer,profile_tasks
stdout_callback=yaml
nocows=1
cow_selection=tux
collections_path=~/src
[ssh_connection]
pipelining=True
ssh_args = -o ControlMaster=auto -o ControlPersist=600s -o IdentitiesOnly=yes -o GSSAPIAuthentication=no -o StrictHostKeyChecking=no
control_path=%(directory)s/%%h-%%r
control_path_dir=/tmp
[callback_profile_tasks]
sort_order=descending
[galaxy]
role_skeleton_ignore = ^.git$,^.*/.git_keep$,\..*.swp
role_skeleton = ~/src/ansible_collections/meta_ansible_templates/role
'';
}
home/direnv.nix
-1
View File
@@ -4,7 +4,6 @@
programs.direnv = {
enable = true;
nix-direnv.enable = true;
nix-direnv.enableFlakes = true;
};
home.packages = [
home/gui/default.nix
+5 -1
View File
@@ -1,4 +1,4 @@
{ ... }:
{ pkgs, ... }:
{
imports = [
@@ -6,4 +6,8 @@
./firefox.nix
./terminal.nix
];
home.packages = with pkgs; [
onlyoffice-bin
];
}
home/gui/firefox.nix
+6 -1
View File
@@ -13,11 +13,16 @@ in with lib;
{
programs.firefox = {
enable = true;
enableGnomeExtensions = true;
package = pkgs.firefox-wayland.override {
cfg = {
enableGnomeExtensions = true;
};
};
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
keepassxc-browser
octotree
refined-github
tree-style-tab
ublock-origin
];
profiles = {
home/home.nix
+2
View File
@@ -7,6 +7,7 @@ let
in {
imports = [
./modules
./ansible.nix
./bash.nix
./direnv.nix
./git.nix
@@ -18,4 +19,5 @@ in {
home.username = name;
home.homeDirectory = if name == "root" then "/root" else "/home/${name}";
home.stateVersion = "21.11";
}
home/xonsh.nix
+1
View File
@@ -41,6 +41,7 @@ in {
devroles = "cd ~/src/ansible_collections/devroles";
molcol = "molecule -c ../../tests/molecule.yml";
pa = "cd ~/src/packaging";
dirflake = "nix flake new -t github:nix-community/nix-direnv";
};
configHeader = ''
hosts/jude/default.nix
+1
View File
@@ -5,6 +5,7 @@
./boot.nix
./hardware-configuration.nix
./podman.nix
./printing.nix
./virt.nix
];
networking.hostName = "jude";
hosts/jude/printing.nix
+12
View File
@@ -0,0 +1,12 @@
{ pkgs, ... }:
{
# ipp://printer.thehellings.lan:631/ - generic postscript printer
services.printing = {
enable = true;
drivers = with pkgs; [
gutenprint
gutenprintBin
];
};
}
hosts/jude/virt.nix
+12 -6
View File
@@ -12,14 +12,20 @@
# Give my user access to the libvirtd process
users.users.greg.extraGroups = [ "libvirtd" ];
virtualisation.libvirtd = {
enable = true;
onBoot = "ignore"; # Do not auto-restart VMs on boot, unless they are marked autostart
virtualisation = {
libvirtd = {
enable = true;
onBoot = "ignore"; # Do not auto-restart VMs on boot, unless they are marked autostart
};
waydroid = {
enable = true;
};
virtualbox.host.enable = true;
};
virtualisation.waydroid = {
enable = true;
};
users.extraGroups.vboxusers.members = [ "greg" ];
boot.extraModprobeConfig = "options kvm_amd nested=1";
}
profiles/base/programs.nix
+1
View File
@@ -20,6 +20,7 @@ in {
pwgen
tmux
transcrypt
unzip
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
wget
yamllint # Used in vim