.github/workflows/build-and-cache.yml

@@ -11,8 +11,6 @@ jobs:
           - .#attic-server
           - .#conduwuit
           - "github:cything/nixpkgs/9a35d495d2f49eee003b57265228844bb48c933e#nixosTests.garage.with-3node-replication1_x"
-          - .#sway
-
     runs-on: ubuntu-latest
     steps:
       - uses: DeterminateSystems/nix-installer-action@main

flake.lock

@@ -360,16 +360,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736789786,
+        "lastModified": 1736701207,
-        "narHash": "sha256-YKr7RhOtFFl7metHJ2oWmPF5//mlvasFr1jJ0gLdNyQ=",
+        "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ba9f7942037ac78a690eb7e2c15f4869c9515eb4",
+        "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable-small",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,7 +2,7 @@
   description = "cy's flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";

home/nixvim/default.nix

@@ -95,8 +95,8 @@
           "<C-h>" = "cmp.mapping.abort()";
           "<C-n>" = "cmp.mapping.select_next_item()";
           "<C-p>" = "cmp.mapping.select_prev_item()";
-          "<C-u>" = "cmp.mapping.scroll_docs(-4)";
+          "<C-d>" = "cmp.mapping.scroll_docs(-4)";
-          "<C-d>" = "cmp.mapping.scroll_docs(4)";
+          "<C-u>" = "cmp.mapping.scroll_docs(4)";
           "<C-k>" = ''
             cmp.mapping(function(fallback)
               if cmp.visible() then

overlay/default.nix

@@ -2,7 +2,6 @@ let
   overlays = [
     ./conduwuit
     ./attic
-    ./sway.nix
   ];
   importedOverlays = map (m: import m) overlays;
 in

overlay/sway.nix

@@ -1,25 +0,0 @@
-final: prev: rec {
-  sway-unwrapped = (prev.sway-unwrapped.override (old: {
-    inherit wlroots;
-  }))
-    .overrideAttrs (prevAttrs: {
-    version = "1.10";
-    src = final.fetchFromGitHub {
-      owner = "swaywm";
-      repo = "sway";
-      rev = "0b08dce08cbcf515103d8a7fd8c390ed04c93428";
-      hash = "sha256-Qo/Fr/sc5lqHTlzf7YC282TkF1ZJtDhTNiL31R0c5NY=";
-    };
-  });
-
-  wlroots = prev.wlroots_0_18.overrideAttrs (prevAttrs: {
-    version = "0.19";
-    src = final.fetchFromGitLab {
-      domain = "gitlab.freedesktop.org";
-      owner = "wlroots";
-      repo = "wlroots";
-      rev = "eb85831284b6f46301e41205c5d4e08fc5b92c27";
-      hash = "sha256-itELarxPdIBx5EhDxXZht4Iw8kddaiHVHuAWtf0pGfU=";
-    };
-  });
-}