diff --git a/flake.lock b/flake.lock index d2414ef..6a627ca 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1677247280, - "narHash": "sha256-sa+8MtoAOSLsWP9vf0qiJUyMovIEYgDzHE8TkoK04Hk=", + "lastModified": 1676910639, + "narHash": "sha256-YvZ2lQiUZrv5PCQ0nC/fn/0OT2ag8spCIOQx0COnFZ0=", "owner": "ryantm", "repo": "agenix", - "rev": "833f87c8ff574a29aea3e091045cbaed3cf86bc1", + "rev": "5f66c8aa774d8d488cba1cdc4f0c954d2a14e3a1", "type": "github" }, "original": { @@ -54,65 +54,6 @@ "type": "github" } }, - "attic": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": [ - "stable" - ] - }, - "locked": { - "lastModified": 1676581287, - "narHash": "sha256-a/6ClchROZ5PoLz0WK42mkAkUtJlMDbe5QyyZZ7bomc=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "0bb3d001365a5d75947a7a713dfd06307b3934d4", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, - "crane": { - "inputs": { - "flake-compat": [ - "attic", - "flake-compat" - ], - "flake-utils": [ - "attic", - "flake-utils" - ], - "nixpkgs": [ - "attic", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1673405853, - "narHash": "sha256-6Nq9DuOo+gE2I8z5UZaKuumykz2xxZ9JGYmUthOuwSA=", - "owner": "ipetkov", - "repo": "crane", - "rev": "b13963c8c18026aa694acd98d14f66d24666f70b", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "rev": "b13963c8c18026aa694acd98d14f66d24666f70b", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -208,22 +149,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -256,11 +181,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -271,11 +196,11 @@ }, "flake-utils_4": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -314,6 +239,21 @@ "type": "github" } }, + "flake-utils_7": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "forgit-git": { "flake": false, "locked": { @@ -378,16 +318,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": [ - "flake-utils" - ] + "utils": "utils" }, "locked": { - "lastModified": 1677104801, - "narHash": "sha256-2V5nKOYVFMYlseYdDKiEaww2xqcE0GtS1ax3SoUX99I=", + "lastModified": 1676892629, + "narHash": "sha256-rlvsqoSBO5dCwfnn7xvImYREidIPJaiFS3b54TZF4pU=", "owner": "nix-community", "repo": "home-manager", - "rev": "4295fdfa6b0005c32f2e1f0b732faf5810c1bc7f", + "rev": "72ce74d3eae78a6b31538ea7ebe0c1fcf4a10f7a", "type": "github" }, "original": { @@ -398,7 +336,7 @@ }, "howdy": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -444,11 +382,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1677162463, - "narHash": "sha256-wjZbwJvIagJ0i82LYm3eIHNsqwblOjIzAyegA3z9olA=", + "lastModified": 1676902515, + "narHash": "sha256-tFvDUIWmsEdAWnbwCDCDwcPxcZNGQzPfRpx5tSL/yl0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "60e37d727def25c87a3fd6c47751c05f6082260f", + "rev": "474ada9267ccb98015991ee9d0d93fbb5da72034", "type": "github" }, "original": { @@ -498,11 +436,11 @@ }, "master": { "locked": { - "lastModified": 1677259386, - "narHash": "sha256-gFXSvo9CuTJa6V0bK0Gm+JwizlJD+YyJ1VAUW2ij1R4=", + "lastModified": 1676912548, + "narHash": "sha256-5KH+YpMju3Zj6PU4wV3qaEznRvyt0y7Ei4hS7jsEh2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8d97da2540b9de5962849c75c425cc2469d77ad", + "rev": "20c135b191fd84f556cc5eb37b8d9d683a580b1e", "type": "github" }, "original": { @@ -513,16 +451,16 @@ }, "neovim": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_6" }, "locked": { "dir": "contrib", - "lastModified": 1677257437, - "narHash": "sha256-fxEb0DrGXv3Q03Gz/oqI8x47WhXLlGtHQFgGIhBl4c0=", + "lastModified": 1676908542, + "narHash": "sha256-a5J7LPxpmB69oOzCz0kuh6pXV/IVNMlDfs3pIYwnvHo=", "owner": "neovim", "repo": "neovim", - "rev": "15cce77b383d0b0bfdaa1415cdde005cc43267d0", + "rev": "3507474611a03d88137a1d97666515b551c39cb3", "type": "github" }, "original": { @@ -534,13 +472,9 @@ }, "nil": { "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_7", + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1676390054, @@ -622,11 +556,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1677063315, - "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", + "lastModified": 1658161305, + "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", + "rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", "type": "github" }, "original": { @@ -638,11 +572,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1677063315, - "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", + "lastModified": 1675273418, + "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", + "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", "type": "github" }, "original": { @@ -654,11 +588,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1677063315, - "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", + "lastModified": 1674641431, + "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", + "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "type": "github" }, "original": { @@ -686,11 +620,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1677142198, - "narHash": "sha256-Y/uC2ZmkQkyrdRZ5szZilhZ/46786Wio5CGTgL+Vb/c=", + "lastModified": 1675309347, + "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "03fb72201639e5274fee6d77b0d9c66e98329aba", + "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5", "type": "github" }, "original": { @@ -701,6 +635,22 @@ } }, "nixpkgs_8": { + "locked": { + "lastModified": 1676790509, + "narHash": "sha256-W9uWAWokgS8US8rJf79qBLS2M+ZgIscfoz+KsNE7VGQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a1291d0d020a200c7ce3c48e96090bfa4890a475", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -734,7 +684,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-utils": [ "emacs", "flake-utils" @@ -787,18 +737,18 @@ }, "pre-commit-hooks_3": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_6", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1677160285, - "narHash": "sha256-tBzpCjMP+P3Y3nKLYvdBkXBg3KvTMo3gvi8tLQaqXVY=", + "lastModified": 1676879534, + "narHash": "sha256-HU4RXcwsAX1u7AUbGOBDxkYQkeODcn+HZjXqKa1y/hk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2bd861ab81469428d9c823ef72c4bb08372dd2c4", + "rev": "c9495f017f67a11e9c9909b032dc7762dfc853cf", "type": "github" }, "original": { @@ -812,9 +762,7 @@ "agenix": "agenix", "arkenfox-userjs": "arkenfox-userjs", "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver", - "attic": "attic", "emacs": "emacs", - "flake-utils": "flake-utils_3", "forgit-git": "forgit-git", "home-manager": "home-manager", "howdy": "howdy", @@ -824,42 +772,15 @@ "master": "master", "neovim": "neovim", "nil": "nil", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects", "pre-commit-hooks": "pre-commit-hooks_3", "smartcolumn-nvim": "smartcolumn-nvim", "stable": "stable", - "utils": "utils" + "utils": "utils_2" } }, "rust-overlay": { - "inputs": { - "flake-utils": [ - "attic", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "attic", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675391458, - "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "flake-utils": [ "nil", @@ -902,11 +823,11 @@ }, "stable": { "locked": { - "lastModified": 1677075010, - "narHash": "sha256-X+UmR1AkdR//lPVcShmLy8p1n857IGf7y+cyCArp8bU=", + "lastModified": 1676817468, + "narHash": "sha256-ovuJ1jQOC2/EEibufBkXmSN/O9mLx80Wh7aDmHmHAhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c95bf18beba4290af25c60cbaaceea1110d0f727", + "rev": "0cf4274b5d06325bd16dbf879a30981bc283e58a", "type": "github" }, "original": { @@ -917,10 +838,23 @@ } }, "utils": { + "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" + } + }, + "utils_2": { "inputs": { - "flake-utils": [ - "flake-utils" - ] + "flake-utils": "flake-utils_7" }, "locked": { "lastModified": 1657226504, diff --git a/flake.nix b/flake.nix index 28c83f1..ab36e1a 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,7 @@ pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; - flake-utils.url = "github:numtide/flake-utils"; - - utils = { - url = "github:gytis-ivaskevicius/flake-utils-plus"; - inputs.flake-utils.follows = "flake-utils"; - }; + utils.url = "github:gytis-ivaskevicius/flake-utils-plus"; agenix = { url = "github:ryantm/agenix"; @@ -27,7 +22,6 @@ home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.utils.follows = "flake-utils"; }; # Zsh specific @@ -56,11 +50,7 @@ neovim.url = "github:neovim/neovim?dir=contrib"; - nil = { - url = "github:oxalica/nil"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + nil.url = "github:oxalica/nil"; # Hyprland hyprland.url = "github:hyprwm/Hyprland"; @@ -77,12 +67,6 @@ flake = false; }; - attic = { - url = "github:zhaofengli/attic"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-stable.follows = "stable"; - inputs.flake-utils.follows = "flake-utils"; - }; }; outputs = diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index 894419a..e40adbd 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -88,7 +88,6 @@ in statix manix nix-output-monitor - attic # other bat diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua index 5af67a5..6cca8fd 100644 --- a/modules/programs/nvim/init.lua +++ b/modules/programs/nvim/init.lua @@ -298,7 +298,7 @@ local function lspconfig_setup(lsp, options) lspconfig[lsp].setup(final_options) end -local servers = { "nil_ls", "pylsp", "rust_analyzer" } +local servers = { "nil_ls", "pylsp" } for _, lsp in ipairs(servers) do lspconfig_setup(lsp, {}) end diff --git a/modules/services/wireguard.nix b/modules/services/wireguard.nix index 2c81285..8b0bbfb 100644 --- a/modules/services/wireguard.nix +++ b/modules/services/wireguard.nix @@ -25,7 +25,6 @@ in address = [ "10.8.0.3/24" ]; listenPort = 51820; privateKeyFile = "/run/agenix/wireguard-private-key"; - dns = [ "192.168.0.4" "9.9.9.9" ]; peers = [ { publicKey = "bT/U8ko3i//vH8LNn2R56JkGMg+0GLFrZSF81BBax08="; diff --git a/overlays/default.nix b/overlays/default.nix index ae2256c..7e5cdc1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,5 @@ { inputs }: final: prev: { agenix = inputs.agenix.packages.${prev.system}.default; - attic = inputs.attic.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;