Compare commits

...

3 Commits

Author SHA1 Message Date
b5efafcb45 switch to Lix, re-indent 2024-05-05 21:28:20 -08:00
8ada6bf851 update versions of things 2024-05-05 20:03:05 -08:00
f7facb86c0 add openssl and sbcl 2024-05-05 20:02:48 -08:00
5 changed files with 298 additions and 186 deletions

View File

@ -101,6 +101,10 @@
sg3_utils sg3_utils
nfs-utils nfs-utils
fontconfig fontconfig
openssl
openssl.dev
openssl.out
sbcl
# cmake # cmake
# harfbuzz # harfbuzz
# freetype # freetype

View File

@ -9,11 +9,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1711325419, "lastModified": 1714264490,
"narHash": "sha256-dKZUWMB4py9rhefu1lsrCrwksK4WX/dtW8Ma807KyPA=", "narHash": "sha256-5hKsAO7ZLwOLCXeI5+jDmDr7t4zBezk0xidVWghoBB0=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "93e85575f63b32b9996676513d95288fc1c87ca9", "rev": "4fac534b775aa0c40611257fa19ab8ab3243f4dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -66,6 +66,39 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -73,11 +106,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710888565, "lastModified": 1714043624,
"narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,11 +127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711133180, "lastModified": 1714343445,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "narHash": "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "rev": "9fe79591c1005ce6f93084ae7f7dab0a2891440d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -129,6 +162,48 @@
"type": "github" "type": "github"
} }
}, },
"lix": {
"flake": false,
"locked": {
"lastModified": 1714955862,
"narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
"ref": "refs/tags/2.90-beta.1",
"rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
"revCount": 15501,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
"original": {
"ref": "refs/tags/2.90-beta.1",
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": [
"lix"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1714868057,
"narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=",
"ref": "refs/heads/main",
"rev": "e31baf57680bab449ab5b40179cc4a08a99f5314",
"revCount": 62,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
}
},
"mir-home": { "mir-home": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
@ -167,11 +242,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1711163522, "lastModified": 1714253743,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,11 +274,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1711657659, "lastModified": 1714340308,
"narHash": "sha256-kdMlKb5nWzi+EUNdpyEBKjKL/ZY75T2cngH+zfKN+Vo=", "narHash": "sha256-2uX/VxxNTvxa0FZ5yY2BZDmMCtQVocqa6wdOC8YmzDE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "7d11a87bb73d00d9fd5829b9eac36107bcdc2e28", "rev": "53a8759e2675301db38ae5cc17aa9b954a936e9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,6 +294,8 @@
"emacs-config": "emacs-config", "emacs-config": "emacs-config",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable", "home-manager-unstable": "home-manager-unstable",
"lix": "lix",
"lix-module": "lix-module",
"mir-home": "mir-home", "mir-home": "mir-home",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
@ -240,6 +317,21 @@
"repo": "rust-overlay", "repo": "rust-overlay",
"type": "github" "type": "github"
} }
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

351
flake.nix
View File

