Compare commits

...

3 commits

Author SHA1 Message Date
8d388cb10e
chore: rename personal-neovim to viminal 2024-09-17 16:26:38 -07:00
04ddd7b03e
flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff' (2024-09-15)
  → 'github:nix-community/home-manager/d2493de5cd1da06b6a4c3e97f4e7d5dd791df457' (2024-09-17)
• Updated input 'homebrew-cask':
    'github:homebrew/homebrew-cask/ba5f8b30d33ce3e82e6b67c8238ce5f05f472ef4' (2024-09-17)
  → 'github:homebrew/homebrew-cask/3a151b1d7cc68fb40e3be976e741506749f6a9d6' (2024-09-17)
• Updated input 'homebrew-core':
    'github:homebrew/homebrew-core/d780ff50b11a8b40fb3bd612d557d15180c550a1' (2024-09-17)
  → 'github:homebrew/homebrew-core/04d35ad67cb1920861b65a956183776ad7cf0207' (2024-09-17)
• Removed input 'personal-neovim'
• Removed input 'personal-neovim/flake-parts'
• Removed input 'personal-neovim/flake-parts/nixpkgs-lib'
• Removed input 'personal-neovim/haskell-tools'
• Removed input 'personal-neovim/lsp-progress'
• Removed input 'personal-neovim/nixpkgs'
• Removed input 'personal-neovim/nixvim'
• Removed input 'personal-neovim/nixvim/devshell'
• Removed input 'personal-neovim/nixvim/devshell/nixpkgs'
• Removed input 'personal-neovim/nixvim/flake-compat'
• Removed input 'personal-neovim/nixvim/flake-parts'
• Removed input 'personal-neovim/nixvim/flake-parts/nixpkgs-lib'
• Removed input 'personal-neovim/nixvim/git-hooks'
• Removed input 'personal-neovim/nixvim/git-hooks/flake-compat'
• Removed input 'personal-neovim/nixvim/git-hooks/gitignore'
• Removed input 'personal-neovim/nixvim/git-hooks/gitignore/nixpkgs'
• Removed input 'personal-neovim/nixvim/git-hooks/nixpkgs'
• Removed input 'personal-neovim/nixvim/git-hooks/nixpkgs-stable'
• Removed input 'personal-neovim/nixvim/home-manager'
• Removed input 'personal-neovim/nixvim/home-manager/nixpkgs'
• Removed input 'personal-neovim/nixvim/nix-darwin'
• Removed input 'personal-neovim/nixvim/nix-darwin/nixpkgs'
• Removed input 'personal-neovim/nixvim/nixpkgs'
• Removed input 'personal-neovim/nixvim/nuschtosSearch'
• Removed input 'personal-neovim/nixvim/nuschtosSearch/flake-utils'
• Removed input 'personal-neovim/nixvim/nuschtosSearch/flake-utils/systems'
• Removed input 'personal-neovim/nixvim/nuschtosSearch/nixpkgs'
• Removed input 'personal-neovim/nixvim/treefmt-nix'
• Removed input 'personal-neovim/nixvim/treefmt-nix/nixpkgs'
• Removed input 'personal-neovim/render-markdown'
• Removed input 'personal-neovim/satellite'
• Added input 'viminal':
    'github:youwen5/viminal/62b25e1c4b8896fd43786059b2480e1f63375bdd' (2024-09-17)
• Added input 'viminal/flake-parts':
    'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a' (2024-09-12)
• Added input 'viminal/flake-parts/nixpkgs-lib':
    '356624c120.tar.gz?narHash=sha256-Ss8QWLXdr2JCBPcYChJhz4xJm%2Bh/xjl4G0c0XlP6a74%3D' (2024-09-01)
• Added input 'viminal/haskell-tools':
    'github:mrcjkb/haskell-tools.nvim/1edf2bb5ced056b5d3d1df783dd02041ce09b087' (2024-09-16)
• Added input 'viminal/lsp-progress':
    'github:linrongbin16/lsp-progress.nvim/d5f4d28efe75ce636bfbe271eb45f39689765aab' (2024-07-15)
• Added input 'viminal/nixpkgs':
    follows 'nixpkgs'
• Added input 'viminal/nixvim':
    'github:nix-community/nixvim/2e3083e42509c399b224239f6d7fa17976b18536' (2024-09-16)
• Added input 'viminal/nixvim/devshell':
    'github:numtide/devshell/67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae' (2024-07-27)
• Added input 'viminal/nixvim/devshell/nixpkgs':
    follows 'viminal/nixvim/nixpkgs'
