Compare commits

...

3 commits

Author SHA1 Message Date
72ef424ba1 Update nix 2025-08-11 18:58:58 +00:00
d53778b837 Merge branch 'main' of codeberg.org:muon/home 2025-08-11 18:28:27 +00:00
bc6d381e9f Add motion and qmk 2025-08-11 18:27:54 +00:00
3 changed files with 53 additions and 42 deletions

38
flake.lock generated
View file

@ -138,11 +138,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753121425, "lastModified": 1754487366,
"narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -230,11 +230,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753983724, "lastModified": 1754924470,
"narHash": "sha256-2vlAOJv4lBrE+P1uOGhZ1symyjXTRdn/mz0tZ6faQcg=", "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7035020a507ed616e2b20c61491ae3eaa8e5462c", "rev": "67393957c27b4e4c6c48a60108a201413ced7800",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -368,11 +368,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1753694789, "lastModified": 1754726524,
"narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "narHash": "sha256-s4uXZ2D0fbaAu6qFMP/fNSpvVQ7z7F7AalIBhbIGaIE=",
"owner": "nixos", "owner": "ddogfoodd",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "rev": "01f6508918a7af7583e4da274dc429b5ea831665",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -434,11 +434,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1754137146, "lastModified": 1754832356,
"narHash": "sha256-V2AE32tLNvtYVBuc8ZRbkGjAZGsJchFbNVd6v5JXvg8=", "narHash": "sha256-CHWUy7FY1icSQnvTNv+9ty6VFjBNDyb3gD8hHhVEZ9Y=",
"owner": "NotAShelf", "owner": "NotAShelf",
"repo": "nvf", "repo": "nvf",
"rev": "16d396f039ffefabf93b7b3261e2a17e2f84439b", "rev": "1681ad703470e784156ce3461d92d18492c5baef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -467,11 +467,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752544651, "lastModified": 1754328224,
"narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2c8def626f54708a9c38a5861866660395bb3461", "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -520,11 +520,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1753978157, "lastModified": 1754851076,
"narHash": "sha256-sVy8hb71VawSOIsLv/hMGzpvbbWszdP9aSKI5Drbt6Q=", "narHash": "sha256-k3+/24lN6E9BFRhryHocm7314t0Wtku0hgIdEWi15XI=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "ded4f29a023e0f14506ec16b0e32d129e56341cc", "rev": "afcfed6fd2a51615cd63aa7fa7608d670e7b61e5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,6 +1,13 @@
{ config, lib, pkgs, inputs, system, sources, ... }: {
let cfg = config.mods; config,
lib,
pkgs,
inputs,
system,
sources,
...
}: let
cfg = config.mods;
in { in {
# Hardware # Hardware
imports = [./hardware-configuration.nix]; imports = [./hardware-configuration.nix];
@ -11,6 +18,10 @@ in {
pkgs.lutris pkgs.lutris
pkgs.godot pkgs.godot
pkgs.rustdesk-flutter pkgs.rustdesk-flutter
pkgs.motion
pkgs.linuxPackages.v4l2loopback
pkgs.v4l-utils
pkgs.qmk
]; ];
# System # System
@ -32,7 +43,7 @@ in {
mods.containers.steam.enable = false; mods.containers.steam.enable = false;
mods.server.astral.enable = false; mods.server.astral.enable = false;
mods.server.astral.autoStart = false; mods.server.astral.autoStart = false;
mods.server.nvr.enable = true; mods.server.nvr.enable = false;
mods.docker.enable = true; mods.docker.enable = true;
mods.docker.media.enable = false; mods.docker.media.enable = false;
@ -60,6 +71,9 @@ in {
## Mouse ## Mouse
services.libinput.mouse.accelProfile = "flat"; services.libinput.mouse.accelProfile = "flat";
## Keyboard
hardware.keyboard.qmk.enable = true;
## Monitors ## Monitors
mods.monitors = { mods.monitors = {
primary = { primary = {

View file

@ -1,20 +1,15 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = [ "kvm-intel" "v4l2loopback" ];
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
boot.extraModulePackages = []; boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
boot.supportedFilesystems = [ "zfs" "ntfs" "btrfs" ]; boot.supportedFilesystems = [ "zfs" "ntfs" "btrfs" ];
fileSystems."/" = { fileSystems."/" = {
@ -23,8 +18,10 @@
}; };
boot.initrd.luks.devices = { boot.initrd.luks.devices = {
"luks-root".device = "/dev/disk/by-uuid/86769693-b61c-4712-852d-e0fba612d260"; "luks-root".device =
"luks-swap".device = "/dev/disk/by-uuid/0418acfc-792c-43f4-a887-cc8bb51fa7c3"; "/dev/disk/by-uuid/86769693-b61c-4712-852d-e0fba612d260";
"luks-swap".device =
"/dev/disk/by-uuid/0418acfc-792c-43f4-a887-cc8bb51fa7c3";
}; };
fileSystems."/mnt/bulk" = { fileSystems."/mnt/bulk" = {