moritz
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: moritz:5559e9291e15866e222db6272f10f2889428fea6
Branches Tags
moritz:nixos
...
compare: moritz:8dab093deb6265ad042e87899cf10fbb41d7f41f
Branches Tags
moritz:nixos

7 Commits
5559e9291e ... 8dab093deb

Author SHA1 Message Date
Moritz Böhme 8dab093deb
chore: update inputs 2024-02-16 11:28:30 +01:00
Moritz Böhme 43d2bd3645
feat: do not notify using nix-monitored 2024-02-16 11:28:08 +01:00
Moritz Böhme 71fe796589
refactor: move lsp-config 2024-02-16 11:02:46 +01:00
Moritz Böhme 66cbbaa4ba
feat: add nix-monitored 2024-02-16 11:02:24 +01:00
Moritz Böhme d098a8f907
refactor(nvim): add parser dir to front of runtimedir 2024-02-16 09:46:23 +01:00
Moritz Böhme 591f981e71
feat(nvim)!: remove nvim puppeteer 2024-02-16 09:45:20 +01:00
Moritz Böhme 8a9d67a3d5
fix(nvim)!: remove treesitter override because of lua issues 2024-02-16 09:44:17 +01:00
6 changed files with 190 additions and 182 deletions
Show Stats Expand all files Collapse all files

229
flake.lock
View File