• Added input 'viminal/nixvim/flake-compat':
    'https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04)
• Added input 'viminal/nixvim/flake-parts':
    'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a' (2024-09-12)
• Added input 'viminal/nixvim/flake-parts/nixpkgs-lib':
    follows 'viminal/nixvim/nixpkgs'
• Added input 'viminal/nixvim/git-hooks':
    'github:cachix/git-hooks.nix/7570de7b9b504cfe92025dd1be797bf546f66528' (2024-09-05)
• Added input 'viminal/nixvim/git-hooks/flake-compat':
    follows 'viminal/nixvim/flake-compat'
• Added input 'viminal/nixvim/git-hooks/gitignore':
    'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394' (2024-02-28)
• Added input 'viminal/nixvim/git-hooks/gitignore/nixpkgs':
    follows 'viminal/nixvim/git-hooks/nixpkgs'
• Added input 'viminal/nixvim/git-hooks/nixpkgs':
    follows 'viminal/nixvim/nixpkgs'
• Added input 'viminal/nixvim/git-hooks/nixpkgs-stable':
    follows 'viminal/nixvim/nixpkgs'
• Added input 'viminal/nixvim/home-manager':
    'github:nix-community/home-manager/e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f' (2024-09-14)
• Added input 'viminal/nixvim/home-manager/nixpkgs':
    follows 'viminal/nixvim/nixpkgs'
• Added input 'viminal/nixvim/nix-darwin':
    'github:lnl7/nix-darwin/21fe31f26473c180390cfa81e3ea81aca0204c80' (2024-09-13)
• Added input 'viminal/nixvim/nix-darwin/nixpkgs':
    follows 'viminal/nixvim/nixpkgs'
• Added input 'viminal/nixvim/nixpkgs':
    follows 'viminal/nixpkgs'
• Added input 'viminal/nixvim/nuschtosSearch':
    'github:NuschtOS/search/97d34b70deed4878fcb2449ac89dab717d72efa1' (2024-09-15)
• Added input 'viminal/nixvim/nuschtosSearch/flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
• Added input 'viminal/nixvim/nuschtosSearch/flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Added input 'viminal/nixvim/nuschtosSearch/nixpkgs':
    follows 'viminal/nixvim/nixpkgs'
• Added input 'viminal/nixvim/treefmt-nix':
    'github:numtide/treefmt-nix/9fb342d14b69aefdf46187f6bb80a4a0d97007cd' (2024-09-02)
• Added input 'viminal/nixvim/treefmt-nix/nixpkgs':
    follows 'viminal/nixvim/nixpkgs'
• Added input 'viminal/render-markdown':
    'github:MeanderingProgrammer/render-markdown.nvim/2424693c7a4c79641a7ea1e2a838dbc9238d6066' (2024-09-16)
• Added input 'viminal/satellite':
    'github:lewis6991/satellite.nvim/dfc2b220f4969ebc49b0f2a94ab6faae240705bd' (2024-09-04)
2024-09-17 16:25:06 -07:00
ae911fdd1a
chore: delete unused hyprland patch file 2024-09-17 13:55:43 -07:00
4 changed files with 68 additions and 83 deletions

View file

