From 6a92ece29e453353adb650b025804fbf7e02f57b Mon Sep 17 00:00:00 2001 From: cnst Date: Sun, 28 Jul 2024 17:33:33 +0200 Subject: [PATCH] much testing, little advancement --- flake.lock | 234 +++++++++++++++++--- flake.nix | 3 + home/core/gui/xdg/default.nix | 12 + nixos/hosts/cnix/hardware-configuration.nix | 4 +- nixos/hosts/cnix/imports.nix | 1 + 5 files changed, 222 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 18955753..8c513080 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,43 @@ "type": "github" } }, + "chaotic": { + "inputs": { + "compare-to": "compare-to", + "flake-schemas": "flake-schemas", + "home-manager": "home-manager", + "jovian": "jovian", + "nixpkgs": "nixpkgs", + "systems": "systems", + "yafas": "yafas" + }, + "locked": { + "lastModified": 1722126515, + "narHash": "sha256-Pz8/0lFWhoHOReOJwbf4Fbx0ANGWc306QnuUeMR9keU=", + "rev": "d11e6cfcb6c09dbb9ae0265cfe7a684bcde02ec6", + "revCount": 1295, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1295%2Brev-d11e6cfcb6c09dbb9ae0265cfe7a684bcde02ec6/0190f98b-9e53-7792-9075-57e87dc725d0/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/chaotic-cx/nyx/%2A.tar.gz" + } + }, + "compare-to": { + "locked": { + "lastModified": 1695341185, + "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", + "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", + "revCount": 2, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -74,11 +111,11 @@ ] }, "locked": { - "lastModified": 1722083308, - "narHash": "sha256-71YP9f+M3lhOD6oDrB34p0ATmL6OVg7Ow2atZgFughE=", + "lastModified": 1722169575, + "narHash": "sha256-CaNEKMossqFI1tu0eK9vnGxHW/RlnnVZ2Naj5zugAoc=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "5c3131cb8b7d51b13be2e2ad94aa1b69eb50700e", + "rev": "8972e28c3d04f475c3d3b9ac91292afe07581020", "type": "github" }, "original": { @@ -174,9 +211,23 @@ "type": "github" } }, + "flake-schemas": { + "locked": { + "lastModified": 1693491534, + "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", + "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", + "revCount": 21, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz" + } + }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -214,7 +265,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -232,7 +283,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -250,7 +301,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -392,6 +443,7 @@ "home-manager": { "inputs": { "nixpkgs": [ + "chaotic", "nixpkgs" ] }, @@ -410,6 +462,26 @@ } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722119539, + "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -430,13 +502,35 @@ "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721993749, + "narHash": "sha256-dGqEQ68GNGmA8+HHzHEqAcW2uGu/AX+sRWcMO99UM8s=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "3bd059992912139d6a12e86ba418f933ec368ef2", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -461,11 +555,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1721563874, - "narHash": "sha256-xsiynNj2qUbssiD5m+8ftWrGQflyOo5C4lPbqragiMc=", + "lastModified": 1722168631, + "narHash": "sha256-16XBXW86ceQC+jRx7feCREZo696kvIzpKYmN2LnKfaE=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "e0ea775feda9f162a153ee1ca8d93367dd0ee028", + "rev": "4ce8efe904950cd85bda9624ff1c2ec55fe2ab6f", "type": "github" }, "original": { @@ -528,29 +622,52 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "chaotic", + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690328911, + "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1717794163, - "narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=", + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1721523216, - "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", + "lastModified": 1722128034, + "narHash": "sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", + "rev": "d15f6f6021693898fcd2c6a9bb13707383da9bbc", "type": "github" }, "original": { @@ -576,6 +693,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1717794163, + "narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1722062969, "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", @@ -591,7 +724,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1721466660, "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", @@ -613,7 +746,7 @@ "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" @@ -686,14 +819,15 @@ }, "root": { "inputs": { + "chaotic": "chaotic", "firefox-nightly": "firefox-nightly", "flake-utils": "flake-utils_2", "hardware": "hardware", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "lanzaboote": "lanzaboote", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", - "systems": "systems_4", + "systems": "systems_5", "wezterm": "wezterm" } }, @@ -745,16 +879,16 @@ }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -789,6 +923,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -803,7 +952,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -845,7 +994,7 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay_2", "zlib": "zlib" }, @@ -865,6 +1014,31 @@ "type": "github" } }, + "yafas": { + "inputs": { + "flake-schemas": [ + "chaotic", + "flake-schemas" + ], + "systems": [ + "chaotic", + "systems" + ] + }, + "locked": { + "lastModified": 1695926485, + "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", + "owner": "UbiqueLambda", + "repo": "yafas", + "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", + "type": "github" + }, + "original": { + "owner": "UbiqueLambda", + "repo": "yafas", + "type": "github" + } + }, "zlib": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 4d4040f9..d396f39b 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,8 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; + # cachyos + chaotic.url = "https://flakehub.com/f/chaotic-cx/nyx/*.tar.gz"; #nix-gl = { # url = "github:nix-community/nixgl"; # inputs.nixpkgs.follows = "nixpkgs"; @@ -73,6 +75,7 @@ modules = [ ./nixos/hosts/cnix lanzaboote.nixosModules.lanzaboote + inputs.chaotic.nixosModules.default ]; specialArgs = { inherit inputs outputs; diff --git a/home/core/gui/xdg/default.nix b/home/core/gui/xdg/default.nix index b7507c07..aeb454ce 100644 --- a/home/core/gui/xdg/default.nix +++ b/home/core/gui/xdg/default.nix @@ -16,6 +16,18 @@ templates = "${config.home.homeDirectory}/documents/templates"; videos = "${config.home.homeDirectory}/media/videos"; }; + portal = { + enable = true; + xdgOpenUsePortal = true; + config = { + common.default = ["gtk"]; + hyprland.default = ["gtk" "hyprland"]; + }; + + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + ]; + }; }; dconf = { settings = { diff --git a/nixos/hosts/cnix/hardware-configuration.nix b/nixos/hosts/cnix/hardware-configuration.nix index 6b48875a..08632989 100644 --- a/nixos/hosts/cnix/hardware-configuration.nix +++ b/nixos/hosts/cnix/hardware-configuration.nix @@ -9,7 +9,6 @@ ... }: { imports = [(modulesPath + "/installer/scan/not-detected.nix")]; - boot = { initrd = { availableKernelModules = [ @@ -23,9 +22,10 @@ kernelModules = ["amdgpu"]; }; kernelModules = ["kvm-amd"]; - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos; consoleLogLevel = 3; kernelParams = [ + "amd_pstate=active" "quiet" "splash" ]; diff --git a/nixos/hosts/cnix/imports.nix b/nixos/hosts/cnix/imports.nix index a35a92d4..11ee7c0d 100644 --- a/nixos/hosts/cnix/imports.nix +++ b/nixos/hosts/cnix/imports.nix @@ -37,6 +37,7 @@ environment = { systemPackages = with pkgs; [ # Core + scx fd git niv