@ -3,11 +3,11 @@
"actions-preview-nvim": { "actions-preview-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1704627848, "lastModified": 1707037812,
"narHash": "sha256-iXqs1+3z6ujm/6thDpbgoyWmUJ5Nd+D0zxAW4jc+T2c=", "narHash": "sha256-KUkWhXSSEXWi7NZ92F1nk/mhAgSNLrmdwAow9Odwe7k=",
"owner": "aznhe21", "owner": "aznhe21",
"repo": "actions-preview.nvim", "repo": "actions-preview.nvim",
"rev": "dd63df1a4ed0ffe1458945ee50ecb1dd02b605ab", "rev": "9e86d014a72a4121ee27f3d8952e1ea868c3c8c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -26,11 +26,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1703433843, "lastModified": 1707830867,
"narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "417caa847f9383e111d1397039c9d4337d024bf0", "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -42,11 +42,11 @@
"arkenfox-userjs": { "arkenfox-userjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1700833105, "lastModified": 1707077370,
"narHash": "sha256-8mxKaA0yGx29X+E0ahCjsGXSc29I1+5timNP6cJHGM0=", "narHash": "sha256-624Giuo1TfeXQGzcGK9ETW86esNFhFZ5a46DCjT6K5I=",
"owner": "arkenfox", "owner": "arkenfox",
"repo": "user.js", "repo": "user.js",
"rev": "4a510a4b4ceda8a177831a77309f2faccf7e18d5", "rev": "33a84b608c8a1f871c6ce9c4d2b932dc57078fae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +118,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1706261939, "lastModified": 1708029101,
"narHash": "sha256-KQ3Hb3XVSrxOLfiY2D63QD5+LsLwFeY81ZScD4GRp0o=", "narHash": "sha256-FPlAle/nl4sJRfd8eILe5M20aRJh/z2KY8ji2yBBwaI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "c12719812dde4dcbc4119a2b09766a51c9c498d5", "rev": "810eccbad22cc50323b27161033399eb87658932",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1704982712, "lastModified": 1706830856,
"narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "07f6395285469419cf9d078f59b5b49993198c00", "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -205,11 +205,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704982712, "lastModified": 1706830856,
"narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "07f6395285469419cf9d078f59b5b49993198c00", "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -314,11 +314,11 @@
"gen-nvim": { "gen-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1703233104, "lastModified": 1707889639,
"narHash": "sha256-cNz/yPTTgt1ng4C2BqN4P62FBV7lmDIEmEsdDhfyKHk=", "narHash": "sha256-pM+7hkLHBapdj6yOx2FKG5jYNfcf29rorDacLJu0hFw=",
"owner": "David-Kunz", "owner": "David-Kunz",
"repo": "gen.nvim", "repo": "gen.nvim",
"rev": "41ad952c8269fa7aa3a4b8a5abb44541cb628313", "rev": "98043162168dcc0eb5c3c31b97439ff686dc8559",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -455,11 +455,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1706271892, "lastModified": 1708018354,
"narHash": "sha256-ln+6hdNB1gW7+pz9d24zdCGpVKW0M1c/Xea/w+ZKqGk=", "narHash": "sha256-MlbqBzAjiz4Va2M/AvLN96Wq+jsCbEedhfMs5wW1yFM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "5cd7e4587e0ae642ce60415f8e271df2095a3ff2", "rev": "fbf5ba87ce57752653f3bebf6e2be090c702836e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -517,11 +517,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1703656108, "lastModified": 1706639736,
"narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=", "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "033643a45a4a920660ef91caa391fbffb14da466", "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -564,11 +564,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1706273017, "lastModified": 1708077385,
"narHash": "sha256-Jt5JdzUq8NysMrQL/OCXD7g+bJQbbZ9nK5hw0GZXQic=", "narHash": "sha256-AaltTBb76jj0jQNsoItBf4scf1oVPREZ8KwGUeDDUkI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e78f177a8a7a79d6c7e1fcfe509901e87658ec63", "rev": "4bd735b4dcfd26665dfb77ecfd52789603f03737",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -626,11 +626,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1706140641, "lastModified": 1708040042,
"narHash": "sha256-H1qHhkf7sF7yrG2rb9Ks1Y4EtLY3cXGp16KCGveJWY4=", "narHash": "sha256-8iloeE/jALIKcOcYKgTlI9i7iDW7n52Epqps27jGklU=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "4e59422e1d4950a3042bad41a7b81c8db4f8b648", "rev": "04dfa2eea914086a9f42a5a00a33e9524f9fded4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -649,11 +649,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1706141075, "lastModified": 1708041826,
"narHash": "sha256-o66/XFTXmcJSpEcO508V5r765HtgT8qtr+H4LRIB9BY=", "narHash": "sha256-zW7F31gW4HCBYcImcXxold4ntZdlEr/NTlMVhEMA5dw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "1da2e054a16309d7d7f7669438c8b9a5ef1b4642", "rev": "1afaeebc41dab1029b855b17d78f2348e8dd49e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -662,6 +662,21 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter": {
"locked": {
"lastModified": 1687178632,
"narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -669,11 +684,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705806513, "lastModified": 1707620986,
"narHash": "sha256-FcOmNjhHFfPz2udZbRpZ1sfyhVMr+C2O8kOxPj+HDDk=", "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "f8e04fbcebcc24cebc91989981bd45f69b963ed7", "rev": "0cb4345704123492e6d1f1068629069413c80de0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -697,6 +712,27 @@
"url": "https://git.moritzboeh.me/moritz/NixLazy.nvim" "url": "https://git.moritzboeh.me/moritz/NixLazy.nvim"
} }
}, },
"nix-monitored": {
"inputs": {
"nix-filter": "nix-filter",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1692605628,
"narHash": "sha256-jBasvDCk9V32JuwtPy1G4KyVAc2eaBSf2X5eRNQgIkY=",
"owner": "ners",
"repo": "nix-monitored",
"rev": "6be92b0c1eca7ef501b4f92735885e7cb4db414b",
"type": "github"
},
"original": {
"owner": "ners",
"repo": "nix-monitored",
"type": "github"
}
},
"nix-super": { "nix-super": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@ -706,11 +742,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1701958654, "lastModified": 1708070219,
"narHash": "sha256-ZhXujNwvwTDLmCpYb7h2bTDdZG4h97hEYjzBmKP8p2U=", "narHash": "sha256-/2fidzoXrrNwr8te2cU3JdtrpockWIjU4DpLgNr4FTo=",
"owner": "privatevoid-net", "owner": "privatevoid-net",
"repo": "nix-super", "repo": "nix-super",
"rev": "661b025c79eac08beda593ede47b41b2052e8ebf", "rev": "924eb1127a21ebf4bd7f438d7c6aca133ce1de84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -738,11 +774,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1703961334, "lastModified": 1706550542,
"narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -787,11 +823,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1706173671, "lastModified": 1707268954,
"narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -819,11 +855,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1705133751, "lastModified": 1707546158,
"narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -835,11 +871,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1706006310, "lastModified": 1707939175,
"narHash": "sha256-nDPz0fj0IFcDhSTlXBU2aixcnGs2Jm4Zcuoj0QtmiXQ=", "narHash": "sha256-D1xan0lgxbmXDyzVqXTiSYHLmAMrMRdD+alKzEO/p3w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b43bb235efeab5324c5e486882ef46749188eee2", "rev": "f7e8132daca31b1e3859ac0fb49741754375ac3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -867,11 +903,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1706173671, "lastModified": 1708001613,
"narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", "narHash": "sha256-woOmAXW05XnqlLn7dKzCkRAEOSOdA/Z2ndVvKcjid94=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", "rev": "085589047343aad800c4d305cf7b98e8a3d51ae2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -916,11 +952,11 @@
"none-ls-nvim": { "none-ls-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1706069423, "lastModified": 1707832208,
"narHash": "sha256-s+Hp0Yzge7FKKDez4DO8uytsNORIqeNWYOLSO7kSZbo=", "narHash": "sha256-nQCxzlQZgso2rjHLVaASkStQhrC4XUpg3d8/yfrZfR0=",
"owner": "nvimtools", "owner": "nvimtools",
"repo": "none-ls.nvim", "repo": "none-ls.nvim",
"rev": "a311c7cc8f17543143a7482cdbe3a384c371d56a", "rev": "34b1311bd07bd3741e60e06b34d0709d6e5a9f0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -931,11 +967,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1706270864, "lastModified": 1708076655,
"narHash": "sha256-+OtaanZN6C4rS6bNujBban8fT4HsnozFZtXfPTLuaTI=", "narHash": "sha256-KNRfg2szpJ19/NgXXB4s9r2+CCM90nq0MVUuvdQI+Ws=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "0293fc1d7aefc2204a922ad41bb5141f085a13ec", "rev": "1155ba6a69b8a69d7edda02321a21ff993d9300e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -947,11 +983,11 @@
"nvim-lspconfig": { "nvim-lspconfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1705757419, "lastModified": 1708063340,
"narHash": "sha256-StYsN9C2rV471JkncUR1PFeXs0S15ZGTF1DigSbwOHI=", "narHash": "sha256-1k3BRjNy853WjuTMUT8EjGZd9v4phuUMTZmJfZLDToM=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "8917d2c830e04bf944a699b8c41f097621283828", "rev": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -960,38 +996,6 @@
"type": "github" "type": "github"
} }
}, },
"nvim-puppeteer": {
"flake": false,
"locked": {
"lastModified": 1706210708,
"narHash": "sha256-tjL4qC1VAad4NXaZFDhTcmbrbdqNpVm7/MnyR/CE3rw=",
"owner": "chrisgrieser",
"repo": "nvim-puppeteer",
"rev": "048c819c8033e5febe0a04e63b98e74a5d0f8de6",
"type": "github"
},
"original": {
"owner": "chrisgrieser",
"repo": "nvim-puppeteer",
"type": "github"
}
},
"nvim-treesitter": {
"flake": false,
"locked": {
"lastModified": 1706272330,
"narHash": "sha256-R+oQGVcmncAd39D5AkGV1HAPgGDPMiucrC1GHMLh/Xk=",
"owner": "nvim-treesitter",
"repo": "nvim-treesitter",
"rev": "efda19a54a157da8635aa6cb84f56a10593b1a23",
"type": "github"
},
"original": {
"owner": "nvim-treesitter",
"repo": "nvim-treesitter",
"type": "github"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
@ -1001,11 +1005,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1705757126, "lastModified": 1708018599,
"narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=", "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc", "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1035,13 +1039,12 @@
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"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-monitored": "nix-monitored",
"nix-super": "nix-super", "nix-super": "nix-super",
"nixpkgs": "nixpkgs_7", "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",
"nvim-puppeteer": "nvim-puppeteer",
"nvim-treesitter": "nvim-treesitter",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"smartcolumn-nvim": "smartcolumn-nvim", "smartcolumn-nvim": "smartcolumn-nvim",
"stable": "stable", "stable": "stable",
@ -1085,11 +1088,11 @@
"statuscol-nvim": { "statuscol-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1703372986, "lastModified": 1708023805,
"narHash": "sha256-uEKdzttNTQqwZb2oPgzTDuvJRkoTCmGg3piFzwKBITc=", "narHash": "sha256-I6Wefl83mcMURtJEq1yaR2thxVMfpJmjSplapeVyKYE=",
"owner": "luukvbaal", "owner": "luukvbaal",
"repo": "statuscol.nvim", "repo": "statuscol.nvim",
"rev": "0a782cc73f935e9f790ed029dc316b297545d845", "rev": "e9e4c30b68abe456d80a0b144149ebf3f4527ed8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1262,18 +1265,18 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1703963193, "lastModified": 1706359063,
"narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "f81c3d93cd6f61b20ae784297679283438def8df", "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "f81c3d93cd6f61b20ae784297679283438def8df", "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2",
"type": "gitlab" "type": "gitlab"
} }
}, },
@ -1294,11 +1297,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704659450, "lastModified": 1706521509,
"narHash": "sha256-3lyoUVtUWz1LuxbltAtkJSK2IlVXmKhxCRU2/0PYCms=", "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "6a5de92769d5b7038134044053f90e7458f6a197", "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View File

