diff --git a/flake.lock b/flake.lock index 4c0733e..0d99a02 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731381599, - "narHash": "sha256-W+FuVxCdCiw7IaAWPajq9iOuM57zITFnbkw2ZQXfW9I=", + "lastModified": 1734227601, + "narHash": "sha256-H3lZV8A1cn2TopvJnjHmSLbzj12X9nlcVZuEWHHW+iE=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "23976d5dac8b0f07187bc3c95e3812304519e5e3", + "rev": "0a12841c81a192a6f76a51d9f07ad6bc22206cce", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "gpdPocket3_nixpkgs": { "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "lastModified": 1734202038, + "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d", "type": "github" }, "original": { @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -177,11 +177,11 @@ }, "h002_nixpkgs": { "locked": { - "lastModified": 1724855419, - "narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=", + "lastModified": 1734202038, + "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06", + "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "joe_nixpkgs": { "locked": { - "lastModified": 1728500571, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", + "lastModified": 1734202038, + "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", + "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d", "type": "github" }, "original": { @@ -257,32 +257,32 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733951536, + "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, "lio_nixpkgs": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -304,11 +304,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -320,43 +320,43 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1733220138, - "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1733330745, - "narHash": "sha256-jy34Nf4Tn1ITZcYyMBn1/7jA8bCCIZDpiVahqlCXfww=", + "lastModified": 1733900158, + "narHash": "sha256-Tu5ATWupdyxdlvqOYgdS2NpweapN6pYeQss20kxEUv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2f9d395f057a50f8076f633c10519035fce8d773", + "rev": "2bd5a84b9c99317f04fd91ed57ee012024a9f33f", "type": "github" }, "original": { @@ -384,16 +384,16 @@ }, "nixpkgs_stable": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -417,11 +417,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1733328780, - "narHash": "sha256-vQ346D7MqbUhiGe5dQG521QGgMa3k4JtcbdVKPxqWZk=", + "lastModified": 1733789009, + "narHash": "sha256-whmqdJuTZfJsRvu7vmqbZPXUd9obLJoAogvFTlbLUC0=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "77532363f8180ebd12669f08482182cecf67c8c6", + "rev": "db95d18a4f645ec6b745ef9db91adf4665824f22", "type": "github" }, "original": { @@ -433,11 +433,11 @@ "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": { "flake": false, "locked": { - "lastModified": 1728200262, - "narHash": "sha256-uJDuxc6iDo/fCtfRUpUmE4HIaH9YBs44+vXzw/yFP64=", + "lastModified": 1733574156, + "narHash": "sha256-AjDM3+n4+lNBQi8P2Yrh0Ab06uYCndBQT9TX36rDbOM=", "owner": "JoosepAlviste", "repo": "nvim-ts-context-commentstring", - "rev": "9c74db656c3d0b1c4392fc89a016b1910539e7c0", + "rev": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f", "type": "github" }, "original": { @@ -465,11 +465,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1733302013, - "narHash": "sha256-F2fVuGXAUg4XKb3nCbXaO0AgIyRtGWYglK7am4jU49c=", + "lastModified": 1733775668, + "narHash": "sha256-4GCKx7krZ7aUIK6Xo/07sMWXSRuRUJJ8qTvwJ0Efrg4=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "558310ae07b7bf0dffc478160513bb5c845f263c", + "rev": "e41b0002fe4196825450ab5a6343300c40791d51", "type": "github" }, "original": { @@ -481,11 +481,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1726376728, - "narHash": "sha256-90Wq+vT361mTaGU/SvAezqJkX9HHmZ2GI2fKBDxPn04=", + "lastModified": 1733856815, + "narHash": "sha256-6U7E/i5FuNXQy+sF4C5DVxuTPqNKD5wxUgFohpOjm9Q=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f", + "rev": "53e907ffe5eedebdca1cd503b00aa8692068ca46", "type": "github" }, "original": { @@ -545,11 +545,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1733270554, - "narHash": "sha256-Uym8zZpjhkQBpfMxG6JpEn0gnRPSmrMcrzSvHgXs4gY=", + "lastModified": 1733821249, + "narHash": "sha256-ev02DBcXNY9cFEeCFjc5Kj2P7W0Jlv0oHWIvIuk8oos=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "80b0243371163258e6eb3f0932f717b2d732b64e", + "rev": "f8c2a0f5d51b800ea4625808e243d9e8f7c5e1df", "type": "github" }, "original": { @@ -609,11 +609,11 @@ "nvim_plugin-folke/lazy.nvim": { "flake": false, "locked": { - "lastModified": 1732091289, - "narHash": "sha256-4M2MumRyX5XmsomXPMjOAJQsNaaRnbWmtUDm1fM3izk=", + "lastModified": 1733857941, + "narHash": "sha256-ggseHUfnMiUnyFia9driFzz7civjn/9TG8aIQLU+N4A=", "owner": "folke", "repo": "lazy.nvim", - "rev": "56ead98e05bb37a4ec28930a54d836d033cf00f2", + "rev": "7c493713bc2cb392706866eeba53aaef6c8e9fc6", "type": "github" }, "original": { @@ -673,11 +673,11 @@ "nvim_plugin-hrsh7th/cmp-nvim-lsp": { "flake": false, "locked": { - "lastModified": 1715931395, - "narHash": "sha256-CT1+Z4XJBVsl/RqvJeGmyitD6x7So0ylXvvef5jh7I8=", + "lastModified": 1733823748, + "narHash": "sha256-iaihXNCF5bB5MdeoosD/kc3QtpA/QaIDZVLiLIurBSM=", "owner": "hrsh7th", "repo": "cmp-nvim-lsp", - "rev": "39e2eda76828d88b773cc27a3f61d2ad782c922d", + "rev": "99290b3ec1322070bcfb9e846450a46f6efa50f0", "type": "github" }, "original": { @@ -705,11 +705,11 @@ "nvim_plugin-hrsh7th/nvim-cmp": { "flake": false, "locked": { - "lastModified": 1732948484, - "narHash": "sha256-+0nflL0WCaxPuJgUviELhbXASNYYl/SKZ+nz70sEAXU=", + "lastModified": 1733799872, + "narHash": "sha256-Aht1m2V+yRvmrLoBC4QGYG/p/tmDbnZe1nT3V5k7S58=", "owner": "hrsh7th", "repo": "nvim-cmp", - "rev": "ca4d3330d386e76967e53b85953c170658255ecb", + "rev": "3403e2e9391ed0a28c3afddd8612701b647c8e26", "type": "github" }, "original": { @@ -817,11 +817,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1728748235, - "narHash": "sha256-iEA14DhSxmKxPE2TCa7csJ2ZSaN7enI0kwZCxDPL/e4=", + "lastModified": 1733892652, + "narHash": "sha256-lfZl1cnk5tpZXefDk6EF+ipi7JLhxNYV5V3CA1CmP+A=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "027d6f991927a71bd510a7673ae5bb404ca2a1c7", + "rev": "38a38ffd0c0ce7e47c2baede3e20bfeceb3f97e0", "type": "github" }, "original": { @@ -865,11 +865,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1733312834, - "narHash": "sha256-AIWHuxGX8GMz7jhzb4eHMeb5qd9t/YAmWLnnMNO+npc=", + "lastModified": 1733693806, + "narHash": "sha256-2t2fiqMlOWy48TXpqWbVJfwEQnT+G9BubOd7SVBQSWw=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "bf3d8c7bcbf20a7e7f4af36c2d5390ca6ad43281", + "rev": "a244210b28f9055c2b4cfa85c92c8a71c13671c9", "type": "github" }, "original": { @@ -881,11 +881,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1733290567, - "narHash": "sha256-Wh2evCVtvRjsIR9ws5Svt8Po21F6seieIy6ienBUrHg=", + "lastModified": 1733807465, + "narHash": "sha256-AdNxaLAZTD3cOBNPBkf2W1UllNTnCmUTeGQ3SxnwTr0=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "6e385d2fe5da6714f00142afbd8d3591d330ffd7", + "rev": "5a812abc65d529ea7673059a348814c21d7f87ff", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1732428058, - "narHash": "sha256-HHgC7aH2m3gv2FtOK1jhjBgJOGWrdc+FQOEpMiEWe74=", + "lastModified": 1733619933, + "narHash": "sha256-3ZIxXhrCQM3rZA7QwqTo8VV5yxyvd3WhQjiAVOgK/l8=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "ca7c4c33cac2ad66ec69d45e465379716ef0cc97", + "rev": "db8d7ac1f524fc6f808764b29fa695c51e014aa6", "type": "github" }, "original": { @@ -1041,11 +1041,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1732925137, - "narHash": "sha256-Sh+r54pTI60j5tOmSyEkTVS6MzMIt52nqjNdtMp8kpI=", + "lastModified": 1733841649, + "narHash": "sha256-7ma/wkA+nHzp+Le9OQTjEeOCs3ZmYvciVuCloI5Jw5c=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "203da76ecfbb4b192cf830665b03eb651b635c94", + "rev": "e73d2774d12d0ecf9e05578d692ba1ea50508cf2", "type": "github" }, "original": { @@ -1057,11 +1057,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1733329191, - "narHash": "sha256-3bUPP/wOkfaOMaQGQHKB/i1aZ1DrWNB+iJ2dXbZeMAo=", + "lastModified": 1733643905, + "narHash": "sha256-1ERiDz2A4NeX54bMgMsIAkSDVXtYA2PBzvJTh7upWoY=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "8ebcf62cf48dd97b3d121884ecb6bc4c00f1b069", + "rev": "3288c5af7d3820d716272f1d05ab661cc540a5d6", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1733253508, - "narHash": "sha256-n6sOzOpHkvbDyyNWuqy/t86MhkkB5MYoNdx0ljuuhRU=", + "lastModified": 1733857807, + "narHash": "sha256-hT3K+UzNpVGScgdZWtyQj+kFbqcD6PNeRTZ2f9nDEXY=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "02fd64fb3d4b18ec029c0e0683c3dc3ec6d2c5b8", + "rev": "f4e8837878fc5712d053ba3091a73d27d96a09e2", "type": "github" }, "original": { @@ -1265,11 +1265,11 @@ "nvim_plugin-yetone/avante.nvim": { "flake": false, "locked": { - "lastModified": 1733309827, - "narHash": "sha256-ShJv87xIkHkXi62d9VomfP8QI4kEosS1hrMc/rSmvEs=", + "lastModified": 1733420133, + "narHash": "sha256-erB/WVH+K9vNM30Bmfih7DuuLy+1Ns/begNCMUYbNEA=", "owner": "yetone", "repo": "avante.nvim", - "rev": "6206998f240da6734bd49d830d76b2035d173f1d", + "rev": "4464b7f4ae26254cd506a354284a02129941e244", "type": "github" }, "original": { @@ -1297,11 +1297,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1729295476, - "narHash": "sha256-UY6N2Q+egh+Cn4REZXrSGH9ElWQBedl0n8tWJvGe7vs=", + "lastModified": 1733331245, + "narHash": "sha256-0GwiWk3sNJbU0W+YoAKEdOxNmeLoHe2a8iy2ohRlukQ=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0", + "rev": "c810500b69cb8bcea58f2be635cb1340011714b5", "type": "github" }, "original": { @@ -1418,11 +1418,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1733331011, - "narHash": "sha256-HNbtLYfvHyHuoT9aBtL8s+rOtbJo7AGaEccvbpw4XU8=", + "lastModified": 1734336949, + "narHash": "sha256-wxOSA/sAxCsdXu0xeRNVwJlKzbyyhAYDmSD8+DUt+eE=", "ref": "refs/heads/master", - "rev": "70ecd62a91bfb50eff3bfcb3289a544b162cada5", - "revCount": 240, + "rev": "0eac4298a3f5e7dc0c7d31f7a034c864926f6b36", + "revCount": 243, "type": "git", "url": "https://git.joshuabell.xyz/nvim" }, @@ -1477,11 +1477,11 @@ ] }, "locked": { - "lastModified": 1731292155, - "narHash": "sha256-fYVoUUtSadbOrH0z0epVQDsStBDS/S/fAK//0ECQAAI=", + "lastModified": 1734143514, + "narHash": "sha256-1+r8wYucn8kp9d/IBW1uYGs31QQmSZURElsiOTx65xM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7c4cd99ed7604b79e8cb721099ac99c66f656b3a", + "rev": "81fe5c27cb281a9b796d7ad05ad9179e5bd0c78d", "type": "github" }, "original": { @@ -1519,11 +1519,11 @@ ] }, "locked": { - "lastModified": 1733279627, - "narHash": "sha256-NCNDAGPkdFdu+DLErbmNbavmVW9AwkgP7azROFFSB0U=", + "lastModified": 1733884434, + "narHash": "sha256-8GXR9kC07dyOIshAyfZhG11xfvBRSZzYghnZ2weOKJU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4da5a80ef76039e80468c902f1e9f5c0eab87d96", + "rev": "d0483df44ddf0fd1985f564abccbe568e020ddf2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9a5f47f..83ce7ae 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,9 @@ inputs = { # Host flake pinning - lio_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + lio_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; lio_home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "lio_nixpkgs"; }; @@ -27,7 +27,7 @@ inputs.nixpkgs.follows = "gpdPocket3_nixpkgs"; }; - nixpkgs_stable.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs_stable.url = "github:nixos/nixpkgs/nixos-24.11"; # Nix utility methods nypkgs = { url = "github:yunfachi/nypkgs"; diff --git a/hosts/h002/configuration.nix b/hosts/h002/configuration.nix index d7e03b6..109f289 100644 --- a/hosts/h002/configuration.nix +++ b/hosts/h002/configuration.nix @@ -15,7 +15,7 @@ boot_grub.enable = true; shell_common.enable = true; de_gnome_xorg.enable = true; - audio_pulse.enable = true; + audio.enable = true; neovim.enable = true; tty_caps_esc.enable = true; docker.enable = true; diff --git a/hosts/lio/configuration.nix b/hosts/lio/configuration.nix index 30f0742..f9fc25a 100644 --- a/hosts/lio/configuration.nix +++ b/hosts/lio/configuration.nix @@ -14,7 +14,7 @@ boot_systemd.enable = true; shell_common.enable = true; # de_cosmic.enable = true; - audio_pulse.enable = true; + audio.enable = true; de_gnome_xorg.enable = true; # de_gnome_wayland.enable = true; neovim.enable = true; @@ -25,6 +25,7 @@ stormd.enable = true; nebula.enable = true; rustdesk.enable = true; + saber.enable = true; }; # opening this port for dev purposes diff --git a/modules/audio_pulse.nix b/modules/audio_pulse.nix index d4503fe..079d102 100644 --- a/modules/audio_pulse.nix +++ b/modules/audio_pulse.nix @@ -6,7 +6,7 @@ }: with lib; let - name = "audio_pulse"; + name = "audio"; cfg = config.mods.${name}; in { @@ -18,8 +18,22 @@ in config = mkIf cfg.enable { # Enable sound. - hardware.pulseaudio.enable = true; - hardware.pulseaudio.package = pkgs.pulseaudioFull; - environment.systemPackages = [ pkgs.pavucontrol ]; + # sound.enable = true; + # services.pipewire.pulse.enable = false; + # services.pipewire.enable = false; + # services.pipewire.audio.enable =false; + # hardware.pulseaudio.enable = true; + # hardware.pulseaudio.package = pkgs.pulseaudioFull; + # environment.systemPackages = [ pkgs.pavucontrol ]; + + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + }; }; } diff --git a/modules/saber.nix b/modules/saber.nix new file mode 100644 index 0000000..adc2218 --- /dev/null +++ b/modules/saber.nix @@ -0,0 +1,26 @@ +{ + config, + lib, + pkgs, + settings, + ... +}: +with lib; +let + name = "saber"; + cfg = config.mods.${name}; +in +{ + options = { + mods.${name} = { + enable = mkEnableOption (lib.mdDoc "Enable ${name}"); + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + saber + ]; + }; +} + diff --git a/modules/validations.nix b/modules/validations.nix index 548ee4d..5b5a991 100644 --- a/modules/validations.nix +++ b/modules/validations.nix @@ -19,10 +19,11 @@ ''; } { - assertion = !(config.mods.de_cosmic.enable && config.mods.audio_pulse.enable); + # // TODO check sinc epoulse is no longer + assertion = !(config.mods.de_cosmic.enable && config.mods.audio.enable); message = '' - Configuration Error: cannot use pulse audio with cosmic. - Remove: mods.audio_pulse.enable + Configuration Error: cannot use audio with cosmic. Check if this is true anymore... + Remove: mods.audio.enable ''; } ];