jalil/configuration.nix
1
1
Fork 0
Code Issues 1 Pull requests Projects Activity Actions

update #3

Merged
jalil merged 4 commits from update into main 2024-06-15 00:07:48 +02:00
Conversation 0 Commits 4 Files changed 3 +33 -32
3 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
flake.lock
View file

@ -371,11 +371,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1717732411,
"narHash": "sha256-cxK0tBbUxXtIYKLbjHpH+swiIzEoj61c82I/pN/yBoE=",
"rev": "4f94531209510c7d580e525a017ea01f18894ded",
"lastModified": 1718316862,
"narHash": "sha256-/hsqsiw3p5qMpazedgFFZF2sQghbCJIoef7XCpegTXw=",
"rev": "068576042b3b58f8180b24a36c07199a1a3fd380",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4f94531209510c7d580e525a017ea01f18894ded.tar.gz"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/068576042b3b58f8180b24a36c07199a1a3fd380.tar.gz"
},
"original": {
"type": "tarball",
@ -409,11 +409,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1717574423,
"narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=",
"lastModified": 1718349360,
"narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177",
"rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6",
"type": "github"
},
"original": {
@ -424,11 +424,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1717555607,
"narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=",
"lastModified": 1718208800,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
"type": "github"
},
"original": {
@ -453,16 +453,16 @@
],
"nix-darwin": [],
"nixpkgs": [
"unstable"
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1717681257,
"narHash": "sha256-0PhFvfc4wDjba1cus2ALsfn0wVizeKkcuF+aqvDJivg=",
"lastModified": 1718376125,
"narHash": "sha256-NIJZxmY2CWsqJK/9BQCRSHfcCY9K6thjq/1XtJobxmU=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "36f2e51b28ee3389a67ed5e9ed5c4bd388b06918",
"rev": "7a2a25af02be25987aa43cd681312f4b5ba12317",
"type": "github"
},
"original": {
@ -507,16 +507,16 @@
]
},
"locked": {
"lastModified": 1717250350,
"narHash": "sha256-l7y55WbUrj4NVCzgo3GLmM1Z2HC2uLb8dLUt7FxfI5g=",
"owner": "jalil-salame",
"lastModified": 1718122552,
"narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=",
"owner": "danth",
"repo": "stylix",
"rev": "03a8c7744903f29f017fabeda833834bd873f956",
"rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7",
"type": "github"
},
"original": {
"owner": "jalil-salame",
"ref": "enable-option",
"owner": "danth",
"ref": "release-24.05",
"repo": "stylix",
"type": "github"
}
@ -544,11 +544,11 @@
]
},
"locked": {
"lastModified": 1717278143,
"narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=",
"lastModified": 1718139168,
"narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706",
"rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1",
"type": "github"
},
"original": {
@ -559,11 +559,11 @@
},
"unstable": {
"locked": {
"lastModified": 1717602782,
"narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
"lastModified": 1718318537,
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
"type": "github"
},
"original": {

9
flake.nix
View file

@ -36,7 +36,7 @@
nixos-hardware.url = "github:NixOS/nixos-hardware";
# FIXME: pin to 24.05 when avalialble
stylix = {
url = "github:jalil-salame/stylix/enable-option";
url = "github:danth/stylix/release-24.05";
inputs = {
nixpkgs.follows = "nixpkgs";
home-manager.follows = "home-manager";
@ -45,7 +45,9 @@
nixvim = {
url = "github:nix-community/nixvim";
inputs = {
nixpkgs.follows = "unstable";
# Disable until fixed upstream: https://github.com/nix-community/nixvim/issues/1699
# nixpkgs.follows = "unstable";
nixpkgs.follows = "nixpkgs";
devshell.follows = "devshell";
nix-darwin.follows = ""; # disable MacOS stuff
home-manager.follows = "home-manager";
@ -78,7 +80,6 @@
jpassmenu,
audiomenu,
nixvim,
lix,
lix-module,
...
}: let
@ -213,7 +214,7 @@
(import ./system {inherit stylix;})
home-manager.nixosModules.home-manager
]
++ nixpkgs.lib.optional (lix != null && lix-module != null) lix-module.nixosModules.default;
++ nixpkgs.lib.optional (lix-module != null) lix-module.nixosModules.default;
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;

4
nvim/plugins.nix
View file

@ -134,13 +134,13 @@
enable = true;
servers = {
bashls.enable = true;
# clangd.enable = true;
# clangd.enable = true; # Adds ~2GiB
html.enable = true;
jsonls.enable = true;
nil-ls.enable = true;
ruff-lsp.enable = true;
taplo.enable = true;
texlab.enable = true;
# texlab.enable = true; # Not writing TeX rn
typos-lsp.enable = true;
typst-lsp.enable = true;
};