@ -22,6 +22,8 @@
# Programs # Programs
nix-super.url = "github:privatevoid-net/nix-super"; nix-super.url = "github:privatevoid-net/nix-super";
nix-monitored.url = "github:ners/nix-monitored";
nix-monitored.inputs.nixpkgs.follows = "nixpkgs";
timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git"; timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git";
# Neovim # Neovim
@ -31,10 +33,6 @@
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";
nvim-puppeteer.flake = false;
nvim-puppeteer.url = "github:chrisgrieser/nvim-puppeteer";
nvim-treesitter.flake = false;
nvim-treesitter.url = "github:nvim-treesitter/nvim-treesitter";
smartcolumn-nvim.flake = false; smartcolumn-nvim.flake = false;
smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim"; smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
telekasten-nvim.flake = false; telekasten-nvim.flake = false;

100
modules/programs/nix.nix
View File

@ -9,6 +9,23 @@
with lib; with lib;
let let
cfg = config.my.programs.nix; cfg = config.my.programs.nix;
mkSuper = system: nix:
if cfg.useSuper
then inputs.nix-super.packages.${system}.default
else nix;
mkNom = system: nix:
if cfg.useNom
then
inputs.nix-monitored.packages.${system}.default.override
{
withNotify = false;
nix = nix;
}
else nix;
mkNix = system: nix: mkNom system (mkSuper system nix);
in in
{ {
options.my.programs.nix = { options.my.programs.nix = {
@ -21,48 +38,65 @@ in
}; };
}; };
optimise.enable = mkEnableOption "nix-optimise"; optimise.enable = mkEnableOption "nix-optimise";
useSuper = mkEnableOption "use nix super" // { default = true; };
useNom = mkEnableOption "use nix output monitor by default" // { default = true; };
}; };
config.nix = { config = {
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; my.nixpkgs.overlays = [
(final: prev:
{
nixos-rebuild = prev.nixos-rebuild.override {
nix = mkNom final.system final.nix;
};
})
];
package = inputs.nix-super.packages.${pkgs.system}.default; home-manager.users.moritz.programs.direnv.nix-direnv.package = pkgs.nix-direnv.override {
nix = config.nix.package;
extraOptions = "experimental-features = nix-command flakes";
gc = {
automatic = cfg.gc.enable;
options = "--max-freed ${cfg.gc.minimumFreedGB} --delete-older-than 14d";
dates = "weekly";
}; };
optimise = { nix = {
automatic = cfg.optimise.enable; nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
dates = [ "weekly" ];
};
registry = { package = mkNix pkgs.system pkgs.nix;
master-upstream.to = {
type = "github"; extraOptions = "experimental-features = nix-command flakes";
owner = "nixos";
repo = "nixpkgs"; gc = {
automatic = cfg.gc.enable;
options = "--max-freed ${cfg.gc.minimumFreedGB} --delete-older-than 14d";
dates = "weekly";
}; };
master.flake = inputs.master;
nixpkgs.flake = inputs.nixpkgs;
stable.flake = inputs.stable;
dotfiles.flake = self;
default.flake = self;
};
settings = { optimise = {
substituters = [ automatic = cfg.optimise.enable;
"https://cache.nixos.org/" dates = [ "weekly" ];
]; };
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
];
trusted-users = [ "root" "@wheel" ]; registry = {
master-upstream.to = {
type = "github";
owner = "nixos";
repo = "nixpkgs";
};
master.flake = inputs.master;
nixpkgs.flake = inputs.nixpkgs;
stable.flake = inputs.stable;
dotfiles.flake = self;
default.flake = self;
};
settings = {
substituters = [
"https://cache.nixos.org/"
];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
];
trusted-users = [ "root" "@wheel" ];
};
}; };
}; };
} }

