diff --git a/flake.lock b/flake.lock index 23d11379..250ece38 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1710003968, - "narHash": "sha256-g8+K+mLiNG5uch35Oy9oDQBAmGSkCcqrd0Jjme7xiG0=", + "lastModified": 1711299236, + "narHash": "sha256-6/JsyozOMKN8LUGqWMopKTSiK8N79T8Q+hcxu2KkTXg=", "owner": "ipetkov", "repo": "crane", - "rev": "10484f86201bb94bd61ecc5335b1496794fedb78", + "rev": "880573f80d09e18a11713f402b9e6172a085449f", "type": "github" }, "original": { @@ -599,7 +599,7 @@ }, "flake-utils_10": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1701680307, @@ -617,7 +617,7 @@ }, "flake-utils_11": { "inputs": { - "systems": "systems_13" + "systems": "systems_14" }, "locked": { "lastModified": 1701680307, @@ -635,7 +635,7 @@ }, "flake-utils_12": { "inputs": { - "systems": "systems_14" + "systems": "systems_15" }, "locked": { "lastModified": 1701680307, @@ -653,7 +653,7 @@ }, "flake-utils_13": { "inputs": { - "systems": "systems_15" + "systems": "systems_16" }, "locked": { "lastModified": 1710146030, @@ -671,7 +671,7 @@ }, "flake-utils_14": { "inputs": { - "systems": "systems_16" + "systems": "systems_17" }, "locked": { "lastModified": 1705309234, @@ -689,7 +689,7 @@ }, "flake-utils_15": { "inputs": { - "systems": "systems_17" + "systems": "systems_18" }, "locked": { "lastModified": 1710146030, @@ -707,7 +707,7 @@ }, "flake-utils_16": { "inputs": { - "systems": "systems_18" + "systems": "systems_19" }, "locked": { "lastModified": 1709126324, @@ -760,7 +760,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -778,7 +778,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -796,7 +796,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1685518550, @@ -814,7 +814,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1685518550, @@ -832,7 +832,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1701680307, @@ -850,7 +850,7 @@ }, "flake-utils_9": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1710146030, @@ -875,11 +875,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -985,11 +985,11 @@ ] }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1711868868, + "narHash": "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "30f2ec39519f4f5a8a96af808c439e730c15aeab", "type": "github" }, "original": { @@ -1028,11 +1028,11 @@ ] }, "locked": { - "lastModified": 1711604890, - "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=", + "lastModified": 1711625603, + "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df", + "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "type": "github" }, "original": { @@ -1046,14 +1046,15 @@ "nixpkgs": [ "hyprlock", "nixpkgs" - ] + ], + "systems": "systems_4" }, "locked": { - "lastModified": 1708212860, - "narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=", + "lastModified": 1711250455, + "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "11d5ccda071c153dfdc18ef65338956a51cef96a", + "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", "type": "github" }, "original": { @@ -1068,14 +1069,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { - "lastModified": 1711228014, - "narHash": "sha256-AF5i25DEYK7bLevSivoNwyLlQ55sLgTIBJaiS8WWEvU=", + "lastModified": 1711884603, + "narHash": "sha256-y1Om75muuJcEoLd/FOYGIZ5/ja/Mc4iBX/9S7vWF0C8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "2448774de3532e8fdc65b329831ff37208e20f38", + "rev": "071ebcefb9070e4397d75103f5f535b58dacf250", "type": "github" }, "original": { @@ -1094,11 +1095,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1711145371, - "narHash": "sha256-PfnORvxKgKzy7aZD2azOWBbZo7LKAsvQ3bGXJPOvNXA=", + "lastModified": 1711841488, + "narHash": "sha256-FUtFI1D0k+oVJGs1PnS81INhWNKxBRuEcFj4Ukla3oU=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "f9c746a7c32ae0818fade2f60adeffe8d779800a", + "rev": "42ae9156458ab4c224f6ca155fc715f9fae44e3f", "type": "github" }, "original": { @@ -1120,11 +1121,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1710837180, - "narHash": "sha256-WVkLclGrUliLJUl+XaJplo09VdxyqHxZtkEmmDW2QYY=", + "lastModified": 1711442573, + "narHash": "sha256-/A3YzcY5erYOPojp5Ffwgxv4X5MTnRiWwuaXfgXbK2g=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "ded8d23709f94aedb1407bee9e26581f258e9e3a", + "rev": "df7ac26bd24fac8baa94d60a02c3e0f0d4d16368", "type": "github" }, "original": { @@ -1144,11 +1145,11 @@ ] }, "locked": { - "lastModified": 1708711161, - "narHash": "sha256-/L+G7gdlCRLrscdHiNePW6lDq+dk/Be8C/j6KA2oW0U=", + "lastModified": 1711550423, + "narHash": "sha256-CjTiUIZf8CK0keCNhADg+72ENpbgI63GLqoXO/DUDSI=", "owner": "tsirysndr", "repo": "music-player", - "rev": "53850d5e80f7c19daeb0c8af623d7c7078c1e242", + "rev": "2da6ea87848cbdc5e979b902cd83e4fce1cc153c", "type": "github" }, "original": { @@ -1183,11 +1184,11 @@ "nixvim": "nixvim", "nnn": "nnn", "nvim-devdocs": "nvim-devdocs", - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1, - "narHash": "sha256-pFd1tjYlyHzyVqeMu2IsCc8n+dr7qU5PQktynt0LAzo=", + "narHash": "sha256-3uLOkyXHp0DPx4PvGh3wvDy+o2RNujbPwdx9j1E/X8Y=", "path": "./neovim", "type": "path" }, @@ -1231,11 +1232,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1711232369, - "narHash": "sha256-8e456HSCTA7IhCzxJcKoWERWpgZ624LX5E3U9Ny3vwU=", + "lastModified": 1711806068, + "narHash": "sha256-NbLeH+sP0EHsYpio8Jc5AnKlX30oK6emhkGlMmum96I=", "owner": "neovim", "repo": "neovim", - "rev": "d3e51603bc94fac68cd2c92ae7ebc90baa8471fe", + "rev": "12240600f5d2c992aa77bc4592edc16814abfafd", "type": "github" }, "original": { @@ -1256,11 +1257,11 @@ ] }, "locked": { - "lastModified": 1711238673, - "narHash": "sha256-+RQ20E5N6bQcZtSuwIx+4ELFwbfMOZ7W7tgrU9vxdA8=", + "lastModified": 1711843759, + "narHash": "sha256-wf4L9CRmKlJmgnejiWokF+DBt+QSZZ/Km42o4Fv9Jx8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "dc1d09c95137ce5b6889f4266ea7301d2af071f1", + "rev": "65211de770b76f4ea25a89c7ee20bcef1d37a0e6", "type": "github" }, "original": { @@ -1298,11 +1299,11 @@ ] }, "locked": { - "lastModified": 1710717205, - "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", + "lastModified": 1711763326, + "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", + "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", "type": "github" }, "original": { @@ -1319,11 +1320,11 @@ ] }, "locked": { - "lastModified": 1711591334, - "narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=", + "lastModified": 1711763326, + "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297", + "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", "type": "github" }, "original": { @@ -1337,11 +1338,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1711249705, - "narHash": "sha256-h/NQECj6mIzF4XR6AQoSpkCnwqAM+ol4+qOdYi2ykmQ=", + "lastModified": 1711854532, + "narHash": "sha256-JPStavwlT7TfxxiXHk6Q7sbNxtnXAIjXQJMLO0KB6M0=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "34519f3bb678a5abbddf7b200ac5347263ee781b", + "rev": "2844b5f3ad3b478468151bd101370b9d8ef8a3a7", "type": "github" }, "original": { @@ -1386,11 +1387,11 @@ }, "nixpkgs-main": { "locked": { - "lastModified": 1711291124, - "narHash": "sha256-YX5pyNBBQCIIaap3D58aE41qTwdzIzDaViIapO30S9g=", + "lastModified": 1711888344, + "narHash": "sha256-MsQmYqPmYUGALyZEFbC1rCVFZIrzUJPScuhLZ0wOzME=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5dd6acd6c243bcf29d0c5e54733bb3576f28c2e", + "rev": "8f4a6210b3ab450642daeb97c83dfcef70e2a41f", "type": "github" }, "original": { @@ -1401,11 +1402,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -1447,11 +1448,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -1463,11 +1464,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -1517,11 +1518,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1711630555, - "narHash": "sha256-jslStwDlRwVZLwcFkExWegOGYv/Dn9q7yoocUX7AsIg=", + "lastModified": 1711888895, + "narHash": "sha256-Hykv2DGC5EHzZ89+54w/zkit+CVGLRcdIgOWnB4zW5k=", "owner": "nix-community", "repo": "nixvim", - "rev": "acb917fbf2bc9ce9c556516d8a1f257709b3cf1e", + "rev": "db6b61f117c83943f15289ced03674f81d08256a", "type": "github" }, "original": { @@ -1557,11 +1558,11 @@ }, "nur": { "locked": { - "lastModified": 1711290879, - "narHash": "sha256-VSDs6VjMZx/ZucNE/mogKuiZQb1HflbEaT/yiTuJ+oQ=", + "lastModified": 1711881870, + "narHash": "sha256-PxPdSD5Xqk2+HPuOqSjIkuRt4L3eI4hsTzz9Kbr4gig=", "owner": "nix-community", "repo": "nur", - "rev": "0e2ba010cca9f9001f904b5a23de4c84cdc3bec9", + "rev": "9c8ba168159281644f751bc29bf8a9c00c61de88", "type": "github" }, "original": { @@ -1650,11 +1651,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1710923068, + "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", "type": "github" }, "original": { @@ -1678,11 +1679,11 @@ ] }, "locked": { - "lastModified": 1711519547, - "narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=", + "lastModified": 1711760932, + "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a", + "rev": "c11e43aed6f17336c25cd120eac886b96c455731", "type": "github" }, "original": { @@ -1788,11 +1789,11 @@ ] }, "locked": { - "lastModified": 1710641527, - "narHash": "sha256-R9JZEevtSyg7++LEryYJRrfyEe45azJxmu2k9VezEW0=", + "lastModified": 1711246447, + "narHash": "sha256-g9TOluObcOEKewFo2fR4cn51Y/jSKhRRo4QZckHLop0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "50db54295d3922a3b7a40d580b84d75150b36c34", + "rev": "dcc802a6ec4e9cc6a1c8c393327f0c42666f22e4", "type": "github" }, "original": { @@ -1836,11 +1837,11 @@ ] }, "locked": { - "lastModified": 1711332768, - "narHash": "sha256-SFnlIwnrwJxEawLcrH7+zGb8spePcYyai5asMZnm0BM=", + "lastModified": 1711851236, + "narHash": "sha256-EJ03x3N9ihhonAttkaCrqxb0djDq3URCuDpmVPbNZhA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8a8e3ea9a9a4b2225cb5e33e07c3a337f820168c", + "rev": "f258266af947599e8069df1c2e933189270f143a", "type": "github" }, "original": { @@ -2043,6 +2044,21 @@ "type": "github" } }, + "systems_19": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2090,16 +2106,16 @@ }, "systems_5": { "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" } }, @@ -2173,11 +2189,11 @@ "rust-overlay": "rust-overlay_7" }, "locked": { - "lastModified": 1710671797, - "narHash": "sha256-mltImYImYfqGUjqS6yIdW2x0ZjQIC+PLjtSoW63rnv4=", + "lastModified": 1711471490, + "narHash": "sha256-2iFDvbyLzAeytKywd/jqatd86sC6z0EcIwwe/fT+RJg=", "owner": "dj95", "repo": "zjstatus", - "rev": "8e938da9c303e392f323b38498348f6c33e4de5a", + "rev": "a584399858437d64ae55c423454da48b6b8a0933", "type": "github" }, "original": { diff --git a/neovim/nvim.nix b/neovim/nvim.nix index f73e6e21..06e83f66 100644 --- a/neovim/nvim.nix +++ b/neovim/nvim.nix @@ -520,7 +520,7 @@ in rec { vim.g.rustaceanvim.tools = { enable_clippy = false }; ''; package = pkgs.neovim-nightly; - options = { + opts = { shell = "sh"; number = true; relativenumber = true; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 1f3cc4aa..e4d4e87d 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -11,40 +11,80 @@ ./ryu.nix ]; - security.polkit.enable = true; - security.pam.services.greetd.enableGnomeKeyring = true; - - services.mullvad-vpn.enable = true; - services.resolved.enable = true; - services.devmon.enable = true; - services.gvfs.enable = true; - services.udisks2.enable = true; - services.gnome.gnome-keyring.enable = true; - - nix.settings.auto-optimise-store = true; - nix.gc.automatic = true; - nix.gc.dates = "daily"; - nix.gc.options = "--delete-older-than +5"; - - boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; + security = { + polkit.enable = true; + pam.services.greetd.enableGnomeKeyring = true; + rtkit.enable = true; }; - boot.plymouth.enable = true; - boot.plymouth.theme = "catppuccin-mocha"; - boot.plymouth.themePackages = with pkgs; [(catppuccin-plymouth.override {variant = "mocha";})]; - services.greetd = let - tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; - hyprland-session = "${pkgs.hyprland}/share/wayland-sessions"; - in { - enable = true; + nix = { settings = { - default_session = { - command = "${tuigreet} --time --remember --remember-session --sessions ${hyprland-session}"; - user = "greeter"; + auto-optimise-store = true; # Did you read the comment? + extra-experimental-features = "nix-command flakes repl-flake"; + trusted-users = ["root" "servius"]; + }; + gc = { + automatic = true; + dates = "daily"; + options = "--delete-older-than +5"; + }; + package = pkgs.nixVersions.nix_2_21; + }; + + services = { + mullvad-vpn.enable = true; + resolved.enable = true; + devmon.enable = true; + gvfs.enable = true; + udisks2.enable = true; + gnome.gnome-keyring.enable = true; + + greetd = let + tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; + hyprland-session = "${pkgs.hyprland}/share/wayland-sessions"; + in { + enable = true; + settings = { + default_session = { + command = "${tuigreet} --time --remember --remember-session --sessions ${hyprland-session}"; + user = "greeter"; + }; }; }; + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + udev.packages = [pkgs.yubikey-personalization pkgs.yubikey-personalization-gui]; + yubikey-agent.enable = true; + + # Configure keymap in X11 + xserver.xkb = { + layout = "us"; + variant = ""; + }; + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + }; + + boot = { + lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; + plymouth = { + enable = true; + theme = "catppuccin-mocha"; + themePackages = with pkgs; [(catppuccin-plymouth.override {variant = "mocha";})]; + }; + + # Bootloader. + loader.systemd-boot.enable = pkgs.lib.mkForce false; + + loader.efi.canTouchEfiVariables = true; + bootspec.enable = true; }; systemd.services.greetd.serviceConfig = { @@ -57,73 +97,96 @@ TTYVHangup = true; TTYVTDisallocate = true; }; + hardware = { + # services.wireplumber.configPackages = with pkgs; [ bluez ]; - # services.wireplumber.configPackages = with pkgs; [ bluez ]; + # environment.etc = { + # "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' + # bluez_monitor.properties = { + # ["bluez5.enable-sbc-xq"] = true, + # ["bluez5.enable-msbc"] = true, + # ["bluez5.enable-hw-volume"] = true, + # ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" + # } + # ''; + # }; - # environment.etc = { - # "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' - # bluez_monitor.properties = { - # ["bluez5.enable-sbc-xq"] = true, - # ["bluez5.enable-msbc"] = true, - # ["bluez5.enable-hw-volume"] = true, - # ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" - # } - # ''; - # }; - - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; - hardware.bluetooth.settings = { - General = { - Name = "Ryu"; - Enable = "Source,Sink,Media,Socket"; + bluetooth.enable = true; + bluetooth.powerOnBoot = true; + bluetooth.settings = { + General = { + Name = "Ryu"; + Enable = "Source,Sink,Media,Socket"; + }; }; }; - # Bootloader. - boot.loader.systemd-boot.enable = pkgs.lib.mkForce false; + networking = { + hostName = "ryu"; # Define your hostname. + nameservers = ["1.1.1.1" "8.8.8.8"]; - boot.loader.efi.canTouchEfiVariables = true; - boot.bootspec.enable = true; + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - networking.hostName = "ryu"; # Define your hostname. - networking.nameservers = ["1.1.1.1" "8.8.8.8"]; - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # Enable networking + networkmanager.enable = true; - services.udev.packages = [pkgs.yubikey-personalization pkgs.yubikey-personalization-gui]; - services.yubikey-agent.enable = true; + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + # List services that you want to enable: - # Enable networking - networking.networkmanager.enable = true; + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + firewall = { + enable = true; + allowedTCPPortRanges = [ + { + from = 1714; + to = 1764; + } # KDE Connect + ]; + allowedUDPPortRanges = [ + { + from = 1714; + to = 1764; + } # KDE Connect + ]; + }; + }; # Set your time zone. time.timeZone = "Asia/Kolkata"; - i18n.supportedLocales = ["en_US.UTF-8/UTF-8"]; + i18n = { + supportedLocales = ["en_US.UTF-8/UTF-8"]; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; + # Select internationalisation properties. + defaultLocale = "en_US.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = ""; + extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; }; # Define a user account. Don't forget to set a password with ‘passwd’. @@ -138,28 +201,29 @@ fonts.fontconfig.enable = true; fonts.fontDir.enable = true; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - hyprland - xorg.xhost - foot - git - fish - nushellFull - (pkgs.wrapFirefox - (pkgs.firefox-unwrapped.override {pipewireSupport = true;}) - {}) - gnumake - python3 - (nerdfonts.override {fonts = ["FiraCode" "Hasklig"];}) - ]; - environment.sessionVariables = { - WLR_NO_HARDWARE_CURSORS = "1"; - NIXOS_OZONE_WL = "1"; + environment = { + # List packages installed in system profile. To search, run: + # $ nix search wget + systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + hyprland + xorg.xhost + foot + git + fish + nushellFull + (pkgs.wrapFirefox + (pkgs.firefox-unwrapped.override {pipewireSupport = true;}) + {}) + gnumake + python3 + (nerdfonts.override {fonts = ["FiraCode" "Hasklig"];}) + ]; + sessionVariables = { + WLR_NO_HARDWARE_CURSORS = "1"; + NIXOS_OZONE_WL = "1"; + }; }; programs = { @@ -180,55 +244,11 @@ }; }; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - networking.firewall = { - enable = true; - allowedTCPPortRanges = [ - { - from = 1714; - to = 1764; - } # KDE Connect - ]; - allowedUDPPortRanges = [ - { - from = 1714; - to = 1764; - } # KDE Connect - ]; - }; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? - nix.settings.extra-experimental-features = "nix-command flakes"; - nix.settings.trusted-users = ["root" "servius"]; + system.stateVersion = "23.11"; }