@ -8,6 +8,15 @@
url = "github:tpwrules/nixos-apple-silicon"; url = "github:tpwrules/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
lix = {
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
flake = false;
};
lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module";
inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs";
};
nur.url = github:nix-community/NUR; nur.url = github:nix-community/NUR;
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-23.11";
@ -30,175 +39,177 @@
}; };
}; };
outputs = inputs@{ outputs = inputs@{
self, self,
nixpkgs, nixpkgs,
nixpkgs-unstable, nixpkgs-unstable,
home-manager, lix-module,
nur, home-manager,
... }: { nur,
nixosConfigurations = { ... }: {
kremzeek = # {{{ nixosConfigurations = {
let kremzeek = # {{{
system = "x86_64-linux"; let
specialArgs = { inherit inputs; }; system = "x86_64-linux";
modules = [ specialArgs = { inherit inputs; };
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix" { modules = [
networking.wireless.enable = false; "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix" {
} networking.wireless.enable = false;
./configuration.nix { }
networking.hostName = "kremzeek"; ./configuration.nix {
boot.loader.efi.canTouchEfiVariables = true; networking.hostName = "kremzeek";
# sound.enable = true; boot.loader.efi.canTouchEfiVariables = true;
# hardware.pulseaudio.enable = true; # sound.enable = true;
} # hardware.pulseaudio.enable = true;
home-manager.nixosModules.home-manager }
{ home-manager.nixosModules.home-manager
home-manager.useGlobalPkgs = true; {
home-manager.useUserPackages = true; home-manager.useGlobalPkgs = true;
home-manager.users.mir = import ./home.nix; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = specialArgs; home-manager.users.mir = import ./home.nix;
} home-manager.extraSpecialArgs = specialArgs;
]; # end of modules }
in ]; # end of modules
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}} in
galvatron = # {{{ nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
let galvatron = # {{{
system = "aarch64-linux"; let
specialArgs = { inherit inputs; }; system = "aarch64-linux";
modules = [ specialArgs = { inherit inputs; };
./configuration.nix { modules = [
services.xserver.videoDrivers = [ "modesetting" ]; ./configuration.nix {
boot.binfmt.emulatedSystems = ["x86_64-linux"]; services.xserver.videoDrivers = [ "modesetting" ];
hardware.asahi = { boot.binfmt.emulatedSystems = ["x86_64-linux"];
peripheralFirmwareDirectory = ./galvatron/firmware; hardware.asahi = {
# useExperimentalGPUDriver = true; peripheralFirmwareDirectory = ./galvatron/firmware;
# experimentalGPUInstallMode = "driver"; # useExperimentalGPUDriver = true;
# experimentalGPUInstallMode = "overlay"; # experimentalGPUInstallMode = "driver";
}; # experimentalGPUInstallMode = "overlay";
boot.loader.efi.canTouchEfiVariables = false; };
networking = { boot.loader.efi.canTouchEfiVariables = false;
hostName = "galvatron"; networking = {
hostId = "57184c38"; hostName = "galvatron";
}; hostId = "57184c38";
sound.enable = true; # only on unstable? };
} sound.enable = true; # only on unstable?
./hardware/galvatron-hw.nix }
./modules/sound/pipewire.nix ./hardware/galvatron-hw.nix
inputs.apple-silicon.nixosModules.apple-silicon-support ./modules/sound/pipewire.nix
inputs.home-manager-unstable.nixosModules.home-manager { inputs.apple-silicon.nixosModules.apple-silicon-support
home-manager.useGlobalPkgs = true; inputs.home-manager-unstable.nixosModules.home-manager {
home-manager.useUserPackages = true; home-manager.useGlobalPkgs = true;
home-manager.users.mir = import ./home.nix; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = specialArgs; home-manager.users.mir = import ./home.nix;
} home-manager.extraSpecialArgs = specialArgs;
]; # end of modules }
in ]; # end of modules
nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}} in
breakdown = # {{{ nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
let breakdown = # {{{
system = "x86_64-linux"; let
specialArgs = { inherit inputs; }; system = "x86_64-linux";
modules = [ specialArgs = { inherit inputs; };
./configuration.nix { modules = [
networking = { ./configuration.nix {
hostName = "breakdown"; networking = {
hostId = "3ba70c47"; hostName = "breakdown";
}; hostId = "3ba70c47";
boot.loader.efi.canTouchEfiVariables = true; };
sound.enable = true; boot.loader.efi.canTouchEfiVariables = true;
} sound.enable = true;
./server/services.nix }
# ./hardware/breakdown-hw.nix ./server/services.nix
./hardware/generic.nix # ./hardware/breakdown-hw.nix
./modules/sound/pipewire.nix ./hardware/generic.nix
home-manager.nixosModules.home-manager ./modules/sound/pipewire.nix
{ home-manager.nixosModules.home-manager
home-manager.useGlobalPkgs = true; {
home-manager.useUserPackages = true; home-manager.useGlobalPkgs = true;
home-manager.users.mir = import ./home.nix; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = specialArgs; home-manager.users.mir = import ./home.nix;
} home-manager.extraSpecialArgs = specialArgs;
]; # end of modules }
in ]; # end of modules
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}} in
starscream = # {{{ nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
let starscream = # {{{
system = "x86_64-linux"; let
specialArgs = { inherit inputs; }; system = "x86_64-linux";
modules = [ specialArgs = { inherit inputs; };
./configuration.nix { modules = [
services.xserver.videoDrivers = [ "modesetting" "displaylink" ]; ./configuration.nix {
networking.hostName = "starscream"; services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
boot.loader.efi.canTouchEfiVariables = true; networking.hostName = "starscream";
sound.enable = true; boot.loader.efi.canTouchEfiVariables = true;
} sound.enable = true;
./hardware/starscream-hw.nix }
./modules/sound/pipewire.nix ./hardware/starscream-hw.nix
home-manager.nixosModules.home-manager ./modules/sound/pipewire.nix
{ home-manager.nixosModules.home-manager
home-manager.useGlobalPkgs = true; {
home-manager.useUserPackages = true; home-manager.useGlobalPkgs = true;
home-manager.users.mir = import ./home.nix; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = specialArgs; home-manager.users.mir = import ./home.nix;
} home-manager.extraSpecialArgs = specialArgs;
]; # end of modules }
in ]; # end of modules
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}} in
knockout = # {{{ nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
let knockout = # {{{
system = "x86_64-linux"; let
specialArgs = { inherit inputs; }; system = "x86_64-linux";
modules = [ specialArgs = { inherit inputs; };
# inputs.nur.nixosModules.nur modules = [
./configuration.nix { # inputs.nur.nixosModules.nur
services.xserver.videoDrivers = [ "modesetting" "displaylink" ]; lix-module.nixosModules.default
boot.loader.efi.canTouchEfiVariables = true; ./configuration.nix {
networking = { services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
hostName = "knockout"; boot.loader.efi.canTouchEfiVariables = true;
hostId = "499130bf"; networking = {
}; hostName = "knockout";
sound.enable = true; hostId = "499130bf";
} };
./modules/droidcam-obs.nix # only this machine sound.enable = true;
./hardware/knockout-hw.nix }
./modules/sound/pipewire.nix ./modules/droidcam-obs.nix # only this machine
inputs.home-manager-unstable.nixosModules.home-manager ./hardware/knockout-hw.nix
{ ./modules/sound/pipewire.nix
home-manager.useGlobalPkgs = true; inputs.home-manager-unstable.nixosModules.home-manager
home-manager.useUserPackages = true; {
home-manager.users.mir = import ./home.nix; home-manager.useGlobalPkgs = true;
home-manager.extraSpecialArgs = specialArgs; home-manager.useUserPackages = true;
} home-manager.users.mir = import ./home.nix;
]; # end of modules home-manager.extraSpecialArgs = specialArgs;
in }
inputs.nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}} ]; # end of modules
in
inputs.nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
ravage = # {{{ ravage = # {{{
let let
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./configuration.nix { ./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ]; services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
networking = { networking = {
hostName = "ravage"; hostName = "ravage";
hostId = "c53d3e32"; hostId = "c53d3e32";
}; };
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true; sound.enable = true;
} }
./hardware/ravage-hw.nix ./hardware/ravage-hw.nix
./modules/sound/pipewire.nix ./modules/sound/pipewire.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix; home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs; home-manager.extraSpecialArgs = specialArgs;
} }
]; # end of modules ]; # end of modules
in in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}} nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
}; };
}; };
} }

View File

@ -25,7 +25,6 @@ with lib.hm.gvariant;
pkgs.eza pkgs.eza
pkgs.python3 pkgs.python3
pkgs.unzip pkgs.unzip
pkgs.devenv
# pkgs.gnupg # pkgs.gnupg
# pkgs.python3 # pkgs.python3
# (pkgs.python3.withPackages( # (pkgs.python3.withPackages(

View File

@ -4,6 +4,12 @@
nix.settings.extra-experimental-features = [ "nix-command" "flakes" ]; nix.settings.extra-experimental-features = [ "nix-command" "flakes" ];
nix.settings.cores = 2; nix.settings.cores = 2;
nix.settings.max-jobs = 4; nix.settings.max-jobs = 4;
nix.settings.extra-substituters = [
"https://cache.lix.systems"
];
nix.settings.trusted-public-keys = [
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
];
nix.buildMachines = [{ nix.buildMachines = [{
hostName = "unicron"; hostName = "unicron";
system = "x86_64-linux"; system = "x86_64-linux";