From f0607557a04e1009b3f9d2e2024cc01c99e44e6f Mon Sep 17 00:00:00 2001 From: Frankie B Date: Fri, 1 Sep 2023 00:22:55 +0100 Subject: [PATCH] Update flake, remove spago --- flake.lock | 99 ++++++++++++++++++++++--------- homes/floppydisk/default.nix | 1 - homes/floppydisk/neovim-flake.nix | 2 +- hosts/nixbox/configuration.nix | 2 +- 4 files changed, 72 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 0365097..4963a35 100644 --- a/flake.lock +++ b/flake.lock @@ -458,7 +458,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1689068808, @@ -560,11 +560,11 @@ ] }, "locked": { - "lastModified": 1691506824, - "narHash": "sha256-Z2Ms7036CCEAfCmDBDy+sFauO6/7fx2UN3aoPCpp4tA=", + "lastModified": 1693399033, + "narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b8d43fbaf8450c30caaed5eab876897d0af891b", + "rev": "f5c15668f9842dd4d5430787d6aa8a28a07f7c10", "type": "github" }, "original": { @@ -593,15 +593,16 @@ "inputs": { "hyprland-protocols": "hyprland-protocols", "nixpkgs": "nixpkgs", + "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1691520628, - "narHash": "sha256-C2AQ8WJ3sDuaVULYPQJRuJ4XAC/uWNGQ0bhtA7FFOlw=", + "lastModified": 1693468538, + "narHash": "sha256-3kWvxxIlMwYqUg4txxBipH3CEQglLNGPjtQnpNeoHJY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ec269622fcd1fd06d2db19d98593ffab8ff041cb", + "rev": "fc0c1896e097b3c3b2170ae69d38724e43960fe1", "type": "github" }, "original": { @@ -615,14 +616,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1684265364, - "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { @@ -938,6 +943,7 @@ "toggleterm-nvim": "toggleterm-nvim", "tokyonight": "tokyonight", "trouble": "trouble", + "vim-dirtytalk": "vim-dirtytalk", "vim-illuminate": "vim-illuminate", "vim-markdown": "vim-markdown", "vim-repeat": "vim-repeat", @@ -947,11 +953,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1691426070, - "narHash": "sha256-d+SwoT/fQsZy6ybwriOvSlxP8+5S4N/zedIn8sLZIoU=", + "lastModified": 1692994864, + "narHash": "sha256-+vCltFSH+MgBCe7CloTj/9OK/ixC6KtQfqsg3CxZ5jU=", "owner": "notashelf", "repo": "neovim-flake", - "rev": "cefae48b0826b6fc7a1a21cfd4df5b3a8e98c5b0", + "rev": "65ab9f45908446286c9dfb241c957e833d5dd6b9", "type": "github" }, "original": { @@ -988,11 +994,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690179384, - "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", + "lastModified": 1693158576, + "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", + "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", "type": "github" }, "original": { @@ -1022,11 +1028,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1691512706, - "narHash": "sha256-0bCfRBew+7m4onXHV9UFHv8GcUcKcOZT+PIZWh2d/yM=", + "lastModified": 1693505331, + "narHash": "sha256-lQ5cQqzRY4VietVXvcoyO2Oye+DlVxLqYQ9dEi1ZZY4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "019ee8dfd16e08c0a278175664c9e70adebeb99b", + "rev": "e919958b42b090606b8d070a676de62d832db67a", "type": "github" }, "original": { @@ -1086,11 +1092,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1691368598, - "narHash": "sha256-ia7li22keBBbj02tEdqjVeLtc7ZlSBuhUk+7XTUFr14=", + "lastModified": 1693377291, + "narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a8e9243812ba528000995b294292d3b5e120947", + "rev": "e7f38be3775bab9659575f192ece011c033655f0", "type": "github" }, "original": { @@ -1751,6 +1757,21 @@ } }, "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1932,6 +1953,22 @@ "type": "github" } }, + "vim-dirtytalk": { + "flake": false, + "locked": { + "lastModified": 1690722430, + "narHash": "sha256-kjyLwkAk6mqK7u4+zAr+Yh+zbSiukNKtXwb7t39LUco=", + "owner": "psliwka", + "repo": "vim-dirtytalk", + "rev": "a49251dce1852875951d95f7013979ece5caebf0", + "type": "github" + }, + "original": { + "owner": "psliwka", + "repo": "vim-dirtytalk", + "type": "github" + } + }, "vim-illuminate": { "flake": false, "locked": { @@ -2066,18 +2103,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1691073628, - "narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=", + "lastModified": 1692976565, + "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=", "owner": "wlroots", "repo": "wlroots", - "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", + "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", + "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", "type": "gitlab" } }, @@ -2090,14 +2127,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1691082525, - "narHash": "sha256-C5AO0KnyAFJaCkOn+5nJfWm0kyiPn/Awh0lKTjhgr7Y=", + "lastModified": 1691841170, + "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "42747d267ab4345c4ceb78cd4a4fe99f072d80fc", + "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b", "type": "github" }, "original": { diff --git a/homes/floppydisk/default.nix b/homes/floppydisk/default.nix index 0d28ee6..a43cd7b 100644 --- a/homes/floppydisk/default.nix +++ b/homes/floppydisk/default.nix @@ -106,7 +106,6 @@ maven dart purescript - spago # Comms nheko diff --git a/homes/floppydisk/neovim-flake.nix b/homes/floppydisk/neovim-flake.nix index dbd77f6..943fd90 100644 --- a/homes/floppydisk/neovim-flake.nix +++ b/homes/floppydisk/neovim-flake.nix @@ -65,7 +65,7 @@ eolChar = null; showCurrContext = true; }; - cursorWordline = { + cursorline = { enable = true; lineTimeout = 0; }; diff --git a/hosts/nixbox/configuration.nix b/hosts/nixbox/configuration.nix index f9de091..50afbf1 100644 --- a/hosts/nixbox/configuration.nix +++ b/hosts/nixbox/configuration.nix @@ -62,7 +62,7 @@ # Enable hyprland programs.hyprland = { enable = true; - nvidiaPatches = true; + enableNvidiaPatches = true; xwayland.enable = true; };