evar/nixos-framework-laptop-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

misc: various changes

Browse source
This commit is contained in:
Evar 2025-02-20 17:21:29 -05:00
parent 5e2a68566b
commit 4944f2ba36
10 changed files with 99 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

56
flake.lock generated
View file

@ -67,11 +67,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738148035, "lastModified": 1739634831,
"narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", "narHash": "sha256-xFnU+uUl48Icas2wPQ+ZzlL2O3n8f6J2LrzNK9f2nng=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", "rev": "fa5746ecea1772cf59b3f34c5816ab3531478142",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1736143030, "lastModified": 1738453229,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -124,11 +124,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1738275749, "lastModified": 1739571712,
"narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737861961, "lastModified": 1739071773,
"narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,11 +210,11 @@
}, },
"nixos-facter-modules": { "nixos-facter-modules": {
"locked": { "locked": {
"lastModified": 1736931726, "lastModified": 1738752252,
"narHash": "sha256-aY55yiifyo1XPPpbpH0kWlV1g2dNGBlx6622b7OK8ks=", "narHash": "sha256-/nA3tDdp/2g0FBy8966ppC2WDoyXtUWaHkZWL+N3ZKc=",
"owner": "numtide", "owner": "numtide",
"repo": "nixos-facter-modules", "repo": "nixos-facter-modules",
"rev": "fa11d87b61b2163efbb9aed7b7a5ae0299e5ab9c", "rev": "60f8b8f3f99667de6a493a44375e5506bf0c48b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -225,11 +225,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1737751639, "lastModified": 1738816619,
"narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -256,14 +256,14 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1735774519, "lastModified": 1738452942,
"narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
@ -284,11 +284,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1737885589, "lastModified": 1739020877,
"narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -300,11 +300,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1738297584, "lastModified": 1739451785,
"narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=", "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9189ac18287c599860e878e905da550aa6dec1cd", "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
home/apps.nix
View file

@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
inputs,
... ...
}: { }: {
imports = [ imports = [
@ -18,6 +17,8 @@
pkgs.telegram-desktop pkgs.telegram-desktop
# Productivity/Documents # Productivity/Documents
pkgs.keyguard
pkgs.bitwarden-desktop
pkgs.keepassxc pkgs.keepassxc
pkgs.libreoffice pkgs.libreoffice
pkgs.gimp pkgs.gimp

3
home/default.nix
View file

@ -1,8 +1,5 @@
{ {
config,
pkgs, pkgs,
inputs,
osConfig,
... ...
}: let }: let
variables = { variables = {

3
home/git.nix
View file

@ -1,7 +1,4 @@
{ {
config,
options,
pkgs,
... ...
}: { }: {
programs.git = { programs.git = {

2
home/vm.nix
View file

@ -1,7 +1,5 @@
{ {
config,
lib,
pkgs, pkgs,
... ...
}: { }: {

1
home/xdg.nix
View file

@ -1,6 +1,5 @@
{ {
config, config,
lib,
pkgs, pkgs,
... ...
}: let }: let

2
nixos/boot-pretty.nix
View file

@ -1,7 +1,5 @@
{ {
config, config,
lib,
pkgs,
... ...
}: { }: {
assertions = [ assertions = [

46
nixos/default.nix
View file

@ -1,6 +1,5 @@
{ {
config, config,
options,
lib, lib,
pkgs, pkgs,
inputs, inputs,
@ -30,6 +29,23 @@
./libvirtd.nix ./libvirtd.nix
]; ];
# So that I can get to the netgear router
networking.extraHosts = ''
10.0.0.152 routerlogin.net
10.0.0.152 www.routerlogin.net
'';
services.flatpak.enable = true;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
xdg.portal.config.common.default = "gtk";
security.polkit.enable = true;
systemd.services.fprxintd = {
wantedBy = [ "multi-user.target" ];
serviceConfig.Type = "simple";
};
services.fprintd.enable = true;
vfio = { vfio = {
enable = true; enable = true;
earlyKMS = true; earlyKMS = true;
@ -101,6 +117,7 @@
nixpkgs.config.allowUnfreePredicate = pkg: nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) builtins.elem (lib.getName pkg)
[ [
"keyguard"
"steam" "steam"
# "steam-original" # "steam-original"
# "steam-run" # "steam-run"
@ -139,9 +156,36 @@
}; };
services.openssh.enable = true; services.openssh.enable = true;
### Stuff for running a dhcp server for wobbuffet stuff
### MAKE SURE TO DISABLE THIS BEFORE NORMAL OPERATION
# networking.networkmanager.dns = "dnsmasq";
# systemd.network.networks = {
# matchConfig.name = "en0";
# address = [
# "192.168.70.1/24"
# ];
# networkConfig = {
# ConfigureWithoutCarrier = true;
# };
# };
# services.dnsmasq = {
# enable = true;
# settings = {
# port = 0;
# interface = "en0";
# listen-address = "192.168.70.1";
# dhcp-range = [ "192.168.70.2,192.168.70.255,1h" ];
# dhcp-option = "option:router,192.168.70.1";
# };
# };
### System software ### System software
environment.systemPackages = [ environment.systemPackages = [
pkgs.bolt-launcher
pkgs.git pkgs.git
pkgs.gdu pkgs.gdu

3
nixos/desktop/gnome/default.nix
View file

@ -1,8 +1,5 @@
{ {
config,
lib,
pkgs, pkgs,
inputs,
... ...
}: { }: {
services.xserver.enable = true; services.xserver.enable = true;

40
nixos/vm.nix
View file

@ -59,7 +59,7 @@ in {
fi fi
''; '';
in in
pkgs.writeTextDir "/lib/udev/rules.d/99-vm-attach-usb-anker-hub.rules" '' pkgs.writeTextDir "/lib/udev/rules.d/60-vm-attach-usb-anker-hub.rules" ''
SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="5411", ATTR{idVendor}!="0bda", ATTR{idProduct}!="5411", RUN+="${updateBin}" SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="5411", ATTR{idVendor}!="0bda", ATTR{idProduct}!="5411", RUN+="${updateBin}"
SUBSYSTEM=="usb", ACTION=="remove", RUN+="${updateBin}" SUBSYSTEM=="usb", ACTION=="remove", RUN+="${updateBin}"
'' ''
@ -88,6 +88,29 @@ in {
}; };
}; };
networking.dhcpcd.denyInterfaces = [ "winvm0" ];
# ensure the bridge network doesn't cause us to wait
# on boot
systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ];
boot.initrd.systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ];
# These are needed, since I'm not currently trying to
# reserve a static IP for the bridge interface
networking.interfaces.winvm0 = {
useDHCP = false;
ipv4 = {
addresses = [
{ address = "10.0.5.1"; prefixLength = 16; }
];
routes = [{
address = "10.0.0.0";
prefixLength = 16;
options = { scope = "link"; metric = "900"; };
}];
};
};
environment.systemPackages = [ environment.systemPackages = [
# For sharing filesystems # For sharing filesystems
# I followed https://www.heiko-sieger.info/sharing-files-between-the-linux-host-and-a-windows-vm-using-virtiofs/ # I followed https://www.heiko-sieger.info/sharing-files-between-the-linux-host-and-a-windows-vm-using-virtiofs/
@ -101,21 +124,6 @@ in {
pkgs.scream pkgs.scream
]; ];
# These are needed, since I'm not currently trying to
# reserve a static IP for the bridge interface
networking.interfaces.winvm0 = {
useDHCP = false;
ipv4.addresses = [
{ address = "10.0.5.1"; prefixLength = 16; }
];
};
# Trying to ensure the bridge network doesn't cause us to wait
# on boot
systemd.services.network-addresses-eth0.before = lib.mkForce [ ];
systemd.services.network-addresses-winvm0.before = lib.mkForce [ ];
systemd.services.winvm0-netdev.before = lib.mkForce [ ];
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
users.groups.libvirtd.members = ["evar"]; # let me do stuff with vms users.groups.libvirtd.members = ["evar"]; # let me do stuff with vms