adds packages per hostname

adds unstable nixpkgs for vscode, docker, go and ollama
updates tilingshell layouts
This commit is contained in:
2024-11-05 15:07:37 +01:00
parent 55d2a96a33
commit 9c28dfe6ae
25 changed files with 271 additions and 284 deletions

View File

@@ -30,7 +30,7 @@
# Enable experimental nix-command flakes
nix = {
package = pkgs.nixFlakes;
package = pkgs.nixVersions.stable;
extraOptions = ''
experimental-features = nix-command flakes
'';

View File

@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1730327045,
"narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "080166c15633801df010977d9d7474b4a6c549d7",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
@@ -16,9 +16,26 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1730531603,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
}
}
},

View File

@@ -3,44 +3,67 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
};
outputs =
{ self, nixpkgs }:
{
self,
nixpkgs,
nixpkgs-unstable,
}:
let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
in
{
nixosConfigurations = {
"mennos-laptop" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
inherit system;
modules = [
./hardware/mennos-laptop.nix
./common/workstation.nix
./configuration.nix
];
specialArgs = {
inherit pkgs-unstable;
isWorkstation = true;
isServer = false;
};
};
"mennos-gamingpc" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
inherit system;
modules = [
./hardware/mennos-gamingpc.nix
./common/workstation.nix
./configuration.nix
];
specialArgs = {
inherit pkgs-unstable;
isWorkstation = true;
isServer = false;
};
};
"mennos-server" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
inherit system;
modules = [
./hardware/mennos-server.nix
./common/server.nix
./configuration.nix
];
specialArgs = {
inherit pkgs-unstable;
isWorkstation = false;
isServer = true;
};

View File

@@ -10,9 +10,7 @@
networking.hostName = "mennos-laptop";
# Enable OpenGL
hardware.opengl = {
enable = true;
};
hardware.opengl.enable = true;
# Load nvidia driver for Xorg and Wayland
services.xserver.videoDrivers = [ "nvidia" ];

View File

@@ -10,9 +10,7 @@
networking.hostName = "mennos-server";
# Enable OpenGL
# hardware.opengl = {
# enable = true;
# };
# hardware.opengl.enable = true;
# # Load nvidia driver for Xorg and Wayland
# services.xserver.videoDrivers = [ "nvidia" ];

View File

@@ -1,4 +1,9 @@
{ config, pkgs, ... }:
{
config,
pkgs,
pkgs-unstable,
...
}:
{
boot.kernelModules = [ "kvm-amd" ];
@@ -10,6 +15,7 @@
virtualisation = {
docker = {
enable = true;
package = pkgs-unstable.docker;
autoPrune.enable = true;
daemon.settings = {
"live-restore" = false;