diff --git a/flake.lock b/flake.lock index cfa3694..d7a9911 100644 --- a/flake.lock +++ b/flake.lock @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1738148035, - "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", + "lastModified": 1739634831, + "narHash": "sha256-xFnU+uUl48Icas2wPQ+ZzlL2O3n8f6J2LrzNK9f2nng=", "owner": "nix-community", "repo": "disko", - "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", + "rev": "fa5746ecea1772cf59b3f34c5816ab3531478142", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -124,11 +124,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1738275749, - "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", + "lastModified": 1739571712, + "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", + "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1737861961, - "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", + "lastModified": 1739071773, + "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", + "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1736931726, - "narHash": "sha256-aY55yiifyo1XPPpbpH0kWlV1g2dNGBlx6622b7OK8ks=", + "lastModified": 1738752252, + "narHash": "sha256-/nA3tDdp/2g0FBy8966ppC2WDoyXtUWaHkZWL+N3ZKc=", "owner": "numtide", "repo": "nixos-facter-modules", - "rev": "fa11d87b61b2163efbb9aed7b7a5ae0299e5ab9c", + "rev": "60f8b8f3f99667de6a493a44375e5506bf0c48b1", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737751639, - "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { @@ -256,14 +256,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", + "lastModified": 1738452942, + "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, "nixpkgs_2": { @@ -284,11 +284,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1738297584, - "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=", + "lastModified": 1739451785, + "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9189ac18287c599860e878e905da550aa6dec1cd", + "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9", "type": "github" }, "original": { diff --git a/home/apps.nix b/home/apps.nix index a109b88..b001962 100644 --- a/home/apps.nix +++ b/home/apps.nix @@ -1,6 +1,5 @@ { pkgs, - inputs, ... }: { imports = [ @@ -18,6 +17,8 @@ pkgs.telegram-desktop # Productivity/Documents + pkgs.keyguard + pkgs.bitwarden-desktop pkgs.keepassxc pkgs.libreoffice pkgs.gimp diff --git a/home/default.nix b/home/default.nix index d971c19..d76f4ae 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,8 +1,5 @@ { - config, pkgs, - inputs, - osConfig, ... }: let variables = { diff --git a/home/git.nix b/home/git.nix index 400cc58..241b9a4 100644 --- a/home/git.nix +++ b/home/git.nix @@ -1,7 +1,4 @@ { - config, - options, - pkgs, ... }: { programs.git = { diff --git a/home/vm.nix b/home/vm.nix index 81da1f1..b90cb91 100644 --- a/home/vm.nix +++ b/home/vm.nix @@ -1,7 +1,5 @@ { - config, - lib, pkgs, ... }: { diff --git a/home/xdg.nix b/home/xdg.nix index 208c53e..e0f451d 100644 --- a/home/xdg.nix +++ b/home/xdg.nix @@ -1,6 +1,5 @@ { config, - lib, pkgs, ... }: let diff --git a/nixos/boot-pretty.nix b/nixos/boot-pretty.nix index 39463dd..c527f4f 100644 --- a/nixos/boot-pretty.nix +++ b/nixos/boot-pretty.nix @@ -1,7 +1,5 @@ { config, - lib, - pkgs, ... }: { assertions = [ diff --git a/nixos/default.nix b/nixos/default.nix index ec804a6..5dca24c 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,6 +1,5 @@ { config, - options, lib, pkgs, inputs, @@ -30,6 +29,23 @@ ./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 = { enable = true; earlyKMS = true; @@ -101,6 +117,7 @@ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "keyguard" "steam" # "steam-original" # "steam-run" @@ -139,9 +156,36 @@ }; 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 environment.systemPackages = [ + pkgs.bolt-launcher + pkgs.git pkgs.gdu diff --git a/nixos/desktop/gnome/default.nix b/nixos/desktop/gnome/default.nix index c9a5c57..6b6a3d7 100644 --- a/nixos/desktop/gnome/default.nix +++ b/nixos/desktop/gnome/default.nix @@ -1,8 +1,5 @@ { - config, - lib, pkgs, - inputs, ... }: { services.xserver.enable = true; diff --git a/nixos/vm.nix b/nixos/vm.nix index c3e8c8b..c987257 100644 --- a/nixos/vm.nix +++ b/nixos/vm.nix @@ -59,7 +59,7 @@ in { fi ''; 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=="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 = [ # For sharing filesystems # 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 ]; - # 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; users.groups.libvirtd.members = ["evar"]; # let me do stuff with vms