@@ -1,12 +1,7 @@
|
|||||||
{
|
{
|
||||||
general = {
|
general = {
|
||||||
<<<<<<< HEAD
|
|
||||||
Hostname = "hakase";
|
Hostname = "hakase";
|
||||||
Username = "lsoriano";
|
Username = "lsoriano";
|
||||||
=======
|
|
||||||
Hostname = "TEXAS";
|
|
||||||
Username = "kenji";
|
|
||||||
>>>>>>> parent of 3ebe0c9 (udp)
|
|
||||||
Timezone = "America/Chicago";
|
Timezone = "America/Chicago";
|
||||||
|
|
||||||
allowUnfree = true; # allows installation of commercial apps.
|
allowUnfree = true; # allows installation of commercial apps.
|
||||||
|
|||||||
@@ -5,19 +5,12 @@
|
|||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
<<<<<<< HEAD
|
|
||||||
../../modules/dev.nix
|
../../modules/dev.nix
|
||||||
=======
|
|
||||||
../../system/dev/macos.nix
|
|
||||||
>>>>>>> parent of 3ebe0c9 (udp)
|
|
||||||
];
|
];
|
||||||
# List packages installed in system profile. To search by name, run:
|
# List packages installed in system profile. To search by name, run:
|
||||||
# $ nix-env -qaP | grep wget
|
# $ nix-env -qaP | grep wget
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
python313
|
python313
|
||||||
>>>>>>> parent of 3ebe0c9 (udp)
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Auto upgrade nix package and the daemon service.
|
# Auto upgrade nix package and the daemon service.
|
||||||
|
|||||||
Reference in New Issue
Block a user