framework-2024-09-17-18-14-56

This commit is contained in:
Alexander Szczepanski
2024-09-17 18:14:56 +02:00
parent 95eaa7840f
commit 84cf4f9393
9 changed files with 83 additions and 73 deletions

View File

@ -1,31 +0,0 @@
{ pkgs, ... }:
{
users.extraGroups.vboxusers.members = [ "alex" ];
virtualisation = {
virtualbox.host ={
enable = true;
# enableExtensionPack = true;
};
libvirtd = {
enable = true;
qemu = {
package = pkgs.qemu_kvm;
swtpm.enable = true;
ovmf = {
enable = true;
packages = [
(pkgs.OVMF.override {
secureBoot = true;
tpmSupport = true;
}).fd
];
};
};
};
spiceUSBRedirection.enable = true;
};
environment.systemPackages = with pkgs; [ proot virtiofsd ];
}

View File

@ -88,7 +88,7 @@
cursor #e9e9e9
selection_background #424242
color0 #000000
color8 #000000
color8 #555555
color1 #d44d53
color9 #d44d53
color2 #b9c949

View File

@ -21,9 +21,6 @@
"wheel"
"docker"
"networkmanager"
"libvirtd"
"qemu-libvirtd"
"kvm"
"lp"
"nginx"
"scanner"

35
configs/virtualisation.nix Executable file
View File

@ -0,0 +1,35 @@
{ pkgs, ... }:
{
users.extraGroups.vboxusers.members = [ "alex" ];
# "libvirtd"
# "qemu-libvirtd"
# "kvm"
virtualisation = {
virtualbox.host ={
enable = true;
enableExtensionPack = true;
};
# libvirtd = {
# enable = true;
# qemu = {
# package = pkgs.qemu_kvm;
# swtpm.enable = true;
# ovmf = {
# enable = true;
# packages = [
# (pkgs.OVMF.override {
# secureBoot = true;
# tpmSupport = true;
# }).fd
# ];
# };
# };
# };
# spiceUSBRedirection.enable = true;
};
# environment.systemPackages = with pkgs; [ proot virtiofsd ];
}

48
flake.lock generated
View File

@ -9,11 +9,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1726434563,
"narHash": "sha256-RtcOyhSkgGnrPQ/0xCcsbpgo+AZR81fjtR1wj5qXqYU=",
"lastModified": 1726576520,
"narHash": "sha256-qkaiUpE3qRXunKbUzMaTGTMzF8nv534oglJY4a2hxNY=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "93e6cdc6335d9c7652e89466b5e05a3cce836906",
"rev": "4409a04839fc8c911ef3e461bb5f422ae1d03a85",
"type": "github"
},
"original": {
@ -32,11 +32,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1726230467,
"narHash": "sha256-YyMNF7IFyysZ2KeqEO6AmV3nQeaDSxyNXLdHp1ghO60=",
"lastModified": 1726468443,
"narHash": "sha256-O1VcbVBrqIf58U05yFXl9+J7XM2qh0I+7vqMbNwZPq0=",
"owner": "nix-community",
"repo": "fenix",
"rev": "43efa7a3a97f290441bd75b18defcd4f7b8df220",
"rev": "effac20e9560aab202e82b6d833f685163a9c138",
"type": "github"
},
"original": {
@ -105,11 +105,11 @@
]
},
"locked": {
"lastModified": 1726222338,
"narHash": "sha256-KuA8ciNR8qCF3dQaCaeh0JWyQUgEwkwDHr/f49Q5/e8=",
"lastModified": 1726440980,
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "503af483e1b328691ea3a434d331995595fb2e3d",
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
"type": "github"
},
"original": {
@ -202,11 +202,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1726243404,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"lastModified": 1726463316,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github"
},
"original": {
@ -234,11 +234,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1726243404,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"lastModified": 1726463316,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github"
},
"original": {
@ -250,11 +250,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1726320982,
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
"lastModified": 1726447378,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"type": "github"
},
"original": {
@ -278,11 +278,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1725985110,
"narHash": "sha256-0HKj+JI6rtxaE6Kzcd6HyFNbEFJRsLy5DoNgVF1pyRM=",
"lastModified": 1726443025,
"narHash": "sha256-nCmG4NJpwI0IoIlYlwtDwVA49yuspA2E6OhfCOmiArQ=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "bcc708992104c2059f310fbc3ac00bfc377f9ea8",
"rev": "94b526fc86eaa0e90fb4d54a5ba6313aa1e9b269",
"type": "github"
},
"original": {
@ -300,11 +300,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1726218807,
"narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=",
"lastModified": 1726524647,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
"type": "github"
},
"original": {

View File

@ -28,7 +28,7 @@ in
../../configs/docker.nix
../../configs/games.nix
../../configs/develop.nix
../../configs/libvirt.nix
../../configs/virtualisation.nix
../../configs/plasma-wayland.nix
../../configs/user-gui.nix
../../configs/user.nix

View File

@ -8,6 +8,20 @@ in
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.unstable-packages
(self: super: {
linuxPackages_latest = super.linuxPackages_latest.extend (lpself: lpsuper: {
framework-laptop-kmod = super.linuxPackages_latest.framework-laptop-kmod.overrideAttrs (oldAttrs: rec {
version = "0-unstable-latest";
src = pkgs.fetchFromGitHub {
owner = "DHowett";
repo = "framework-laptop-kmod";
rev = "6164bc3dec24b6bb2806eedd269df6a170bcc930";
# sha256 = pkgs.lib.fakeSha256;
hash = "sha256-OwtXQR0H4GNlYjVZ5UU5MEM6ZOjlV3B0x2auYawbS2U=";
};
});
});
})
];
config = {
allowUnfree = true;
@ -22,7 +36,7 @@ in
../../configs/common.nix
../../configs/docker.nix
../../configs/games.nix
../../configs/libvirt.nix
../../configs/virtualisation.nix
../../configs/plasma-wayland.nix
../../configs/user-gui.nix
../../configs/user.nix
@ -197,7 +211,11 @@ in
# systemd.services.nix-daemon.serviceConfig.LimitNOFILE = 40960;
environment.systemPackages = with pkgs.unstable; [
psensor
# psensor
mission-center
resources
monitorets
veracrypt
gnumake
pkg-config

View File

@ -7,7 +7,7 @@ in {
/etc/nixos/hardware-configuration.nix
../configs/common.nix
../configs/docker.nix
../configs/libvirt.nix
../configs/virtualisation.nix
../configs/user.nix
];
@ -32,15 +32,6 @@ in {
interfaces = [ "wlp1s0" ];
};
# libvirt uses 192.168.122.0
bridges.br0.interfaces = [ ];
interfaces.br0 = {
ipv4.addresses = [{
address = "192.168.122.1";
prefixLength = 24;
}];
};
interfaces.enp3s0.useDHCP = true;
interfaces.wlp1s0.useDHCP = true;
};

View File

@ -10,7 +10,7 @@ in
/etc/nixos/hardware-configuration.nix
../configs/common.nix
../configs/docker.nix
../configs/libvirt.nix
../configs/virtualisation.nix
../configs/plasma.nix
../configs/user-gui.nix
../configs/user.nix