Compare commits

..

No commits in common. "118fe7ba67e9a5b53cacee960d3fd87a0894390d" and "fd159af54c447a6e9b211169640a258bbeae125c" have entirely different histories.

9 changed files with 134 additions and 216 deletions

View file

@ -3,11 +3,11 @@
"actions-preview-nvim": { "actions-preview-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1700487072, "lastModified": 1692778077,
"narHash": "sha256-gGUVWsaFLzrUEGK7wY05RtvorbG5oyqlR34PMPQEZ0U=", "narHash": "sha256-5HzyrYWGTdorG4JXMv0iQNj9EM702+8g7E18Oct1JiY=",
"owner": "aznhe21", "owner": "aznhe21",
"repo": "actions-preview.nvim", "repo": "actions-preview.nvim",
"rev": "b2c89c2937d527c22deb194d574d2a93246cd869", "rev": "5650c76abfb84d6498330dd045657ba630ecdbba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -25,11 +25,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701216516, "lastModified": 1696775529,
"narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,11 +41,11 @@
"arkenfox-userjs": { "arkenfox-userjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1700833105, "lastModified": 1697641173,
"narHash": "sha256-8mxKaA0yGx29X+E0ahCjsGXSc29I1+5timNP6cJHGM0=", "narHash": "sha256-YuGEgJ4bSwvlfSgsUR2s6r1L3ZCdD8pvyU+pY4q+DMk=",
"owner": "arkenfox", "owner": "arkenfox",
"repo": "user.js", "repo": "user.js",
"rev": "4a510a4b4ceda8a177831a77309f2faccf7e18d5", "rev": "35e8def0b1e5ecf1198e7efe41cfe6aa0415b320",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +81,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701196468, "lastModified": 1696985954,
"narHash": "sha256-xZ1S+8NgxOurbYqh7n3wR3cw+FTP8DyCdb5lg7X+8kw=", "narHash": "sha256-dU1lYBWHqxkvbJV3B9oPeqLL0H8FkSKEqjPie+9xPgQ=",
"owner": "jcdickinson", "owner": "jcdickinson",
"repo": "codeium.nvim", "repo": "codeium.nvim",
"rev": "fd9c9030d402baf2a01cc9db08c39772c0a60324", "rev": "822e762567a0bf50b1a4e733c8c93691934d7606",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,11 +122,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1700815693, "lastModified": 1698410321,
"narHash": "sha256-JtKZEQUzosrCwDsLgm+g6aqbP1aseUl1334OShEAS3s=", "narHash": "sha256-MphuSlgpmKwtJncGMohryHiK55J1n6WzVQ/OAfmfoMc=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "7ad1c417c87e98e56dcef7ecd0e0a2f2e5669d51", "rev": "1aed986e3c81a4f6698e85a7452cbfcc4b31a36e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,11 +140,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1700927249, "lastModified": 1698422527,
"narHash": "sha256-iqmIWiEng890/ru7ZBf4nUezFPyRm2fjRTvuwwxqk2o=", "narHash": "sha256-SDu3Xg263t3oXIyTaH0buOvFnKIDeZsvKDBtOz+jRbs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22", "rev": "944d338d24a9d043a3f7461c30ee6cfe4f9cca30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,11 +206,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1698882062, "lastModified": 1698579227,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "rev": "f76e870d64779109e41370848074ac4eaa1606ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +227,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1698882062, "lastModified": 1696343447,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -345,11 +345,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701009247, "lastModified": 1698165573,
"narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", "narHash": "sha256-cnMTgCDnZiQKsf+wVzigpexskqRCFTKgS58Wx2rNU1c=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", "rev": "300e0af24a1bbe32d115beb182efb01785582c45",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +402,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701071203, "lastModified": 1698795315,
"narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", "narHash": "sha256-fF5ScAWLMHXOuqsbLSG137kS1D+gr9JPtm4H2c4yBbU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", "rev": "9bc7d84b8213255ecd5eb6299afdb77c36ece71d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -420,11 +420,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1700963402, "lastModified": 1698687579,
"narHash": "sha256-JhkanLmYRLekGOysO6JpCWKPlgRoemHPzUrARCGBqYA=", "narHash": "sha256-BWqQQLhpuQolMiLMTcsc8cNlNzI9+MG/uc184IlP2nA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "65e567a81176d39be7ce6513d1af23954f00cbec", "rev": "bfd3e0efc1af9654808e644b157eb3c170c26fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -442,11 +442,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1701344414, "lastModified": 1698802123,
"narHash": "sha256-ViW79jtyafW7Q0T+V83k8gk+a2y27Ua1lqFnDxSFCwA=", "narHash": "sha256-Tpx1U6IlnD+wrSvUrBwEvwvK5D8cifIdppB9CwpVQdo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "29970228c5f71f417b0a3e1b4851d9430ed095dd", "rev": "7b32b4214d028a173c8192bddaa9e43503326080",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -485,11 +485,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1701083219, "lastModified": 1698097178,
"narHash": "sha256-0j4Poy2OEZ55GWagfj6ookxG6jXdsDHZLh6vU3DBuz4=", "narHash": "sha256-W4W3pAYNpXp0jLZwK0Bxw6R7n2/UYxp+lnT5mD2/xEM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "b94f84605d6d6d8d3c17a42a72fc3b01df69ab7f", "rev": "d6856adaffb77a9cc1aac3d04d98276eaa5602a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -513,22 +513,6 @@
"type": "github" "type": "github"
} }
}, },
"libgit2": {
"flake": false,
"locked": {
"lastModified": 1700492800,
"narHash": "sha256-bGNcbA6AMUWhpuagnVWR1ZBdbUcZVdZtbMaRxY5JiCU=",
"owner": "libgit2",
"repo": "libgit2",
"rev": "d9475611fec95cacec30fbd2c334b270e5265d3b",
"type": "github"
},
"original": {
"owner": "libgit2",
"repo": "libgit2",
"type": "github"
}
},
"lowdown-src": { "lowdown-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -547,11 +531,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1701336116, "lastModified": 1698838244,
"narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", "narHash": "sha256-uOrd51CisNyM0V+Y+c8uXIQSxQYKKBaINsYtd5I9bJU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", "rev": "4be2d0ba3e43534ad23217d66d3abd60613f08ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -609,11 +593,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1701302207, "lastModified": 1698359872,
"narHash": "sha256-DQ7nF2k2dwQDHhh2ohTEmj6Gn2+ow2OFBwCgpBt0nn4=", "narHash": "sha256-/migmIszx7Kqa/x9I6hKYATeFSpZ7P+6NKRDA1nkZfk=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "463b577afb78ad864cd09ac2c51f77653ab4ce48", "rev": "9dc440400cdb470b317c4169ba916e1cd9a316e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -632,16 +616,17 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1701302639, "lastModified": 1698364851,
"narHash": "sha256-wvFGpQl39xgUikFAN99E2AcmdyYWNbSM8MUXCcdrnWo=", "narHash": "sha256-UQqC71YP6B5uOQ8HZRWQsbiMDKIROLhSNlnFPnDP27Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "3d00c9fc954c278f0aa76d16faef983bf450af8e", "rev": "dacbb092b5d6e97127b3e57007474a5c47305164",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "dacbb092b5d6e97127b3e57007474a5c47305164",
"type": "github" "type": "github"
} }
}, },
@ -652,11 +637,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700968077, "lastModified": 1698550809,
"narHash": "sha256-Lax+2g7G3Fe+ckMrHLYTl+97unbmNDmN1qS9MLBkxr4=", "narHash": "sha256-Um8+Wi6EAH5dCgfgl7OqaVd4wFJn6FKLafcP5QPr/98=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "bd3aec0ecb0fdde863a7ed2c6caa220c47e22c07", "rev": "1f0981f5baeb78e3c89a8980ff1a39f06876fa8c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -683,23 +668,24 @@
"nix-super": { "nix-super": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"libgit2": "libgit2",
"lowdown-src": "lowdown-src", "lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_7", "nixpkgs": [
"stable"
],
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1700941252, "lastModified": 1697392285,
"narHash": "sha256-2c8miJcsG24YEtXOSjvgW0ES1ND5DpY+ymGPq3S56YE=", "narHash": "sha256-1IBnF9IuStUWoAKJ74HNhV46+9Cbf/yZP6h6hJOJ1Cg=",
"owner": "privatevoid-net", "owner": "privatevoid-net",
"repo": "nix-super", "repo": "nix-super",
"rev": "c076362db8b438c921d9bbe196ede50205f788c6", "rev": "ba035e1ea339a97e6ba6a1dd79e0c0e334240234",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "privatevoid-net", "owner": "privatevoid-net",
"repo": "nix-super", "repo": "nix-super",
"rev": "c076362db8b438c921d9bbe196ede50205f788c6", "rev": "ba035e1ea339a97e6ba6a1dd79e0c0e334240234",
"type": "github" "type": "github"
} }
}, },
@ -722,11 +708,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1698611440, "lastModified": 1696019113,
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -769,22 +755,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_10": {
"locked": {
"lastModified": 1692934111,
"narHash": "sha256-9EEE59v/esKNMR5zKbLRV9NoRPYvERw5jHQOnfr47bk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1e44a037bbf4fcaba041436e65e87be88f3f495b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1697915759, "lastModified": 1697915759,
@ -819,11 +789,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1700612854, "lastModified": 1698134075,
"narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -851,11 +821,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1701174899, "lastModified": 1698266953,
"narHash": "sha256-1W+FMe8mWsJKXoBc+QgKmEeRj33kTFnPq7XCjU+bfnA=", "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "010c7296f3b19a58b206fdf7d68d75a5b0a09e9e", "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -867,27 +837,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1701184375, "lastModified": 1698553279,
"narHash": "sha256-E8PLzcEMf/1VtRcu+SeJZHtlNrXveBhGoN4AGYxScRE=", "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e922e146779e250fae512da343cfb798c758509d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1701237617,
"narHash": "sha256-Ryd8xpNDY9MJnBFDYhB37XSFIxCPVVVXAbInNPa95vs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85306ef2470ba705c97ce72741d56e42d0264015", "rev": "90e85bc7c1a6fc0760a94ace129d3a1c61c3d035",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -897,7 +851,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1689261696, "lastModified": 1689261696,
"narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
@ -913,14 +867,30 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": {
"locked": {
"lastModified": 1692934111,
"narHash": "sha256-9EEE59v/esKNMR5zKbLRV9NoRPYvERw5jHQOnfr47bk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1e44a037bbf4fcaba041436e65e87be88f3f495b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"none-ls-nvim": { "none-ls-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1701287639, "lastModified": 1698458199,
"narHash": "sha256-JE+6Sl1YaVaJa5ccFqknyl1yfOQPXcoaeLWyMD6ylLk=", "narHash": "sha256-r8CyCvGVJG7hLAIlonaqzjxAiybRySkRe/Y9c4krQXE=",
"owner": "nvimtools", "owner": "nvimtools",
"repo": "none-ls.nvim", "repo": "none-ls.nvim",
"rev": "3a4826687da4310af379515086d71faca4d21288", "rev": "b8fd44ee1616e6a9c995ed5f94ad9f1721d303ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -931,11 +901,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1701333924, "lastModified": 1698835584,
"narHash": "sha256-w953OKiXjECq44lI+vA1YR0XW/Np/B4OrIIm/d/GntU=", "narHash": "sha256-2ljVCc2VjvdnRhKRzfZfGwS3mrsHO24Nsr7zf5NxTIg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f0d92d2737c97b37804ca485d10148ee9abccf69", "rev": "4c248463ef00cf5a5116940f36f8c154b78b4ded",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -947,11 +917,11 @@
"nvim-lspconfig": { "nvim-lspconfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1701322583, "lastModified": 1698537974,
"narHash": "sha256-nPXJPT3j5nEHoJ8VzOtqcWszzZKcrFBsXmo7RU63CY4=", "narHash": "sha256-8io/dDbFRUyBgzg+oVdpJCGhm59d+AwstyHs9OAWlkY=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "fcf153fbbf1facd16a71d46b92be8be495123a9f", "rev": "d0467b9574b48429debf83f8248d8cee79562586",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -963,11 +933,11 @@
"nvim-puppeteer": { "nvim-puppeteer": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1699883336, "lastModified": 1698399688,
"narHash": "sha256-pvJasvdIwH2kmZNcKCviItnUZMVUvbtezI72/IMk9iU=", "narHash": "sha256-dXeY7O7Qh+1f5qZuZiCF1/3g2xXsb7sDpWr9IhYaeXw=",
"owner": "chrisgrieser", "owner": "chrisgrieser",
"repo": "nvim-puppeteer", "repo": "nvim-puppeteer",
"rev": "1a941a8684b937295632bc156d1b17e80de2d717", "rev": "f3c06a83d24d2af9809c76dc5ec6e4ee1cfc21b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -998,15 +968,15 @@
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_8",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1700922917, "lastModified": 1698227354,
"narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", "narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", "rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1018,11 +988,11 @@
"rofi-wayland": { "rofi-wayland": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1701337007, "lastModified": 1697052256,
"narHash": "sha256-1OpY13TDc809/o/HAxYNhZUf2MG8ZETDEojJ2QsNCUE=", "narHash": "sha256-3mTmwoeP7yUg7ldbatvQB+hwHhwuHOoZZb1ozWwSsVw=",
"owner": "lbonn", "owner": "lbonn",
"repo": "rofi", "repo": "rofi",
"rev": "78888dd80ddb49a5b3296e55e94aaa41c0f43298", "rev": "5cd1e3ca2b6b896b2e591b465cc590479ef07aab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1055,7 +1025,7 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-lazy-nvim": "nix-lazy-nvim", "nix-lazy-nvim": "nix-lazy-nvim",
"nix-super": "nix-super", "nix-super": "nix-super",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_7",
"none-ls-nvim": "none-ls-nvim", "none-ls-nvim": "none-ls-nvim",
"nur": "nur", "nur": "nur",
"nvim-lspconfig": "nvim-lspconfig", "nvim-lspconfig": "nvim-lspconfig",
@ -1065,7 +1035,6 @@
"rofi-wayland": "rofi-wayland", "rofi-wayland": "rofi-wayland",
"smartcolumn-nvim": "smartcolumn-nvim", "smartcolumn-nvim": "smartcolumn-nvim",
"stable": "stable", "stable": "stable",
"statuscol-nvim": "statuscol-nvim",
"telekasten-nvim": "telekasten-nvim", "telekasten-nvim": "telekasten-nvim",
"timers": "timers" "timers": "timers"
} }
@ -1088,11 +1057,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1701053011, "lastModified": 1698696950,
"narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", "narHash": "sha256-FHFL58t6lMumvWqwundC8fDDDLOIvc+JJBNIAlPjrDY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", "rev": "017ef2132a5bda50bd713aeabce8f918502d4ec1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1102,23 +1071,6 @@
"type": "github" "type": "github"
} }
}, },
"statuscol-nvim": {
"flake": false,
"locked": {
"lastModified": 1700946586,
"narHash": "sha256-g36X+9hoOhHlw/DRSYdidQpHTx3ibjXNHJvONi29Yk8=",
"owner": "luukvbaal",
"repo": "statuscol.nvim",
"rev": "fb56a46dc446d3e9b61c269dd4aadbfd509223a7",
"type": "github"
},
"original": {
"owner": "luukvbaal",
"ref": "0.10",
"repo": "statuscol.nvim",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -1228,7 +1180,7 @@
"timers": { "timers": {
"inputs": { "inputs": {
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_9",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
@ -1267,18 +1219,18 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1701291624, "lastModified": 1697909146,
"narHash": "sha256-SWmzxn3gTyZOGEHgSDUJjJdoEKtt/kV6uWrUDx4JCC4=", "narHash": "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "d7ecdad4e082cb5817806348de198679a11b35df", "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "d7ecdad4e082cb5817806348de198679a11b35df", "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2",
"type": "gitlab" "type": "gitlab"
} }
}, },
@ -1298,11 +1250,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700508250, "lastModified": 1697981233,
"narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -21,7 +21,8 @@
nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
# Programs # Programs
nix-super.url = "github:privatevoid-net/nix-super/c076362db8b438c921d9bbe196ede50205f788c6"; nix-super.inputs.nixpkgs.follows = "stable";
nix-super.url = "github:privatevoid-net/nix-super/ba035e1ea339a97e6ba6a1dd79e0c0e334240234";
rofi-wayland.flake = false; rofi-wayland.flake = false;
rofi-wayland.url = "github:lbonn/rofi/wayland"; rofi-wayland.url = "github:lbonn/rofi/wayland";
timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git"; timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git";
@ -36,7 +37,7 @@
}; };
hmts-nvim.flake = false; hmts-nvim.flake = false;
hmts-nvim.url = "github:calops/hmts.nvim"; hmts-nvim.url = "github:calops/hmts.nvim";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay/dacbb092b5d6e97127b3e57007474a5c47305164"; # HACK: because upstream is broken
nix-lazy-nvim.url = "git+https://git.moritzboeh.me/moritz/NixLazy.nvim"; nix-lazy-nvim.url = "git+https://git.moritzboeh.me/moritz/NixLazy.nvim";
nvim-lspconfig.flake = false; nvim-lspconfig.flake = false;
nvim-lspconfig.url = "github:neovim/nvim-lspconfig"; nvim-lspconfig.url = "github:neovim/nvim-lspconfig";
@ -52,8 +53,6 @@
none-ls-nvim.url = "github:nvimtools/none-ls.nvim"; none-ls-nvim.url = "github:nvimtools/none-ls.nvim";
neotest-python.flake = false; neotest-python.flake = false;
neotest-python.url = "github:MoritzBoehme/neotest-python/fix-runtimepath-search"; neotest-python.url = "github:MoritzBoehme/neotest-python/fix-runtimepath-search";
statuscol-nvim.flake = false;
statuscol-nvim.url = "github:luukvbaal/statuscol.nvim/0.10"; # HACK: fix for neovim-nightly
# Hyprland # Hyprland
hypr-contrib.url = "github:hyprwm/contrib"; hypr-contrib.url = "github:hyprwm/contrib";

