From 7be60dc2814c174adb8a7522e45ead22a19dc8af Mon Sep 17 00:00:00 2001 From: Lorde_soup Date: Wed, 14 May 2025 17:58:19 -0400 Subject: [PATCH] cleanup --- flake.lock | 131 +++++++++++++++++++++++++++++++++- flake.nix | 6 ++ hosts/kiara/configuration.nix | 48 +++++++++++-- mods/vm.nix | 2 +- mods/wallpaper2.nix | 2 +- 5 files changed, 180 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6189e88..7275e00 100644 --- a/flake.lock +++ b/flake.lock @@ -1,6 +1,22 @@ { "nodes": { "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1733328505, @@ -16,6 +32,43 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils-plus": { + "inputs": { + "flake-utils": "flake-utils" + }, + "locked": { + "lastModified": 1715533576, + "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -75,6 +128,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1738297584, + "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9189ac18287c599860e878e905da550aa6dec1cd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1735471104, "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", @@ -90,18 +159,61 @@ "type": "github" } }, + "quasigod": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "snowfall-lib": "snowfall-lib" + }, + "locked": { + "lastModified": 1739646424, + "narHash": "sha256-JRWvo2EWTZYOB16QolHEL0wZdcc069RgVVLZ+AXiaFE=", + "ref": "refs/heads/main", + "rev": "fde2f3136b6e0ae6d0f92850a64fc59b4442c235", + "revCount": 18, + "type": "git", + "url": "https://codeberg.org/quasigod/nur" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/quasigod/nur" + } + }, "root": { "inputs": { "home-manager": "home-manager", "kmonad": "kmonad", "nixpkgs": "nixpkgs", + "quasigod": "quasigod", "spicetify-nix": "spicetify-nix", "zen-browser": "zen-browser" } }, - "spicetify-nix": { + "snowfall-lib": { "inputs": { "flake-compat": "flake-compat", + "flake-utils-plus": "flake-utils-plus", + "nixpkgs": [ + "quasigod", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736130495, + "narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=", + "owner": "snowfallorg", + "repo": "lib", + "rev": "02d941739f98a09e81f3d2d9b3ab08918958beac", + "type": "github" + }, + "original": { + "owner": "snowfallorg", + "repo": "lib", + "type": "github" + } + }, + "spicetify-nix": { + "inputs": { + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ] @@ -120,9 +232,24 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1737573247, diff --git a/flake.nix b/flake.nix index 879b512..24c7e7c 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + quasigod = { + url = "git+https://codeberg.org/quasigod/nur"; + # inputs.nixpkgs.follows = "nixpkgs"; + + }; + }; diff --git a/hosts/kiara/configuration.nix b/hosts/kiara/configuration.nix index 8ebacb3..948d4ff 100644 --- a/hosts/kiara/configuration.nix +++ b/hosts/kiara/configuration.nix @@ -11,15 +11,16 @@ inputs.home-manager.nixosModules.default ../../mods/vm.nix ../../mods/mini-spice.nix -# ../../mods/kmonad.nix + ../../mods/wallpaper2.nix inputs.spicetify-nix.nixosModules.default ]; + services.udev.enable = true; -# vm.enable = true; + vm.enable = true; # Bootloader. @@ -33,7 +34,7 @@ kernelModules = [ "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio" "v4l2loopback" ]; blacklistedKernelModules = [ "nvidia" "nouveau" ]; extraModprobeConfig = '' - options vfio-pci ids=10de:22bc,10de:2786 + options vfio-pci ids=10de:22bc,10de:2786,8086:24fd options v4l2loopback exclusive_caps=1 ''; extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ]; @@ -51,6 +52,24 @@ #networking.nameservers = [ "1.1.1.1" "1.0.0.1" ]; # networking.networkmanager.insertNameservers = [ "1.1.1.1" ]; + + + + +# networking = { +# bridges = { +# "br0" = { +# interfaces = [ "eno1" ]; +# }; +# }; +# +# interfaces = { +# enp0s3.useDHCP = false; # Disable DHCP on the physical Ethernet port +# br0.useDHCP = true; # Enable DHCP on the bridge interface +# }; +#}; + + #{ config, pkgs, lib, ... }:{ # networking.firewall.checkReversePath = false; #} @@ -86,6 +105,15 @@ LC_TELEPHONE = "en_US.UTF-8"; LC_TIME = "en_US.UTF-8"; }; + + +# networking.bridges = { +# br0.interfaces = [ "eno1" ]; # Replace eth0 with your main network interface +# }; +# +# networking.interfaces.br0.useDHCP = true; # Or set a static IP if needed + + # Enable the X11 windowing system. services.xserver.enable = true; @@ -121,6 +149,10 @@ services.udisks2.enable = true; + + services.locate.enable = true; + services.locate.package = pkgs.mlocate; + # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; @@ -230,7 +262,7 @@ pavucontrol ranger lxqt.lxqt-policykit - # linux-wallpaperengine # bug with freeimage-unstable with like 7 CVEs wait for patch + linux-wallpaperengine # bug with freeimage-unstable with like 7 CVEs wait for patch libreoffice pasystray # syncthing-tray @@ -295,8 +327,14 @@ game-devices-udev-rules looking-glass-client inputs.zen-browser.packages."${system}".default + inputs.quasigod.packages."${system}".grayjay-desktop tree - keyd + alvr + syncthing + mlocate + android-udev-rules + sidequest + slimevr ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/mods/vm.nix b/mods/vm.nix index f9080c1..dfccd67 100644 --- a/mods/vm.nix +++ b/mods/vm.nix @@ -20,7 +20,7 @@ spice-protocol win-virtio win-spice - gnome.adwaita-icon-theme + adwaita-icon-theme ]; # Manage the virtualisation services diff --git a/mods/wallpaper2.nix b/mods/wallpaper2.nix index 2aae6bc..db49584 100644 --- a/mods/wallpaper2.nix +++ b/mods/wallpaper2.nix @@ -7,7 +7,7 @@ # ... }; script = '' - linux-wallpaperengine --screen-root DP-2 2777842128" + linux-wallpaperengine --screen-root DP-2 2777842128 ''; }; }