Move jrpotter to top-level.

main
Joshua Potter 2023-12-10 11:58:13 -07:00
parent 289dd15ab3
commit f7a592c094
32 changed files with 45 additions and 60 deletions

View File

@ -189,12 +189,12 @@
},
"locked": {
"lastModified": 1,
"narHash": "sha256-w34b9SS0gjjLG3TGyHlSym5j2KeAgRnjFAeAnSIiF7s=",
"path": "./framework",
"narHash": "sha256-Vhq9jZLDEPDZPxrL8yiMsEAz7AWySO0a5WDCMXRRorU=",
"path": "./hive/framework",
"type": "path"
},
"original": {
"path": "./framework",
"path": "./hive/framework",
"type": "path"
}
},
@ -349,11 +349,11 @@
"locked": {
"lastModified": 1,
"narHash": "sha256-uviT1vNgSZnpddGqgHZUwKDPl/VYRz92X7hnw72yiTY=",
"path": "./phobos",
"path": "./hive/phobos",
"type": "path"
},
"original": {
"path": "./phobos",
"path": "./hive/phobos",
"type": "path"
}
},

View File

@ -3,8 +3,8 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
framework.url = "path:./framework";
phobos.url = "path:./phobos";
framework.url = "path:./hive/framework";
phobos.url = "path:./hive/phobos";
};
outputs = { nixpkgs, framework, phobos, ... }:
@ -16,6 +16,11 @@
meta = {
nixpkgs = import nixpkgs { inherit system; };
specialArgs = { inherit system; };
nodeSpecialArgs = {
framework = {
jrpotter = import ./users/jrpotter;
};
};
};
# Local machines. Deploy using `colmena apply-local [--sudo]`

View File

@ -1,15 +1,5 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running `nixos-help`).
{ pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
boot.loader = {
efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
@ -52,10 +42,7 @@
};
};
# After 23.05, this option is called `fonts.packages`.
fonts.fonts = with pkgs; [
iosevka
];
fonts.fonts = with pkgs; [ iosevka ];
hardware.bluetooth.enable = true;
@ -88,34 +75,10 @@
time.timeZone = "America/Denver";
# Don't forget to set a password with `passwd`.
users.users.jrpotter = {
isNormalUser = true;
extraGroups = [
"docker"
"networkmanager"
"wheel" # Enable `sudo` for the user.
];
};
virtualisation.docker.rootless = {
enable = true;
# Sets the `DOCKER_HOST` variable to the rootless Docker instance for normal
# users by default.
setSocketVariable = true;
};
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
# system.copySystemConfiguration = true;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It's perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.05";
}

View File

@ -14,26 +14,43 @@
};
outputs = { bootstrap, home-manager, ... }: {
nixosModules.default = { pkgs, system, ... }:
nixosModules.default = { pkgs, system, jrpotter, ... }:
let
jrpotter-home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.jrpotter = import ./jrpotter;
# Used to pass non-default parameters to submodules.
extraSpecialArgs = {
inherit system;
bootstrap = bootstrap.packages.${system}.default;
};
};
# This value determines the NixOS and home-manager release from which
# the default settings for stateful data, like file locations and
# database versions on your system were taken. This should probably
# never change.
stateVersion = "23.05";
in
{
imports = [
./hardware-configuration.nix
./configuration.nix
home-manager.nixosModules.home-manager
{ home-manager = jrpotter-home-manager; }
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.jrpotter = jrpotter;
# Used to pass non-default parameters to submodules.
extraSpecialArgs = {
inherit system stateVersion;
bootstrap = bootstrap.packages.${system}.default;
};
};
users.users.jrpotter = {
isNormalUser = true;
extraGroups = [
"docker"
"networkmanager"
"wheel"
];
};
system.stateVersion = stateVersion;
};
};
}

View File

@ -1,4 +1,4 @@
{ pkgs, bootstrap, ... }:
{ pkgs, bootstrap, stateVersion, ... }:
{
imports = [
./bash
@ -52,5 +52,5 @@
# You can update Home Manager without changing this value.
# See the Home Manager release notes for a list of state
# version changes in each release.
home.stateVersion = "23.05";
home.stateVersion = stateVersion;
}