View file

@ -317,21 +317,5 @@ with builtins;
cmd = [ "ConformInfo" "Format" ]; cmd = [ "ConformInfo" "Format" ];
conf = readFile ./lua/conform.lua; conf = readFile ./lua/conform.lua;
} }
{
plugin = neogen;
keys = [
{ key = "<leader>cg"; cmd = "<cmd>Neogen<cr>"; desc = "Test"; }
];
opts = {
languages = {
python = {
template = {
annotation_convention = "reST";
};
};
};
};
cmd = [ "Neogen" ];
}
]; ];
} }

View file

@ -81,7 +81,7 @@ local on_attach_def = function(client, bufnr)
function() function()
require("telescope.builtin").lsp_type_definitions({ reuse_win = true }) require("telescope.builtin").lsp_type_definitions({ reuse_win = true })
end, end,
"Goto type definition", "Goto type defininition",
}, },
r = { "<cmd>Telescope lsp_references<cr>", "Goto references" }, r = { "<cmd>Telescope lsp_references<cr>", "Goto references" },
D = { vim.lsp.buf.declaration, "Goto declaration" }, D = { vim.lsp.buf.declaration, "Goto declaration" },
@ -129,6 +129,7 @@ local servers = {
"gopls", "gopls",
"nil_ls", "nil_ls",
"nixd", "nixd",
"pylsp",
"ruff_lsp", "ruff_lsp",
"typst_lsp", "typst_lsp",
} }
@ -136,18 +137,6 @@ for _, lsp in ipairs(servers) do
lspconfig_setup(lsp, {}) lspconfig_setup(lsp, {})
end end
lspconfig_setup("pylsp", {
settings = {
pylsp = {
plugins = {
rope_autoimport = {
enabled = true,
},
},
},
},
})
lspconfig_setup("rust_analyzer", { lspconfig_setup("rust_analyzer", {
settings = { settings = {
["rust-analyzer"] = { ["rust-analyzer"] = {

View file

@ -4,4 +4,7 @@ require("nvim-treesitter.configs").setup({
highlight = { highlight = {
enable = true, enable = true,
}, },
context_commentstring = {
enable = true,
},
}) })

View file

@ -21,7 +21,7 @@ with builtins;
} }
''; '';
dependencies = [ dependencies = [
{ plugin = nvim-ts-context-commentstring; opts = { }; } { plugin = nvim-ts-context-commentstring; }
]; ];
} }
{ {

View file

@ -35,11 +35,6 @@ with lib.my;
src = inputs.nvim-treesitter; src = inputs.nvim-treesitter;
}); });
statuscol-nvim = prev.vimPlugins.statuscol-nvim.overrideAttrs (_: {
version = mkVersionInput inputs.statuscol-nvim;
src = inputs.statuscol-nvim;
});
# HACK: to fix error in nixpkgs version of nvim-lspconfig # HACK: to fix error in nixpkgs version of nvim-lspconfig
nvim-lspconfig = prev.vimPlugins.nvim-lspconfig.overrideAttrs (_: { nvim-lspconfig = prev.vimPlugins.nvim-lspconfig.overrideAttrs (_: {
version = mkVersionInput inputs.nvim-lspconfig; version = mkVersionInput inputs.nvim-lspconfig;

View file

@ -1 +1,6 @@
use nix use nix
export PYTHONPATH="$(pwd)/src:$PYTHONPATH"
if [ ! -z $NIX_LD ]; then
export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
fi
layout poetry

View file

@ -1,14 +1,5 @@
{ pkgs ? import <nixpkgs> { } }: { pkgs ? import <nixpkgs> { } }:
let
poetry2nix = import (fetchTarball "https://github.com/nix-community/poetry2nix/archive/master.tar.gz") { };
project =
poetry2nix.mkPoetryApplication {
projectDir = ./.;
preferWheels = true;
};
in
pkgs.mkShell { pkgs.mkShell {
inputsFrom = [ project ]; buildInputs = with pkgs; [ python3 poetry ];
packages = [ pkgs.poetry ];
} }