diff --git a/flake.lock b/flake.lock index f75a33e..2837f2c 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1675176355, - "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=", + "lastModified": 1676599101, + "narHash": "sha256-CKS6UsOGhoNxGDBt9wyFiWHvtng/+BMAJ4G8ahhe1DE=", "owner": "ryantm", "repo": "agenix", - "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28", + "rev": "de657061b13cf329c57a1a9730a5049a971b40b3", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1676057905, - "narHash": "sha256-9uGgDgMTwspDQlR2laeYa4qwf3BoU04sKpOR1h6/bvM=", + "lastModified": 1676394233, + "narHash": "sha256-RHO/MgRyFqgmIgogrL5LBmBhAt8hTpUJJ6Dww46GyZI=", "ref": "main", - "rev": "346600bd993ca400a493c9d9323a1caea267c650", - "revCount": 93, + "rev": "6fb9f917901160b2b212f420a8a8e4995c823626", + "revCount": 98, "type": "git", "url": "ssh://git@gitea.moritzboeh.me/moritz/emacs.git" }, @@ -225,6 +225,21 @@ } }, "flake-utils_6": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -306,11 +321,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675935446, - "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", + "lastModified": 1676367705, + "narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", + "rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5", "type": "github" }, "original": { @@ -367,11 +382,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1676120405, - "narHash": "sha256-5DSaAh3ifx3tW7ZMF7GFy/Kw4uHs3ZUtt+cH9+YVOXY=", + "lastModified": 1676630258, + "narHash": "sha256-pc3aIr2LgmJFcTQwICpz3d4/u5/xHDI14qY/zEhGM3k=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "97e0f02621829d011e08506c7361236b07f3f2b4", + "rev": "be2e4d9dd1e58991a4f54078a331cbcbd8265c7f", "type": "github" }, "original": { @@ -406,11 +421,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1676033584, - "narHash": "sha256-MeF1nR09cUdkCd1KNjzxImwhqsP2cbn/0M6z87fNJAk=", + "lastModified": 1676406424, + "narHash": "sha256-G+JhFuaeB15MTU8DbJALm/Yf240FCQmrWZ8Y0UzyqRI=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "44a38bfedc009bcc05eed571e80a397a80075a9f", + "rev": "1d76f4db0d3b487b9a9562195815e181652aef7c", "type": "github" }, "original": { @@ -421,11 +436,11 @@ }, "master": { "locked": { - "lastModified": 1676126546, - "narHash": "sha256-LYDhE85B+MQMvIS3/SVnLSsKBC6aTeFrMRa6pN75mlg=", + "lastModified": 1676634984, + "narHash": "sha256-VlcjVkzFEYGOVMXvlpS9hREF40Zs3n3Gpw53nlo22CI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aebc76376ca2da5ee4524326e6f83a3a18587d54", + "rev": "98042fc6d36ebb11a4defe4f2cee76aa6192257d", "type": "github" }, "original": { @@ -441,11 +456,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1676603980, - "narHash": "sha256-EWHGiO/1dulYfzdUnxXqW6nu79T+soBC/YS0tZPtlQ0=", + "lastModified": 1676634789, + "narHash": "sha256-ywC4XWyG6Qgs48ZYHU1BaxfPTlPS/Vt4Zgb5x0kYEWo=", "owner": "neovim", "repo": "neovim", - "rev": "371a74e4e1685f21e83c70eb8f0bd05c2ce24e49", + "rev": "f905ab04507fc5a86affeb5eaf8550c1795ac9b8", "type": "github" }, "original": { @@ -455,6 +470,26 @@ "type": "github" } }, + "nil": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_7", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1676390054, + "narHash": "sha256-w0KvrM+9WIEYr0juDh4Vs39ed2IaT0T696fp9pZ7i1I=", + "owner": "oxalica", + "repo": "nil", + "rev": "944d5c335531778a1d7b54a97bf7fb5ec0c3e976", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "nil", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1673540789, @@ -585,11 +620,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1675940568, - "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "lastModified": 1675309347, + "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5", "type": "github" }, "original": { @@ -600,6 +635,22 @@ } }, "nixpkgs_8": { + "locked": { + "lastModified": 1676549890, + "narHash": "sha256-sq/WcOEAl7gWrrfGkWdnyYazRyTf+enEim/o6LOQzI8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8c66bd1b68f4708c90dcc97c6f7052a5a7b33257", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -671,17 +722,17 @@ "pre-commit-hooks_3": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1675688762, - "narHash": "sha256-oit/SxMk0B380ASuztBGQLe8TttO1GJiXF8aZY9AYEc=", + "lastModified": 1676513100, + "narHash": "sha256-MK39nQV86L2ag4TmcK5/+r1ULpzRLPbbfvWbPvIoYJE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ab608394886fb04b8a5df3cb0bab2598400e3634", + "rev": "5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798", "type": "github" }, "original": { @@ -704,19 +755,45 @@ "hyprpaper": "hyprpaper", "master": "master", "neovim": "neovim", - "nixpkgs": "nixpkgs_7", + "nil": "nil", + "nixpkgs": "nixpkgs_8", "pre-commit-hooks": "pre-commit-hooks_3", "stable": "stable", "utils": "utils_2" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "nil", + "flake-utils" + ], + "nixpkgs": [ + "nil", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stable": { "locked": { - "lastModified": 1675918889, - "narHash": "sha256-hy7re4F9AEQqwZxubct7jBRos6md26bmxnCjxf5utJA=", + "lastModified": 1676546582, + "narHash": "sha256-MJ+PXNmUyxnMTFoss7G2lEcUY2cfYZM6RudBAL5aX1k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "49efda9011e8cdcd6c1aad30384cb1dc230c82fe", + "rev": "2fb7d749c084890192b2cd08ba264e5e4a14df1b", "type": "github" }, "original": { @@ -743,7 +820,7 @@ }, "utils_2": { "inputs": { - "flake-utils": "flake-utils_6" + "flake-utils": "flake-utils_7" }, "locked": { "lastModified": 1657226504, diff --git a/flake.nix b/flake.nix index 8b09ac9..9f6dffc 100644 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,8 @@ neovim.url = "github:neovim/neovim?dir=contrib"; + nil.url = "github:oxalica/nil"; + # Hyprland hyprland.url = "github:hyprwm/Hyprland"; hyprpaper.url = "github:hyprwm/hyprpaper"; diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua index 18cd345..4e20fbe 100644 --- a/modules/programs/nvim/init.lua +++ b/modules/programs/nvim/init.lua @@ -195,6 +195,15 @@ lspconfig.sumneko_lua.setup({ telemetry = { enable = false, }, + format = { + enable = true, + -- Put format options here + -- NOTE: the value should be STRING!! + defaultConfig = { + indent_style = "space", + indent_size = "2", + }, + }, }, }, }) @@ -212,3 +221,13 @@ wk.register({ }, { prefix = "" }, }) + +require("dashboard").setup({ + theme = "hyper", + config = { + packages = { enable = true }, + week_header = { + enable = true, + }, + }, +}) diff --git a/overlays/default.nix b/overlays/default.nix index 9a7098b..7e5cdc1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,6 +2,7 @@ agenix = inputs.agenix.packages.${prev.system}.default; hyprpaper = inputs.hyprpaper.packages.${prev.system}.default; neovim-nightly = inputs.neovim.packages.${prev.system}.default; + nil = inputs.nil.packages.${prev.system}.default; logseq-wayland = prev.symlinkJoin { name = "logseq-wayland";