diff --git a/base/apollo/configuration.nix b/base/apollo/configuration.nix index d0ae777..cd2fbd7 100644 --- a/base/apollo/configuration.nix +++ b/base/apollo/configuration.nix @@ -18,6 +18,12 @@ enable = true; useRoutingFeatures = "both"; }; + programs.nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + flake = "/home/maya/.config/nixos"; + }; programs.adb.enable = true; services.wivrn.enable = true; services.wivrn.openFirewall = true; @@ -43,11 +49,28 @@ }; security.polkit.enable = true; + boot.loader.systemd-boot.enable = false; + boot.loader.limine = { + enable = true; + style.wallpapers = [ ]; + additionalFiles = { + "efi/memtest86/memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi"; + "efi/shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi"; + }; + extraEntries = '' + /memtest86 + protocol: efi + path: boot():/limine/efi/memtest86/memtest86.efi + /shell + protocol: efi + path: boot():/limine/efi/shell.efi + ''; + + }; + boot.loader.efi.canTouchEfiVariables = true; powerManagement.cpuFreqGovernor = "performance"; # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; programs.virt-manager.enable = true; services.gvfs.enable = true; hardware.keyboard.qmk.enable = true; @@ -226,6 +249,8 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666 wayvr-dashboard xwayland-satellite polychromatic + memtest86-efi + edk2-uefi-shell ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/base/apollo/hardware-configuration.nix b/base/apollo/hardware-configuration.nix index dd27824..ea1fa9d 100644 --- a/base/apollo/hardware-configuration.nix +++ b/base/apollo/hardware-configuration.nix @@ -24,7 +24,7 @@ boot.kernelModules = [ "kvm-intel" "vfio_virqfd" "vhost-net" "v4l2loopback" "12c-dev" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback vendor-reset]; boot.extraModprobeConfig = '' - options vfio-pci ids=1002:6fdf,1002:aaf0,1b21:1242 + options vfio-pci ids=1002:6fdf,1002:aaf0,1b21:1242,1002:67df options v4l2loopback devices=2 video_nr=1,2 card_label="OBS Cam, Virt Cam" exclusive_caps=1 ''; boot.blacklistedKernelModules = ["nouveau"]; diff --git a/base/overrides.nix b/base/overrides.nix index 1480956..91a7085 100644 --- a/base/overrides.nix +++ b/base/overrides.nix @@ -83,7 +83,6 @@ ] ++ config.fonts.packages; extraCompatPackages = with pkgs; [ steamtinkerlaunch - proton-ge-bin ]; remotePlay.openFirewall = true; # Open ports in the fire> dedicatedServer.openFirewall = true; # Open ports in the> diff --git a/flake.lock b/flake.lock index 922b660..a54799d 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751880463, - "narHash": "sha256-aSQllMKqsTYAUp4yhpspZn0Hj5yIj7Mh4UD5iyk5iMM=", + "lastModified": 1753702336, + "narHash": "sha256-IVFUQV6egGQHnm+I183OT+4ct/ka1IWA5u/0A9I/YV4=", "owner": "catppuccin", "repo": "nix", - "rev": "9474347c69e93e392f194dda7a57c641ba4b998e", + "rev": "b32de96c3c5384c83b0f4d741ec58a7f97c9ab11", "type": "github" }, "original": { @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -96,11 +96,11 @@ ] }, "locked": { - "lastModified": 1751824240, - "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", + "lastModified": 1753693456, + "narHash": "sha256-5i5+9pPq80C37a/xqepLRYMHNw8CSh1S7o0ps+kkl3k=", "owner": "nix-community", "repo": "home-manager", - "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", + "rev": "a7b7c6f520b51f3577bd6b7a7493d2cdbcb22ec6", "type": "github" }, "original": { @@ -143,11 +143,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1752052164, - "narHash": "sha256-rq5aT1acTwLMAds//7WLtZhZGC5Hyr5YQqbiA0kb3yo=", + "lastModified": 1753418232, + "narHash": "sha256-fMVYDv0/7v4qrbZmzfqkFeEpelME4bT5JQBfXL9zl/E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f81c48f403c976463fe5812e9e6bca8cf49aebdc", + "rev": "ca1145d927d177194fec4b0bf47a4b7dd2ed613d", "type": "github" }, "original": { @@ -166,11 +166,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1751866241, - "narHash": "sha256-9UJmOYKYXx/hrXTAtFCJtlrIRQmuRLQ+IKj9eTeFIXc=", + "lastModified": 1753695258, + "narHash": "sha256-a+0PXuJ3YfpdL0Y+uX/GNOx5cSZSpNW0UglU/E1YdHw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "59e74c8ac38b131d664a667e046861bd72f5b651", + "rev": "76d7de1a046d589b75967a597895f8e5efdc8e16", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750791124, - "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", + "lastModified": 1752870529, + "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", "owner": "YaLTeR", "repo": "niri", - "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", + "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", "type": "github" }, "original": { @@ -241,11 +241,11 @@ ] }, "locked": { - "lastModified": 1751774635, - "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", + "lastModified": 1753589988, + "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "85686025ba6d18df31cc651a91d5adef63378978", + "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf", "type": "github" }, "original": { @@ -276,11 +276,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -292,11 +292,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1751741127, - "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", + "lastModified": 1753489912, + "narHash": "sha256-uDCFHeXdRIgJpYmtcUxGEsZ+hYlLPBhR83fdU+vbC1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29e290002bfff26af1db6f64d070698019460302", + "rev": "13e8d35b7d6028b7198f8186bc0347c6abaa2701", "type": "github" }, "original": { @@ -314,11 +314,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1751852726, - "narHash": "sha256-AZ8EJPYiw0VKKWO1DLhug/EB020AfwuJnWC0JALtXj8=", + "lastModified": 1753667485, + "narHash": "sha256-pU0sWdUZKwYDoKORylS47CckVhsjBzc2Im25yya9mFA=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "99fdb3588074b0b31c1d60633b16ee4cee0ce937", + "rev": "4564aa1da9f83c8238eaabe881697c7ce419051e", "type": "github" }, "original": { @@ -329,11 +329,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -345,11 +345,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1753549186, + "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "17f6bd177404d6d43017595c5264756764444ab8", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1753549186, + "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "17f6bd177404d6d43017595c5264756764444ab8", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1751637120, - "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { @@ -393,11 +393,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1750811787, - "narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=", + "lastModified": 1753432016, + "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1", + "rev": "6027c30c8e9810896b92429f0092f624f7b1aace", "type": "github" }, "original": { @@ -415,11 +415,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1751824405, - "narHash": "sha256-8lgBIofI1lQXs4skivRnPJ/S8Tqduv4bXq/8Rc/ns8o=", + "lastModified": 1753655972, + "narHash": "sha256-x1gsih/gAiUo6qw/ZjcFm3KqKLL/P1f9HgPGoi8bXQI=", "owner": "nix-community", "repo": "nixvim", - "rev": "28f818b57bb68d91891d23952490b1e19055d63c", + "rev": "4f584b5b366303510702b10c496ab27a44e90426", "type": "github" }, "original": { @@ -438,11 +438,11 @@ ] }, "locked": { - "lastModified": 1749730855, - "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", + "lastModified": 1753450833, + "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=", "owner": "NuschtOS", "repo": "search", - "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", + "rev": "40987cc1a24feba378438d691f87c52819f7bd75", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1750931469, - "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", + "lastModified": 1753439394, + "narHash": "sha256-Bv9h1AJegLI8uAhiJ1sZ4XAndYxhgf38tMgCQwiEpmc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", + "rev": "2673921c03d6e75fdf4aa93e025772608d1482cf", "type": "github" }, "original": { @@ -571,11 +571,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1751228685, - "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=", + "lastModified": 1752338000, + "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b", + "rev": "ba78881a68182ce338041846164cbfed0d70935c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ab18b9e..d4d700d 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; + home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.homeModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; home-manager.users.alyx = ./home; } ]; @@ -60,7 +60,7 @@ }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; + home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.homeModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; home-manager.users.maya = ./home; } ]; @@ -83,7 +83,7 @@ }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; + home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.homeModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; home-manager.users.alyx = ./home; } ]; @@ -106,7 +106,7 @@ }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; + home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.homeModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; home-manager.users.maya = ./home; } ]; @@ -128,7 +128,7 @@ }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; + home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.homeModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; home-manager.users.maya = ./home; } ]; @@ -139,7 +139,7 @@ modules = [ ./base/hassie home-manager.nixosModules.home-manager { - #imports = [ inputs.nix-index-database.hmModules.nix-index ]; + #imports = [ inputs.nix-index-database.homeModules.nix-index ]; home-manager.backupFileExtension = "hm-backup"; home-manager.extraSpecialArgs = { inherit inputs; @@ -153,7 +153,7 @@ }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; + home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.homeModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; home-manager.users.alyx = ./home; } ]; @@ -175,7 +175,7 @@ }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; + home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.homeModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; home-manager.users.maya = ./home; } ]; @@ -189,7 +189,7 @@ jovian.nixosModules.jovian home-manager.nixosModules.home-manager { home-manager.backupFileExtension = "hm-backup"; - #imports = [ inputs.nix-index-database.hmModules.nix-index ]; + #imports = [ inputs.nix-index-database.homeModules.nix-index ]; home-manager.extraSpecialArgs = { inherit inputs; vars = { @@ -202,7 +202,7 @@ }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; + home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.homeModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; home-manager.users.alyx = ./home; } ]; @@ -212,7 +212,7 @@ modules = [ ./base/umbriel home-manager.nixosModules.home-manager { - #imports = [ inputs.nix-index-database.hmModules.nix-index ]; + #imports = [ inputs.nix-index-database.homeModules.nix-index ]; home-manager.backupFileExtension = "hm-backup"; home-manager.extraSpecialArgs = { inherit inputs; @@ -226,7 +226,7 @@ }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; + home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.homeModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}]; home-manager.users.alyx = ./home; } ]; diff --git a/home/default.nix b/home/default.nix index 56032af..4d9346d 100644 --- a/home/default.nix +++ b/home/default.nix @@ -25,7 +25,7 @@ }; programs.ncmpcpp = { - enable = true; + enable = false; settings = { tags_separator = ";"; }; @@ -53,7 +53,7 @@ services.syncthing.enable = (vars.useSyncthing); - xdg.configFile."openxr/1/active_runtime.json".source = if vars.user == "alyx" then "${pkgs.monado}/share/openxr/1/openxr_monado.json" else null; + #xdg.configFile."openxr/1/active_runtime.json".source = if vars.user == "alyx" then "${pkgs.monado}/share/openxr/1/openxr_monado.json" else null; xdg.configFile."openvr/openvrpaths.vrpath".text = '' { diff --git a/home/packages.nix b/home/packages.nix index 020a8cb..1736fb6 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -1,7 +1,7 @@ {pkgs, vars, ...}:{ home.packages = with pkgs; [ abaddon - blender-hip + blender brightnessctl bs-manager clonehero