diff --git a/.github/workflows/flake_check.yml b/.github/workflows/flake_check.yml index c57a216..f670294 100644 --- a/.github/workflows/flake_check.yml +++ b/.github/workflows/flake_check.yml @@ -1,9 +1,9 @@ -name: Nix Flake Check +name: Flake Check on: [pull_request] jobs: - check: + flake-check: runs-on: ubuntu-latest permissions: diff --git a/.github/workflows/flake_update.yml b/.github/workflows/flake_update.yml new file mode 100644 index 0000000..6aef4c2 --- /dev/null +++ b/.github/workflows/flake_update.yml @@ -0,0 +1,31 @@ +name: Flake Update + +on: + workflow_dispatch: + schedule: #once a week + - cron: '0 0 * * 0' + +jobs: + flake-update: + runs-on: ubuntu-latest + + permissions: + contents: write + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Install Nix + uses: cachix/install-nix-action@v23 + with: + nix_path: nixpkgs=channel:nixos-unstable + + - name: Update flake + run: nix flake update + + - name: Commit + uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: "Update flake" + diff --git a/docs/hypervisor.md b/docs/hypervisor.md index 4b8b1db..c289a6b 100644 --- a/docs/hypervisor.md +++ b/docs/hypervisor.md @@ -43,5 +43,3 @@ The following is a basic configuration that allows for emulating TPM 2.0 (Window }; }; ``` - - diff --git a/flake.lock b/flake.lock index 9002276..2df1544 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1705359964, - "narHash": "sha256-ys1MDjIH6z5UP7gAciRfUAlf2FJV0t3yFib965N/S+I=", + "lastModified": 1706867893, + "narHash": "sha256-c5bADvtL35S3vsJaXR5YWTXe08W0gSwOrTOXfpJB4Ac=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "bb3eeeb96ce059ae29309138874ccf58e796f4b1", + "rev": "bcae8dc73b931b7f0fc65f1f1ef93dc379dfd66b", "type": "github" }, "original": { @@ -54,14 +54,15 @@ "nixpkgs": [ "nixpkgs" ], + "readme-py": "readme-py", "russh": "russh" }, "locked": { - "lastModified": 1705889360, - "narHash": "sha256-ObgJyzzL6oAJSRz6F5Cjo0mUuKwbFpthkdUdR4u9ZK8=", + "lastModified": 1706913600, + "narHash": "sha256-fJzXlTjZljB+2v7SejAK1w4IJdt+DPPcmkmq6wHic/c=", "owner": "erictossell", "repo": "eriixpkgs", - "rev": "47baa97d7928a5e331f50835712fb814c5851dd2", + "rev": "a9967b91e733de627ae5390ddf5879949e81b322", "type": "github" }, "original": { @@ -77,11 +78,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1705869870, - "narHash": "sha256-0xYcYSdaDoSxYND5Cf5/U3nTcb2ESQAmbEuezzKjPMQ=", + "lastModified": 1706894270, + "narHash": "sha256-7vYtkRa3ZIO6F36rXW8cRc+mk9p92DsF93oL0G34zKM=", "owner": "erictossell", "repo": "eriixvim", - "rev": "fab40b3f6e4c252d6a14a62334509dcc82236067", + "rev": "527dfae7b8e7771d1b81fe3ff2a335cad412b3ad", "type": "github" }, "original": { @@ -109,11 +110,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -127,11 +128,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -168,11 +169,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -186,11 +187,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -217,6 +218,42 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_7" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -228,11 +265,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -246,11 +283,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1705728985, - "narHash": "sha256-R4zEqdItd5AFNZ8EAhMOOF7IjRmK6hsZTHLCPwuarkg=", + "lastModified": 1705887679, + "narHash": "sha256-lPm2As+fctI1MwJaAb1Px8li4Yck9DTRt4Kzt+qb49k=", "owner": "erictossell", "repo": "go-time", - "rev": "2abc42627cfa0657c7832d24469ea7dcecf19ee0", + "rev": "d2e5a8c286fde94478e16a597bc78b6954e3b9a8", "type": "github" }, "original": { @@ -290,11 +327,11 @@ ] }, "locked": { - "lastModified": 1705104164, - "narHash": "sha256-pllCu3Hcm1wP/B0SUxgUXvHeEd4w8s2aVrEQRdIL1yo=", + "lastModified": 1706306660, + "narHash": "sha256-lZvgkHtVeduGByPb0Tz9LpAi4olfkEm8XPgv0o7GRsk=", "owner": "nix-community", "repo": "home-manager", - "rev": "0912d26b30332ae6a90e1b321ff88e80492127dd", + "rev": "b2f56952074cb46e93902ecaabfb04dd93733434", "type": "github" }, "original": { @@ -310,11 +347,11 @@ ] }, "locked": { - "lastModified": 1705879479, - "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=", + "lastModified": 1706798041, + "narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913", + "rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e", "type": "github" }, "original": { @@ -330,11 +367,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1705886548, - "narHash": "sha256-4Elx5wBSp8a1P7dYV6h4/Z/6O+2elCzjRHg1jMqkVqc=", + "lastModified": 1706894569, + "narHash": "sha256-bWWCzs044Ng7fSIgTFmVc+8+U+qVqMZCdjTRwXONn2o=", "owner": "erictossell", "repo": "homepage-nix", - "rev": "f9fdc575d379e3586c6a1973389b859c853dcd16", + "rev": "fd7ecba520b75a3476a2777b807d7b608c58cf6d", "type": "github" }, "original": { @@ -346,17 +383,17 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_8", - "systems": "systems_7", + "nixpkgs": "nixpkgs_9", + "systems": "systems_10", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1705782792, - "narHash": "sha256-AnNvfQK3BQtri7JUmTsaAWAOBzCxEf5t3VaGm0Kezjk=", + "lastModified": 1706888173, + "narHash": "sha256-D7bJTQeDqkNYYw6Tc+AJplFw2eutke1SjppsarU+N5I=", "owner": "hyprwm", "repo": "hyprland", - "rev": "4d403dac3244aab217fb9bf17a68e9a009fcadd8", + "rev": "cf1886ca44c78de3424d96fd18023eb0db759af6", "type": "github" }, "original": { @@ -433,7 +470,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1698420672, @@ -460,11 +497,11 @@ ] }, "locked": { - "lastModified": 1704277720, - "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", + "lastModified": 1705915768, + "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", + "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b", "type": "github" }, "original": { @@ -473,13 +510,36 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "eriixpkgs", + "readme-py", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698974481, + "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "4bb5e752616262457bc7ca5882192a564c0472d2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1705677747, - "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "type": "github" }, "original": { @@ -492,11 +552,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" }, "original": { @@ -507,13 +567,29 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1706191920, + "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "type": "github" }, "original": { @@ -570,16 +646,18 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1705697961, - "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_7": { @@ -592,35 +670,33 @@ "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs_8": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1705697961, + "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1705677747, - "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", + "lastModified": 1706191920, + "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "type": "github" }, "original": { @@ -639,11 +715,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1705778871, - "narHash": "sha256-WWZzdIHqryR4fCmQehatmQ+S9hYQRH7nIxbvo4LiV6c=", + "lastModified": 1706870624, + "narHash": "sha256-73pux7f82JcIamAsQSMy/coTJQIZt0CvMMXNwZ11qGY=", "owner": "nix-community", "repo": "nixvim", - "rev": "06d97a1b4435ca2bc3d3bdb6a7646363034ce5a2", + "rev": "079c03228c20c9cf49ab4dda2aa65fc27233fc53", "type": "github" }, "original": { @@ -652,6 +728,32 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_5", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "eriixpkgs", + "readme-py", + "nixpkgs" + ], + "systems": "systems_8", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1705060653, + "narHash": "sha256-puYyylgrBS4AFAHeyVRTjTUVD8DZdecJfymWJe7H438=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "e0b44e9e2d3aa855d1dd77b06f067cd0e0c3860d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -671,11 +773,11 @@ ] }, "locked": { - "lastModified": 1705072518, - "narHash": "sha256-90dERRuG781f0EWjn2AOtScZqsTcpIFLpY8TN2VbkL8=", + "lastModified": 1705757126, + "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "274ae3979a0eacae422e1bbcf63b8b7a335e1114", + "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc", "type": "github" }, "original": { @@ -684,6 +786,26 @@ "type": "github" } }, + "readme-py": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_6", + "poetry2nix": "poetry2nix" + }, + "locked": { + "lastModified": 1706850735, + "narHash": "sha256-Z0aZSj1YZFZx35aG7lbBP6lVV5afSBlr7y9aXYh/cdw=", + "owner": "erictossell", + "repo": "readme-py", + "rev": "ce51e35b0f344463ab04e68e4f2117037f388722", + "type": "github" + }, + "original": { + "owner": "erictossell", + "repo": "readme-py", + "type": "github" + } + }, "root": { "inputs": { "NixOS-WSL": "NixOS-WSL", @@ -691,21 +813,21 @@ "eriixpkgs": "eriixpkgs", "home-manager": "home-manager_3", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" } }, "russh": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "utils": "utils_2" }, "locked": { - "lastModified": 1705776947, - "narHash": "sha256-rlN0senxPgG53hGneE0MqGvZi5n+d+N0gA7qRPOd++E=", + "lastModified": 1706142009, + "narHash": "sha256-nfQuooSBmsfh3WGva3qCli4BK/2KIXMBtDvgrbmjuQQ=", "owner": "erictossell", "repo": "russh", - "rev": "e962bea39d76830a6732140d8a4685e9ec7144b0", + "rev": "948dfb643c24c0f029d9917c0fd665b97ade3926", "type": "github" }, "original": { @@ -729,6 +851,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -806,16 +943,68 @@ }, "systems_7": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", + "type": "github" + } + }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "eriixpkgs", + "readme-py", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699786194, + "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", "type": "github" } }, @@ -839,7 +1028,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_6" + "systems": "systems_9" }, "locked": { "lastModified": 1705309234, @@ -859,18 +1048,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1703963193, - "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", + "lastModified": 1706359063, + "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" } }, @@ -891,11 +1080,11 @@ ] }, "locked": { - "lastModified": 1704659450, - "narHash": "sha256-3lyoUVtUWz1LuxbltAtkJSK2IlVXmKhxCRU2/0PYCms=", + "lastModified": 1706145785, + "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "6a5de92769d5b7038134044053f90e7458f6a197", + "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a08995f..2b0b69c 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ in nixpkgs.lib.nixosSystem { specialArgs = { username = "eriim"; - hostname = "principium"; + hostName = "principium"; hyprlandConfig = "desktop"; inherit system; } // attrs; @@ -63,7 +63,7 @@ in nixpkgs.lib.nixosSystem { specialArgs = { username = "eriim"; - hostname = "sisyphus"; + hostName = "sisyphus"; hyprlandConfig = "laptop"; inherit system; } // attrs; @@ -78,7 +78,7 @@ inherit system; specialArgs = { username = "nixos"; - hostname = "live-image"; + hostName = "live-image"; hyprlandConfig = "laptop"; inherit system; } // attrs; @@ -93,7 +93,7 @@ inherit system; specialArgs = { username = "eriim"; - hostname = "winix"; + hostName = "winix"; inherit system; } // attrs; modules = [ @@ -107,7 +107,7 @@ inherit system; specialArgs = { username = "eriim"; - hostname = "virtualis"; + hostName = "virtualis"; inherit system; } // attrs; modules = [ @@ -121,12 +121,13 @@ inherit system; specialArgs = { username = "eriim"; - hostname = "ambiens"; + hostName = "ambiens"; inherit system; } // attrs; modules = [ ./minimal.nix ./modules/hardware/network + ./modules/plasma ]; }; #ambiens @@ -139,7 +140,6 @@ { default = pkgs.mkShell { buildInputs = with pkgs; [ - git nixpkgs-fmt statix ]; diff --git a/hosts/ambiens/default.nix b/hosts/ambiens/default.nix index 655ebae..883a54a 100644 --- a/hosts/ambiens/default.nix +++ b/hosts/ambiens/default.nix @@ -16,4 +16,10 @@ "/crypto_keyfile.bin" = null; }; + services = { + spice-autorandr.enable = true; + spice-vdagentd.enable = true; + spice-webdavd.enable = true; + }; + } diff --git a/hosts/default.nix b/hosts/default.nix index f63482a..5d5ab1b 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,7 +1,7 @@ -{ hostname, ... }: +{ hostName, ... }: { imports = [ - ./${hostname} + ./${hostName} ./internationalisation ]; diff --git a/hosts/internationalisation/default.nix b/hosts/internationalisation/default.nix index 628910d..c88041f 100644 --- a/hosts/internationalisation/default.nix +++ b/hosts/internationalisation/default.nix @@ -6,7 +6,7 @@ i18n.defaultLocale = "en_CA.UTF-8"; services.xserver = { - layout = "us"; - xkbVariant = ""; + xkb.layout = "us"; + xkb.variant = ""; }; } diff --git a/hosts/winix/default.nix b/hosts/winix/default.nix index 37645ff..a4d6f86 100644 --- a/hosts/winix/default.nix +++ b/hosts/winix/default.nix @@ -1,4 +1,4 @@ -{ username, hostname, NixOS-WSL, ... }: +{ username, hostName, NixOS-WSL, ... }: { imports = [ @@ -10,6 +10,6 @@ nativeSystemd = true; }; - networking.hostName = "${hostname}"; + networking.hostName = "${hostName}"; } diff --git a/modules/apps/browsing/default.nix b/modules/apps/browsing/default.nix index 53e52e7..998a789 100644 --- a/modules/apps/browsing/default.nix +++ b/modules/apps/browsing/default.nix @@ -11,10 +11,21 @@ #chromium = { # enable = true; #}; - firefox.enable = true; + firefox = { + enable = true; + profiles = { + ${username} = { + isDefault = true; + settings = { + "browser.startup.homepage" = "http://localhost:8080"; + }; + }; + }; + }; }; }; + #----- System Configuration ----- #programs = { # chromium = { diff --git a/modules/core/nix/default.nix b/modules/core/nix/default.nix index e6a73ca..4a39392 100644 --- a/modules/core/nix/default.nix +++ b/modules/core/nix/default.nix @@ -22,4 +22,9 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; + + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; } diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix index cd7f1db..a3ca7bc 100644 --- a/modules/gnome/default.nix +++ b/modules/gnome/default.nix @@ -11,7 +11,6 @@ let docker unblank custom-accent-colors - system-monitor tailscale-qs tailscale-status ]; @@ -152,17 +151,17 @@ in # ---- System Configuration ---- services.xserver = { enable = true; - udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; desktopManager.gnome.enable = true; displayManager.gdm = { enable = true; wayland = true; }; - gnome = { - evolution-data-server.enable = true; - gnome-keyring.enable = true; - }; }; + services.gnome = { + evolution-data-server.enable = true; + gnome-keyring.enable = true; + }; + programs.dconf.enable = true; @@ -171,9 +170,9 @@ in environment.gnome.excludePackages = (with pkgs; [ gnome-photos gnome-tour + gedit ]) ++ (with pkgs.gnome; [ gnome-music - gedit epiphany geary evince diff --git a/modules/hardware/network/default.nix b/modules/hardware/network/default.nix index 4765e29..04c9c99 100644 --- a/modules/hardware/network/default.nix +++ b/modules/hardware/network/default.nix @@ -1,8 +1,12 @@ -{ hostname, username, ... }: +{ hostName, username, ... }: { networking = { - networkmanager.enable = true; - hostName = "${hostname}"; + networkmanager = { + enable = true; + wifi.powersave = true; + }; + + inherit hostName; extraHosts = '' 192.168.2.195 nixbox 192.168.2.196 nixboard diff --git a/modules/hyprland/config/desktop.nix b/modules/hyprland/config/desktop.nix index 5915436..0d26d8f 100644 --- a/modules/hyprland/config/desktop.nix +++ b/modules/hyprland/config/desktop.nix @@ -3,6 +3,7 @@ home-manager.users.${username} = _: { home.file = { ".config/hypr/hyprpaper.conf".text = '' + splash = false preload = ~/.config/backgrounds/232136.png preload = ~/.config/backgrounds/1A1C23.png preload = ~/.config/backgrounds/keyboard.png @@ -25,14 +26,14 @@ ".config/hypr/hyprland.conf".text = '' monitor=DP-2,preferred,1080x400,1 - monitor=HDMI-A-1,preferred,3640x1200,1 + monitor=HDMI-A-1,preferred,3640x400,1 monitor=DP-1,preferred,0x0,1,transform,3 monitor=,preferred,auto,auto exec-once = waybar & hyprpaper & mako & lxqt-policykit-agent & dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # some default env vars. - env=BROWSER, firefox + env=BROWSER,firefox env=XCURSOR_SIZE,24 env=XDG_CURRENT_DESKTOP,Hyprland @@ -93,6 +94,7 @@ $wH = Hotel $wI = are ya lost bud + # for all categories, see https://wiki.hyprland.org/configuring/variables/ input { kb_layout = us diff --git a/modules/hyprland/config/laptop.nix b/modules/hyprland/config/laptop.nix index 046a782..35a27e7 100644 --- a/modules/hyprland/config/laptop.nix +++ b/modules/hyprland/config/laptop.nix @@ -3,6 +3,7 @@ home-manager.users.${username} = _: { home.file = { ".config/hypr/hyprpaper.conf".text = '' + splash = false preload = ~/.config/backgrounds/232136.png preload = ~/.config/backgrounds/1A1C23.png wallpaper = eDP-1, ~/.config/backgrounds/232136.png diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index 2812b85..a0a6026 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -23,6 +23,9 @@ wl-clipboard # Required if applications are having trouble opening links xdg-utils + + gnome.adwaita-icon-theme + glib ]; }; diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix index 7dcfbed..0164af5 100644 --- a/modules/plasma/default.nix +++ b/modules/plasma/default.nix @@ -7,4 +7,9 @@ }; desktopManager.plasma5.enable = true; }; + qt = { + enable = true; + platformTheme = "gnome"; + style = "adwaita-dark"; + }; } diff --git a/modules/virt/libvirt.nix b/modules/virt/libvirt.nix index 13281f9..cc3ba3c 100644 --- a/modules/virt/libvirt.nix +++ b/modules/virt/libvirt.nix @@ -19,11 +19,12 @@ spice spice-gtk spice-protocol - virt-manager virt-viewer virtio-win win-spice + ]; + programs.virt-manager.enable = true; home-manager.users.${username} = { dconf.settings = {