diff --git a/flake.lock b/flake.lock index 72140fa..4f1e1c5 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1765900596, - "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", + "lastModified": 1772292445, + "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", + "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1772422417, - "narHash": "sha256-TyLPxtYIhHP7QNwVwrDRxaj+XKorVOyA4EKhRjpBI8U=", + "lastModified": 1772820255, + "narHash": "sha256-vdktxEQihZUcKiwbaYCBl8LuTrJZULpjwqtJyBzXBN8=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "8ff8842cf58569ebe830f37350c6f1602fa35c39", + "rev": "aada771f510dbd9ac48614cc7b4b21a292989d3a", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1772275362, - "narHash": "sha256-jIQpfzcPBXe1URbf82p/9JxJguZuZZBlMJnW1x7B5jE=", + "lastModified": 1772644657, + "narHash": "sha256-7zQSBFv9gFeYhe65NchqLLste7mJ396jA1OnNcf+OQQ=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "4a363451cc86ff5304514c8bf25eac42eb46b8c8", + "rev": "ff5ccc4fa26d5272d929fb9c1838593a6347ca10", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1772269331, - "narHash": "sha256-DucfJqDGDO7PynT3sRuBfHw5jC0K2Oy0oqpJWueh4xw=", + "lastModified": 1772731186, + "narHash": "sha256-y70pS9Cma7+WCsni3VTacHh9g/udulmBS6zrYE2Fz64=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "6e2a0214de28cf0af1b72a2076bbfc77d12d96e8", + "rev": "eac8168ee15f742547d4d20ba5c7fea283f23019", "type": "github" }, "original": { @@ -146,29 +146,28 @@ "cerulean": { "inputs": { "deploy-rs": "deploy-rs", - "home-manager": "home-manager", "microvm": "microvm", "nixpkgs": [ "nixpkgs" ], "nt": "nt", + "sops-nix": "sops-nix", "systems": [ "systems" ] }, "locked": { - "lastModified": 1771409623, - "narHash": "sha256-1IhHueuQTVCVrui700IP9DfLXwb3kU2rnEWPSdxQY0k=", - "ref": "refs/heads/main", - "rev": "d5211287bd3cb96078f2053488d67d557848a8f2", - "revCount": 176, - "type": "git", - "url": "https://tearforge.net/cry/cerulean" + "lastModified": 1772852754, + "narHash": "sha256-rYmaW2+zmFXM7Mp+B/fsBkzbAoeApj04F1fSmiS3mXU=", + "owner": "cry128", + "repo": "cerulean", + "rev": "ef5bc338566670380ceec75eb692697c9e81fb7e", + "type": "github" }, "original": { - "rev": "d5211287bd3cb96078f2053488d67d557848a8f2", - "type": "git", - "url": "https://tearforge.net/cry/cerulean" + "owner": "cry128", + "repo": "cerulean", + "type": "github" } }, "crane": { @@ -234,11 +233,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1772435729, - "narHash": "sha256-7Ln7IuX8nMIqfiDcX8jYkEAsf9oW8GAirvlK5SBPsds=", + "lastModified": 1772780947, + "narHash": "sha256-cblRAy3ctJniRFaSLpqYeHor+RJhkptPZNMUc4Sl+v4=", "owner": "nix-community", "repo": "fenix", - "rev": "ec69754e35f5b0088645a69e486ac00e90217757", + "rev": "26a5e59df51222c849deb63c9196ac6d7a531535", "type": "github" }, "original": { @@ -320,15 +319,15 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -411,11 +410,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -484,16 +483,15 @@ "home-manager": { "inputs": { "nixpkgs": [ - "cerulean", "nixpkgs" ] }, "locked": { - "lastModified": 1772380125, - "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", + "lastModified": 1772633058, + "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", + "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", "type": "github" }, "original": { @@ -510,11 +508,11 @@ ] }, "locked": { - "lastModified": 1772380461, - "narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=", + "lastModified": 1772807318, + "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=", "owner": "nix-community", "repo": "home-manager", - "rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961", + "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8", "type": "github" }, "original": { @@ -525,27 +523,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772380125, - "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "zen", @@ -611,11 +588,11 @@ ] }, "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", + "lastModified": 1770511807, + "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", + "rev": "7c75487edd43a71b61adb01cae8326d277aab683", "type": "github" }, "original": { @@ -643,17 +620,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1766604420, - "narHash": "sha256-2Kqg1YNtjPGXc1DIzBeESL8hiuUNUn3c3Oimab19Zn8=", + "lastModified": 1772833450, + "narHash": "sha256-XuuvhTD/72mH8MBncTeOyN0JzLCtwav7lkwBQlIofd4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "25250527793eb04bb60f103abe7f06370b9f6e1c", + "rev": "4152ac76d0813d9d0f67d2f04653a13fa6e17433", "type": "github" }, "original": { "owner": "hyprwm", "repo": "Hyprland", - "rev": "25250527793eb04bb60f103abe7f06370b9f6e1c", "type": "github" } }, @@ -690,11 +666,11 @@ ] }, "locked": { - "lastModified": 1765643131, - "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", + "lastModified": 1767023960, + "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", + "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", "type": "github" }, "original": { @@ -774,11 +750,11 @@ ] }, "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", + "lastModified": 1771866172, + "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", + "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41", "type": "github" }, "original": { @@ -851,11 +827,11 @@ ] }, "locked": { - "lastModified": 1766160771, - "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", + "lastModified": 1771271487, + "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", + "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", "type": "github" }, "original": { @@ -876,11 +852,11 @@ ] }, "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", + "lastModified": 1770501770, + "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", + "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40", "type": "github" }, "original": { @@ -905,11 +881,11 @@ ] }, "locked": { - "lastModified": 1766253200, - "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", + "lastModified": 1771606233, + "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "1079777525b30a947c8d657fac158e00ae85de9d", + "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a", "type": "github" }, "original": { @@ -1035,11 +1011,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1772456032, - "narHash": "sha256-QSbTGcfBlcjFYNvxhbV8DDMLP9CEfJJOEckJL34+T48=", + "lastModified": 1772792509, + "narHash": "sha256-c2X+x/D8txqV5UaN6TYYh9PEXyMaWVZl4mAQ0Sl21f8=", "owner": "DreamMaoMao", "repo": "mangowc", - "rev": "46e867deb9dfd58abb22ec92b19461d3761b1f3d", + "rev": "9a17a0279c39b330d155d50282d1d2641d519dc3", "type": "github" }, "original": { @@ -1057,11 +1033,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1772338235, - "narHash": "sha256-9XcwtSIL/c+pkC3SBNuxCJuSktFOBV1TLvvkhekyB8I=", + "lastModified": 1771365290, + "narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "9d1ff9b53532908a5eba7707931c9093508b6b92", + "rev": "789c90b164b55b4379e7a94af8b9c01489024c18", "type": "github" }, "original": { @@ -1078,11 +1054,11 @@ "spectrum": "spectrum_2" }, "locked": { - "lastModified": 1772338235, - "narHash": "sha256-9XcwtSIL/c+pkC3SBNuxCJuSktFOBV1TLvvkhekyB8I=", + "lastModified": 1772742184, + "narHash": "sha256-zGnRxJQZ8wZTwvSxF4SAGoefbta15/W032tK22uIF2E=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "9d1ff9b53532908a5eba7707931c9093508b6b92", + "rev": "a257ca90febb686c75826918f9f8876d74f875eb", "type": "github" }, "original": { @@ -1269,11 +1245,11 @@ ] }, "locked": { - "lastModified": 1772266502, - "narHash": "sha256-HBO3W1ooO9UwmxwwwFflnbCrAVHhaxpB8YnxFGPvOsY=", + "lastModified": 1772813986, + "narHash": "sha256-x0fD+LL+O99p36c2UnjnHvVq4/7TvGH/8G5lTNIJBCo=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "e805e50f0cc8b9f2d950dc81cd9ee1c986899eaf", + "rev": "e433a2919eb9b3a8c85ab3017c08685816e63a66", "type": "github" }, "original": { @@ -1284,11 +1260,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772402963, - "narHash": "sha256-+MupheX+ghNTSAg1XNppNApDC+FvvgpUXyU6sJSIsJo=", + "lastModified": 1772774498, + "narHash": "sha256-85HBHBEzVRQ0ZRe6u3E2snUvAyTr5mSvi5m2vl4HExo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d41521c807dccb71b1b866ac3b7df5a59e726d9d", + "rev": "943ba5b1a58e68eb9a2c284ba6e3b30ebfe45abe", "type": "github" }, "original": { @@ -1330,11 +1306,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -1345,11 +1321,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1772458868, - "narHash": "sha256-vnqeYbLjtEubh0vDLAxYl+STQ0XAINWdwzipH9sL7k8=", + "lastModified": 1772820052, + "narHash": "sha256-qXEI8n+4eXT+BqMzUMuKFdkltE82TjgIceiJCpdjzD4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6896fd3d7f8a7cdd79d2a8355ce0d79db18dc875", + "rev": "d78e468770f4ab5e00c5015f4d77c1a499a76dc8", "type": "github" }, "original": { @@ -1361,11 +1337,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1772453524, - "narHash": "sha256-2VR3/3A0mD42BYh6mNkxJ3W4qSy6mxa7Q84S4bR0VrA=", + "lastModified": 1772820753, + "narHash": "sha256-Sv689sGseiqNPXGSggxrESyivroe8cgY4dxqJdBLsEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d1bb154f92b51fa8d6fd6323dd60e4d70eb5e57", + "rev": "e2239e5b2c5676b963d78dccbee06a9bbbdb05d6", "type": "github" }, "original": { @@ -1377,11 +1353,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1772624091, + "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", "type": "github" }, "original": { @@ -1409,11 +1385,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1772047000, - "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=", + "lastModified": 1772598333, + "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e", + "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", "type": "github" }, "original": { @@ -1453,11 +1429,11 @@ ] }, "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "lastModified": 1772024342, + "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", "type": "github" }, "original": { @@ -1489,7 +1465,7 @@ "cachyos": "cachyos", "cerulean": "cerulean", "fenix": "fenix", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", "hyprland-git": "hyprland-git", "hyprland-plugins": "hyprland-plugins", @@ -1512,11 +1488,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1772366660, - "narHash": "sha256-UfVF6W3LKSl+KMM510AXrGOdOdkU0PTZd3xyee14iRc=", + "lastModified": 1772701851, + "narHash": "sha256-2g4Xg+w6wx2ewn1Tv576RzDc6Uof99H8kofHWdJktEs=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "566fe415d158452c72feb026f43e8d81e249ccb0", + "rev": "2a8f00fb9344cc6701063192fe0aaf66ecf9d337", "type": "github" }, "original": { @@ -1605,6 +1581,27 @@ "type": "github" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "cerulean", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772495394, + "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "spectrum": { "flake": false, "locked": { @@ -1647,11 +1644,11 @@ ] }, "locked": { - "lastModified": 1772392844, - "narHash": "sha256-jG6LoavnG1iVPXo9EGrvZoP4cgcXnsXXSydC6wKPihY=", + "lastModified": 1772494187, + "narHash": "sha256-6ksgNAFXVK+Cg/6ww7bB2nJUPZlnS75UwZC7G+L03EE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "74d7bb896e98cc3e87e7d0064a968f196fccaa90", + "rev": "915ab06b046d05613041780c575c62a32fe67cea", "type": "github" }, "original": { @@ -1836,17 +1833,17 @@ }, "zen": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1772426935, - "narHash": "sha256-fLxV/FzP06eaoMFzwrnKk9x0b+kaNNjbFfp6+rsRKGs=", + "lastModified": 1772772172, + "narHash": "sha256-OCEb6jXTvhnMTMqMLleYChekDO/zh+VtunBAS0WevPM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6caef0bf5e38a793fd269333f000b7299b160900", + "rev": "5f8f34c0dd56808ecbfa35697353c455e4a416b3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9cabd4b..4f838b5 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ }; cerulean = { - url = "git+https://tearforge.net/cry/cerulean?rev=d5211287bd3cb96078f2053488d67d557848a8f2"; + url = "github:cry128/cerulean"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; @@ -36,8 +36,8 @@ # wm/de/apps/theming flakes hyprland-git = { # pinned rev because color management is broken on hyprland - url = "github:hyprwm/Hyprland/25250527793eb04bb60f103abe7f06370b9f6e1c"; - #url = "github:hyprwm/Hyprland"; + # url = "github:hyprwm/Hyprland/25250527793eb04bb60f103abe7f06370b9f6e1c"; + url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; hyprland-plugins = { @@ -101,5 +101,6 @@ extra-experimental-features = "pipe-operators"; }; - outputs = inputs: import ./snow.nix inputs; + outputs = {cerulean, ...} @ inputs: + cerulean.snow.flake inputs ./.; } diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index e12dd41..36aea1f 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -86,6 +86,7 @@ # fonts nerd-fonts.departure-mono # pretty pixel art font i love!! x3 nerd-fonts.jetbrains-mono + noto-fonts # cli / tui tools and commands! eza # replaces: ls (rust) @@ -136,7 +137,6 @@ tridactyl-native # for firefox browsers chromium # (chromium) obsidian # literally best notes app (i use vim mode) - kdePackages.dolphin qimgv # image viewer! feh # other image viewer! (im indecisive) vesktop # modded discord client! diff --git a/homes/modules/programs/nixcord.nix b/homes/modules/programs/nixcord.nix index 165c765..bdeb978 100644 --- a/homes/modules/programs/nixcord.nix +++ b/homes/modules/programs/nixcord.nix @@ -1,4 +1,9 @@ -{inputs, ...}: { +{ + inputs, + upkgs, + mpkgs, + ... +}: { imports = [ inputs.nixcord.homeModules.nixcord ]; @@ -6,10 +11,12 @@ programs.nixcord = { enable = true; equibop.enable = true; + equibop.package = upkgs.equibop; discord = { vencord.enable = false; equicord.enable = true; + equicord.package = mpkgs.equicord; }; config = { diff --git a/homes/modules/wm/hyprland/hyprland.nix b/homes/modules/wm/hyprland/hyprland.nix index ccd88d0..de7deee 100644 --- a/homes/modules/wm/hyprland/hyprland.nix +++ b/homes/modules/wm/hyprland/hyprland.nix @@ -134,7 +134,6 @@ "$mod+alt, c, killactive" "$mod, f, fullscreen" "$mod, x, togglefloating" - "$mod, i, togglesplit" "$mod+Alt, Delete, exit" # exit hyprland # screenshots @@ -159,6 +158,9 @@ "Shift_R, XF86AudioPlay, exec, playerctl shuffle toggle" "Shift_R, XF86AudioNext, exec, playerctl loop track" + # dwindle layout keybinds + "$mod, i, layoutmsg, togglesplit" + # move focus "$mod, h, movefocus, l" "$mod, j, movefocus, d" diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index fb08d82..a86e456 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -1,5 +1,6 @@ { lib, + config, root, upkgs, ... @@ -25,6 +26,14 @@ # FIX: it said my disk was full kernelPackages = upkgs.linuxPackages_latest; kernelModules = ["v4l2loopback"]; + # force kernel to use dGPU + kernelParams = [ + "amdgpu.primary=0000:03:00.0" + "video=PCI:0000:03:00.0:e" + "initcall_blacklist=simpledrm_platform_driver_init" + "fbcon=map:0" + "pci=assign-busses" + ]; extraModulePackages = with kernelPackages; [v4l2loopback]; # qemu @@ -131,6 +140,30 @@ services = { displayManager.sddm.enable = true; displayManager.sddm.wayland.enable = true; + # force sddm to be on the dGPU + displayManager.sddm.wayland.compositor = "weston"; + displayManager.sddm.settings = let + xcfg = config.services.xserver; + # from: https://github.com/NixOS/nixpkgs/blob/1ad2d2e524cb1e7b91ebebcd10d224105dd4e1f2/nixos/modules/services/display-managers/sddm.nix#L132-L143 + # as for some reason they do it like this and it makes it harder for me to set the option correctly for my gpu + # NOTE: ask butterfly if there is a better way <3 + westonIni = (upkgs.formats.ini {}).generate "weston.ini" { + libinput = { + enable-tap = config.services.libinput.mouse.tapping; + left-handed = config.services.libinput.mouse.leftHanded; + }; + keyboard = { + keymap_model = xcfg.xkb.model; + keymap_layout = xcfg.xkb.layout; + keymap_variant = xcfg.xkb.variant; + keymap_options = xcfg.xkb.options; + }; + }; + in { + Wayland = { + CompositorCommand = "${lib.getExe upkgs.weston} --shell=kiosk --drm-device=card0 -c ${westonIni}"; + }; + }; udisks2.enable = true; flatpak.enable = true; @@ -219,7 +252,7 @@ imagePath = root + "/homes/aurora/profile.png"; in lib.mkIf (builtins.pathExists imagePath) [ - "L /var/lib/AccountsService/icons/aurora - - - - ${imagePath}" + "L+ /var/lib/AccountsService/icons/aurora - - - - ${imagePath}" ]; programs = { @@ -301,6 +334,9 @@ # linux packages!!! linuxPackages.v4l2loopback + # weston is needed for sddm + weston + # android yay android-tools diff --git a/snow.nix b/snow.nix index 8a63ff9..f54f5dc 100644 --- a/snow.nix +++ b/snow.nix @@ -1,6 +1,5 @@ -{cerulean, ...} @ inputs: -cerulean.mkNexus ./. (self: { - nexus = { +{inputs, ...}: { + nodes = { args = {inherit inputs;}; modules = with inputs; []; @@ -12,12 +11,7 @@ cerulean.mkNexus ./. (self: { servers = {}; }; - nodes = let - inherit - (self.nexus) - groups - ; - in { + nodes = { nixarawrui = { system = "x86_64-linux"; @@ -33,7 +27,7 @@ cerulean.mkNexus ./. (self: { arcturus = { system = "x86_64-linux"; - groups = [ + groups = groups: [ groups.servers ]; @@ -120,7 +114,7 @@ cerulean.mkNexus ./. (self: { lyra = { system = "x86_64-linux"; - groups = [ + groups = groups: [ groups.servers ]; @@ -132,4 +126,4 @@ cerulean.mkNexus ./. (self: { }; }; }; -}) +}