20
modules/programs/nvim/default.nix
View File

@ -10,26 +10,6 @@ in
options.my.programs.nvim.enable = mkEnableOption "nvim"; options.my.programs.nvim.enable = mkEnableOption "nvim";
config = mkIf cfg.enable { config = mkIf cfg.enable {
my.nixpkgs.overlays = [
(
_: prev:
with lib.my;
{
vimPlugins = prev.vimPlugins // {
nvim-treesitter = prev.vimPlugins.nvim-treesitter.overrideAttrs (_: {
version = mkVersionInput inputs.nvim-treesitter;
src = inputs.nvim-treesitter;
});
# HACK: to fix error in nixpkgs version of nvim-lspconfig
nvim-lspconfig = prev.vimPlugins.nvim-lspconfig.overrideAttrs (_: {
version = mkVersionInput inputs.nvim-lspconfig;
src = inputs.nvim-lspconfig;
});
};
}
)
];
home-manager.users.moritz = { home-manager.users.moritz = {
xdg.configFile."nvim/snippets" = { xdg.configFile."nvim/snippets" = {
recursive = true; recursive = true;

13
modules/programs/nvim/plugins/coding.nix
View File

@ -98,7 +98,10 @@ with builtins;
lazy = false; lazy = false;
} }
{ {
plugin = nvim-lspconfig; plugin = pkgs.vimPlugins.nvim-lspconfig.overrideAttrs (_: {
version = lib.my.mkVersionInput inputs.nvim-lspconfig;
src = inputs.nvim-lspconfig;
});
event = [ "BufRead" "BufNewFile" ]; event = [ "BufRead" "BufNewFile" ];
conf = readFile ./lua/nvim-lspconfig.lua; conf = readFile ./lua/nvim-lspconfig.lua;
dependencies = [ dependencies = [
@ -266,14 +269,6 @@ with builtins;
} }
]; ];
} }
{
plugin = pkgs.vimUtils.buildVimPlugin {
pname = "nvim-puppeteer";
version = lib.my.mkVersionInput inputs.nvim-puppeteer;
src = inputs.nvim-puppeteer;
};
lazy = false; # NOTE: plugin lazy-loads itself.
}
{ {
plugin = conform-nvim; plugin = conform-nvim;
keys = [ keys = [

4
modules/programs/nvim/plugins/treesitter.nix
View File

@ -56,9 +56,7 @@ with builtins;
require('nvim-treesitter.configs').setup(final_opts) require('nvim-treesitter.configs').setup(final_opts)
''; '';
init = '' init = ''
local runtimepath = vim.opt.runtimepath:get() vim.opt.runtimepath:prepend("${parserDir}")
table.insert(runtimepath, 4, "${parserDir}")
vim.opt.runtimepath = runtimepath
''; '';
priority = 100; priority = 100;
dependencies = [ dependencies = [