diff --git a/flake.lock b/flake.lock index a125ce09..8c1d7afb 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1764370710, - "narHash": "sha256-7iZklFmziy6Vn5ZFy9mvTSuFopp3kJNuPxL5QAvtmFQ=", + "lastModified": 1765900596, + "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "561ae7fbe1ca15dfd908262ec815bf21a13eef63", + "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", "type": "github" }, "original": { @@ -54,17 +54,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -273,11 +273,11 @@ ] }, "locked": { - "lastModified": 1764839789, - "narHash": "sha256-QCgaXEj8036JlfyVM2e5fgKIxoF7IgGRcAi8LkehKvo=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "d441981b200305ebb8e2e2921395f51d207fded6", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -356,11 +356,11 @@ ] }, "locked": { - "lastModified": 1764502778, - "narHash": "sha256-FKbMxf2Y45ZCVG7CCjM/xHF9qndjkl0SZtL8IQ2ijU0=", + "lastModified": 1767241021, + "narHash": "sha256-Hwc/ANr3WKPdLCmRFzUK28oIr+w2V4Y88PltE3OfHbk=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "0a1780ca3851e6960c4c7c4c66e1e37fefd7b0f3", + "rev": "dcdd6b1933e7399e3de373e1e7954b7400b4b9b9", "type": "github" }, "original": { @@ -379,6 +379,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": [ "nixpkgs" ], @@ -387,11 +388,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1764801806, - "narHash": "sha256-AlEo8j1V9S20PJd23DXqR/tjwtUjxMcn87Euei9zFeA=", + "lastModified": 1767282503, + "narHash": "sha256-Ui51FBJU1DOuQkErqZpzWPMvZNbh+ORot0x6WPZqLIA=", "ref": "refs/heads/main", - "rev": "9b1891e4765e2c5b84c8c61725e3973ca9940e05", - "revCount": 6669, + "rev": "9b93d621b1019e8378b8a902edb7ba8dd8baf204", + "revCount": 6765, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, @@ -433,11 +434,11 @@ ] }, "locked": { - "lastModified": 1764616927, - "narHash": "sha256-wRT0MKkpPo11ijSX3KeMN+EQWnpSeUlRtyF3pFLtlRU=", + "lastModified": 1765643131, + "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "25cedbfdc5b3ea391d8307c9a5bea315e5df3c52", + "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", "type": "github" }, "original": { @@ -458,11 +459,11 @@ ] }, "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", "type": "github" }, "original": { @@ -564,11 +565,11 @@ ] }, "locked": { - "lastModified": 1764637132, - "narHash": "sha256-vSyiKCzSY48kA3v39GFu6qgRfigjKCU/9k1KTK475gg=", + "lastModified": 1766160771, + "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "2f2413801beee37303913fc3c964bbe92252a963", + "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", "type": "github" }, "original": { @@ -602,6 +603,35 @@ "type": "github" } }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1766253200, + "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "1079777525b30a947c8d657fac158e00ae85de9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1737831083, @@ -619,11 +649,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764794580, - "narHash": "sha256-UMVihg0OQ980YqmOAPz+zkuCEb9hpE5Xj2v+ZGNjQ+M=", + "lastModified": 1767242400, + "narHash": "sha256-knFaYjeg7swqG1dljj1hOxfg39zrIy8pfGuicjm9s+o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebc94f855ef25347c314258c10393a92794e7ab9", + "rev": "c04833a1e584401bb63c1a63ddc51a71e6aa457a", "type": "github" }, "original": { @@ -657,11 +687,11 @@ ] }, "locked": { - "lastModified": 1764847781, - "narHash": "sha256-OBuBBqMKXt8xlzJ3z27i9A36sEYAfVmeMxZ5yGFV+4Q=", + "lastModified": 1767298948, + "narHash": "sha256-Z/AjeEcChMEo7KWVL/lIZL0neRhigiUebyM3sQDm/+4=", "owner": "nix-community", "repo": "NUR", - "rev": "6f944b9a614527821456c45421833dd771a0e739", + "rev": "49f532f522c905f6d934697b406353167d6e9502", "type": "github" }, "original": { @@ -705,11 +735,11 @@ ] }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -769,11 +799,11 @@ ] }, "locked": { - "lastModified": 1764483358, - "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", + "lastModified": 1766894905, + "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5aca6ff67264321d47856a2ed183729271107c9c", + "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", "type": "github" }, "original": { @@ -803,11 +833,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764798099, - "narHash": "sha256-IIwR5ZWo7tjxjRpkz0tViF9KFbQ1YXs9Wkan46WQbfk=", + "lastModified": 1766603026, + "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", "owner": "danth", "repo": "stylix", - "rev": "4b9e0e7ba3cccb86fe2bf0f4a2dd18256bef1cc6", + "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", "type": "github" }, "original": { diff --git a/home/lilith/packages.nix b/home/lilith/packages.nix index 2a21b8b6..eba7ba25 100644 --- a/home/lilith/packages.nix +++ b/home/lilith/packages.nix @@ -41,9 +41,6 @@ inkscape libreoffice - gqrx - satdump - btop htop grc diff --git a/hosts/lilith-pc/default.nix b/hosts/lilith-pc/default.nix index eb883b3b..21c9c9da 100644 --- a/hosts/lilith-pc/default.nix +++ b/hosts/lilith-pc/default.nix @@ -10,7 +10,7 @@ in gaming.enable = true; nfs.client.enable = true; auto_styling.enable = true; - ollama.enable = true; + # ollama.enable = true; sdr.enable = true; hardware.graphics.extraPackages = [ pkgs.rocmPackages.clr.icd ]; diff --git a/hosts/lilith-pc/hardware-configuration.nix b/hosts/lilith-pc/hardware-configuration.nix index cb151310..46c9a83c 100644 --- a/hosts/lilith-pc/hardware-configuration.nix +++ b/hosts/lilith-pc/hardware-configuration.nix @@ -1,49 +1,76 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "tmpfs"; - fsType = "tmpfs"; - options = [ "defaults" ]; - }; + fileSystems."/" = { + device = "tmpfs"; + fsType = "tmpfs"; + options = [ + "defaults" + "size=100%" + "mode=755" + ]; + }; - fileSystems."/persist/data" = - { device = "/dev/disk/by-uuid/5dbe939d-54a5-4092-b9c6-83f6bd4cf925"; - fsType = "btrfs"; - neededForBoot = true; - options = [ "noatime" "compress=zstd" "subvol=persist/@data" ]; - }; + fileSystems."/persist/data" = { + device = "/dev/disk/by-uuid/5dbe939d-54a5-4092-b9c6-83f6bd4cf925"; + fsType = "btrfs"; + neededForBoot = true; + options = [ + "noatime" + "compress=zstd" + "subvol=persist/@data" + ]; + }; - fileSystems."/persist/cache" = - { device = "/dev/disk/by-uuid/5dbe939d-54a5-4092-b9c6-83f6bd4cf925"; - fsType = "btrfs"; - neededForBoot = true; - options = [ "noatime" "compress=zstd" "subvol=persist/@cache" ]; - }; + fileSystems."/persist/cache" = { + device = "/dev/disk/by-uuid/5dbe939d-54a5-4092-b9c6-83f6bd4cf925"; + fsType = "btrfs"; + neededForBoot = true; + options = [ + "noatime" + "compress=zstd" + "subvol=persist/@cache" + ]; + }; - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/5dbe939d-54a5-4092-b9c6-83f6bd4cf925"; - fsType = "btrfs"; - neededForBoot = true; - options = [ "noatime" "compress=zstd" "subvol=nix" ]; - }; + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/5dbe939d-54a5-4092-b9c6-83f6bd4cf925"; + fsType = "btrfs"; + neededForBoot = true; + options = [ + "noatime" + "compress=zstd" + "subvol=nix" + ]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6437-97E8"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/6437-97E8"; + fsType = "vfat"; + }; swapDevices = [ ]; diff --git a/system/core/persistence.nix b/system/core/persistence.nix index b04fb802..31e70e58 100644 --- a/system/core/persistence.nix +++ b/system/core/persistence.nix @@ -44,7 +44,10 @@ ".local/share/iamb" ".local/share/TelegramDesktop" ] - ++ lib.optionals config.gaming.enable [ ".config/unity3d/Team Cherry" ]; + ++ lib.optionals config.gaming.enable [ + ".config/unity3d/Team Cherry" + ".config/EgoSoft" + ]; files = [ ]; }; }; diff --git a/system/optional/gaming.nix b/system/optional/gaming.nix index ebf4e930..75437370 100644 --- a/system/optional/gaming.nix +++ b/system/optional/gaming.nix @@ -36,7 +36,7 @@ in environment = gaming-host { systemPackages = with pkgs; [ mangohud - protonup + protonup-ng protontricks ]; };