diff --git a/flake.lock b/flake.lock index 414b923..a68af2f 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1736730523, - "narHash": "sha256-mvTZ7fLKA6ggGnA8GZwcXV57EvVReRTCfi26xc08Q3g=", + "lastModified": 1737057290, + "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "74b8e31dd709760c86eed16b6c1d0b88d7360937", + "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736701207, - "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { diff --git a/hosts/Yura-PC/default.nix b/hosts/Yura-PC/default.nix index 4e1f4f2..d1569fd 100644 --- a/hosts/Yura-PC/default.nix +++ b/hosts/Yura-PC/default.nix @@ -23,10 +23,16 @@ "sysrq_always_enabled=1" ]; + # https://nixos.wiki/wiki/OSX-KVM + boot.extraModprobeConfig = '' + options kvm_amd nested=1 + options kvm_amd emulate_invalid_guest_state=0 + options kvm ignore_msrs=1 + ''; + boot.loader.timeout = 3; boot.loader.systemd-boot.configurationLimit = 5; boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12; - boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ]; # https://nixos.wiki/wiki/Accelerated_Video_Playback hardware.graphics = { @@ -104,6 +110,7 @@ group = "cazzzer"; extraGroups = [ "networkmanager" "wheel" "docker" "wireshark" "geoclue" ]; packages = with pkgs; [ + # Python python3 poetry @@ -115,6 +122,9 @@ nodejs_22 pnpm bun + + # Nix + nixd ]; }; @@ -143,7 +153,6 @@ virtualisation.docker.enableOnBoot = false; virtualisation.docker.package = pkgs.docker_27; virtualisation.docker.storageDriver = "zfs"; - # https://discourse.nixos.org/t/firefox-does-not-use-kde-window-decorations-and-cursor/32132/3 # programs.dconf.enable = true; @@ -171,31 +180,6 @@ # For JetBrains stuff # https://github.com/NixOS/nixpkgs/issues/240444 - curl - expat - fontconfig - freetype - fuse - fuse3 - glib - icu - libclang.lib - libdbusmenu - libsecret - libxcrypt-legacy - libxml2 - nss - openssl - python3 - stdenv.cc.cc - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - xz - zlib ]; # attempt to fix flatpak firefox cjk fonts diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix index 2a28789..57d59f4 100644 --- a/hosts/vm/default.nix +++ b/hosts/vm/default.nix @@ -22,7 +22,6 @@ boot.loader.systemd-boot.configurationLimit = 5; boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12; - boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ]; environment.etc.hosts.mode = "0644"; diff --git a/modules/workarounds/flatpak.nix b/modules/workarounds/flatpak.nix index 7b41973..631e509 100644 --- a/modules/workarounds/flatpak.nix +++ b/modules/workarounds/flatpak.nix @@ -24,7 +24,7 @@ in { aggregated = pkgs.buildEnv { name = "system-fonts-and-icons"; paths = builtins.attrValues { - inherit (pkgs.libsForQt5) breeze-qt5; + inherit (pkgs.kdePackages) breeze; inherit (pkgs) noto-fonts