youwen5/liminalOS
1
0
Fork 0
mirror of https://github.com/youwen5/nixos.git synced 2024-11-25 02:03:51 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: youwen5:8d388cb10e4cbcf57f3aee26439d25e2c0347fe7
Branches Tags
youwen5:main
youwen5:safe-asahi
youwen5:staging
youwen5:asahi-fix
youwen5:asahi-testing
youwen5:next-gen
youwen5:macos-staging
youwen5:macos-working
youwen5:razer-blade
youwen5:darwin
youwen5:liminalos
..
compare: youwen5:10e0484f162f067712e04b12836e934469a2ddc7
Branches Tags
youwen5:main
youwen5:safe-asahi
youwen5:staging
youwen5:asahi-fix
youwen5:asahi-testing
youwen5:next-gen
youwen5:macos-staging
youwen5:macos-working
youwen5:razer-blade
youwen5:darwin
youwen5:liminalos

No commits in common. "8d388cb10e4cbcf57f3aee26439d25e2c0347fe7" and "10e0484f162f067712e04b12836e934469a2ddc7" have entirely different histories.
8d388cb10e ... 10e0484f16

4 changed files with 83 additions and 68 deletions
Show stats Expand all files Collapse all files

130
flake.lock
View file

@ -94,7 +94,7 @@
"devshell": { "devshell": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"viminal", "personal-neovim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -145,6 +145,20 @@
} }
}, },
"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,
@ -160,20 +174,6 @@
"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": [
"viminal", "personal-neovim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -343,18 +343,18 @@
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
"viminal", "personal-neovim",
"nixvim", "nixvim",
"flake-compat" "flake-compat"
], ],
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
"viminal", "personal-neovim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": [ "nixpkgs-stable": [
"viminal", "personal-neovim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -398,7 +398,7 @@
"gitignore_2": { "gitignore_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"viminal", "personal-neovim",
"nixvim", "nixvim",
"git-hooks", "git-hooks",
"nixpkgs" "nixpkgs"
@ -441,11 +441,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726611255, "lastModified": 1726440980,
"narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=", "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457", "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -457,7 +457,7 @@
"home-manager_2": { "home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"viminal", "personal-neovim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -479,11 +479,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726613541, "lastModified": 1726553505,
"narHash": "sha256-Ec9YSL2w4B1wJhuPyX4AQOpPXXOeVu5POABmUS2fIw4=", "narHash": "sha256-BaV87fEIX65lcHdq/w6/f3RvbKyhEnjFbPQ7SGybbs0=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "3a151b1d7cc68fb40e3be976e741506749f6a9d6", "rev": "ba5f8b30d33ce3e82e6b67c8238ce5f05f472ef4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -495,11 +495,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726614420, "lastModified": 1726556616,
"narHash": "sha256-HePvM3tE8DvyzQESHZanH2m3thYuyuWSA4JhpRyrwkY=", "narHash": "sha256-QbaVuqJnb1UMMJRhtfWprjcV17QcDpkFAIWnPVqW0vY=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "04d35ad67cb1920861b65a956183776ad7cf0207", "rev": "d780ff50b11a8b40fb3bd612d557d15180c550a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -627,7 +627,7 @@
"nix-darwin_3": { "nix-darwin_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"viminal", "personal-neovim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -729,13 +729,13 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"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": [
"viminal", "personal-neovim",
"nixpkgs" "nixpkgs"
], ],
"nuschtosSearch": "nuschtosSearch", "nuschtosSearch": "nuschtosSearch",
@ -757,9 +757,9 @@
}, },
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"viminal", "personal-neovim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -778,6 +778,32 @@
"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": [
@ -834,9 +860,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"
} }
@ -900,7 +926,7 @@
}, },
"spicetify": { "spicetify": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -997,7 +1023,7 @@
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"viminal", "personal-neovim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -1018,7 +1044,7 @@
}, },
"vesktop-bin": { "vesktop-bin": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -1037,32 +1063,6 @@
"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": {

4
flake.nix
View file

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

15
hosts/callisto/0001-linux-dmabuf-allow-on-split-node-systems.patch Normal file
View file

@ -0,0 +1,15 @@
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();
}
});
}

2
modules/linux/core/default.nix
View file

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