@ -94,7 +94,7 @@
"devshell": { "devshell": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"personal-neovim", "viminal",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -145,20 +145,6 @@
} }
}, },
"flake-compat_3": { "flake-compat_3": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"revCount": 57,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -174,6 +160,20 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_4": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"revCount": 57,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -216,7 +216,7 @@
"flake-parts_3": { "flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"personal-neovim", "viminal",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -343,18 +343,18 @@
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
"personal-neovim", "viminal",
"nixvim", "nixvim",
"flake-compat" "flake-compat"
], ],
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
"personal-neovim", "viminal",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": [ "nixpkgs-stable": [
"personal-neovim", "viminal",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -398,7 +398,7 @@
"gitignore_2": { "gitignore_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"personal-neovim", "viminal",
"nixvim", "nixvim",
"git-hooks", "git-hooks",
"nixpkgs" "nixpkgs"
@ -441,11 +441,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726440980, "lastModified": 1726611255,
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -457,7 +457,7 @@
"home-manager_2": { "home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"personal-neovim", "viminal",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -479,11 +479,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726553505, "lastModified": 1726613541,
"narHash": "sha256-BaV87fEIX65lcHdq/w6/f3RvbKyhEnjFbPQ7SGybbs0=", "narHash": "sha256-Ec9YSL2w4B1wJhuPyX4AQOpPXXOeVu5POABmUS2fIw4=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "ba5f8b30d33ce3e82e6b67c8238ce5f05f472ef4", "rev": "3a151b1d7cc68fb40e3be976e741506749f6a9d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -495,11 +495,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726556616, "lastModified": 1726614420,
"narHash": "sha256-QbaVuqJnb1UMMJRhtfWprjcV17QcDpkFAIWnPVqW0vY=", "narHash": "sha256-HePvM3tE8DvyzQESHZanH2m3thYuyuWSA4JhpRyrwkY=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "d780ff50b11a8b40fb3bd612d557d15180c550a1", "rev": "04d35ad67cb1920861b65a956183776ad7cf0207",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -627,7 +627,7 @@
"nix-darwin_3": { "nix-darwin_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"personal-neovim", "viminal",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -729,13 +729,13 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_4",
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin_3", "nix-darwin": "nix-darwin_3",
"nixpkgs": [ "nixpkgs": [
"personal-neovim", "viminal",
"nixpkgs" "nixpkgs"
], ],
"nuschtosSearch": "nuschtosSearch", "nuschtosSearch": "nuschtosSearch",
@ -757,9 +757,9 @@
}, },
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"personal-neovim", "viminal",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -778,32 +778,6 @@
"type": "github" "type": "github"
} }
}, },
"personal-neovim": {
"inputs": {
"flake-parts": "flake-parts_2",
"haskell-tools": "haskell-tools",
"lsp-progress": "lsp-progress",
"nixpkgs": [
"nixpkgs"
],
"nixvim": "nixvim",
"render-markdown": "render-markdown",
"satellite": "satellite"
},
"locked": {
"lastModified": 1726564137,
"narHash": "sha256-kN7fK4WjkeU9wKP4PxFv9NAEDGiq6dIy5QZkw7/CW9k=",
"owner": "youwen5",
"repo": "neovim-flake",
"rev": "10253909c98a586ffdbe31f5806e96b58da01be1",
"type": "github"
},
"original": {
"owner": "youwen5",
"repo": "neovim-flake",
"type": "github"
}
},
"pre-commit-hooks-nix": { "pre-commit-hooks-nix": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -860,9 +834,9 @@
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-homebrew": "nix-homebrew", "nix-homebrew": "nix-homebrew",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"personal-neovim": "personal-neovim",
"spicetify": "spicetify", "spicetify": "spicetify",
"vesktop-bin": "vesktop-bin", "vesktop-bin": "vesktop-bin",
"viminal": "viminal",
"wallpapers": "wallpapers", "wallpapers": "wallpapers",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }
@ -926,7 +900,7 @@
}, },
"spicetify": { "spicetify": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -1023,7 +997,7 @@
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"personal-neovim", "viminal",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -1044,7 +1018,7 @@
}, },
"vesktop-bin": { "vesktop-bin": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -1063,6 +1037,32 @@
"type": "github" "type": "github"
} }
}, },
"viminal": {
"inputs": {
"flake-parts": "flake-parts_2",
"haskell-tools": "haskell-tools",
"lsp-progress": "lsp-progress",
"nixpkgs": [
"nixpkgs"
],
"nixvim": "nixvim",
"render-markdown": "render-markdown",
"satellite": "satellite"
},
"locked": {
"lastModified": 1726615423,
"narHash": "sha256-cX5zX8US0E5Aw1xzFuumTlQTxZSzwqp7kz7i+qFDBIQ=",
"owner": "youwen5",
"repo": "viminal",
"rev": "0fff5154e69feb5bbb0e634e654eb65feee9c5cf",
"type": "github"
},
"original": {
"owner": "youwen5",
"repo": "viminal",
"type": "github"
}
},
"wallpapers": { "wallpapers": {
"flake": false, "flake": false,
"locked": { "locked": {

View file

@ -64,8 +64,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
personal-neovim = { viminal = {
url = "github:youwen5/neovim-flake"; url = "github:youwen5/viminal";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View file

@ -1,15 +0,0 @@
diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp
index 0fbf832e..c6077114 100644
--- a/src/protocols/LinuxDMABUF.cpp
+++ b/src/protocols/LinuxDMABUF.cpp
@@ -492,9 +492,8 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const
return;
}
} else {
- protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
+ protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf checks", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
drmFreeDevice(&device);
- removeGlobal();
}
});
}

View file

@ -5,7 +5,7 @@
}: }:
{ {
environment.systemPackages = [ environment.systemPackages = [
inputs.personal-neovim.packages.${pkgs.system}.default inputs.viminal.packages.${pkgs.system}.default
]; ];
security.sudo.enable = false; security.sudo.enable = false;