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

Compare commits

base: moritz:bdc849205e2d9b9341c04d488a9e487600080ed1
Branches Tags
moritz:nixos
...
compare: moritz:57d91555a03a72d5f991833b30c979bcf7851a94
Branches Tags
moritz:nixos

11 Commits
bdc849205e ... 57d91555a0

Author SHA1 Message Date
Moritz Böhme 57d91555a0
Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos 2024-06-17 11:14:04 +02:00
Moritz Böhme 3b4b7b6657
feat: fix some wayland issues 2024-06-17 11:13:39 +02:00
Moritz Böhme 73689d50bf
feat: enable gitbutler 2024-06-17 11:13:09 +02:00
Moritz Böhme ca9f07d950
fix: hyprland 2024-06-17 11:12:59 +02:00
Moritz Böhme fad19c6a58
feat!: remove statuscol-nvim 2024-06-17 11:12:45 +02:00
Moritz Böhme ed9c5111e4
feat: add gitbutler 2024-06-17 11:12:00 +02:00
Moritz Böhme 8ce8af36de
feat: improve jetbrains 2024-06-17 10:02:38 +02:00
Moritz Böhme fcfc548717
feat: improve nvim experience 2024-06-17 10:02:10 +02:00
Moritz Böhme c11a2c5596
chore: update inputs 2024-06-17 10:01:32 +02:00
Moritz Böhme e45b2241fa
feat: update nixd config 2024-06-17 10:01:08 +02:00
Moritz Böhme a5a784b2d5
refactor: clean up a bit 2024-06-17 09:59:39 +02:00
17 changed files with 332 additions and 272 deletions
Show Stats Expand all files Collapse all files

9
.nixd.json
View File

@ -1,9 +0,0 @@
{
"options": {
"enable": true,
"target": {
"args": [],
"installable": ".#nixosConfigurations.nixos-desktop.options"
}
}
}

349
flake.lock
View File

@ -3,11 +3,11 @@
"actions-preview-nvim": { "actions-preview-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1710009411, "lastModified": 1715088001,
"narHash": "sha256-PIzXWOqmTeesPZg82iLkvLpJtOoDDljvwJq8wdvRtqQ=", "narHash": "sha256-jf2Jw10HOIA91lMouKNvVYACbTxOaXAxc00AB2HydNs=",
"owner": "aznhe21", "owner": "aznhe21",
"repo": "actions-preview.nvim", "repo": "actions-preview.nvim",
"rev": "5072b1b1065a6b22bdd46b5c21780a91d6a08071", "rev": "e8d41b608e24319548637685c7cfa66fadaff2b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -26,11 +26,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1712079060, "lastModified": 1715290355,
"narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "1381a759b205dff7a6818733118d02253340fd5e", "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +118,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1713406758, "lastModified": 1715563999,
"narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=", "narHash": "sha256-DDXZOKK0C5YeZ/GTUj7HiT+oqYIt8+qTsldaDvhWHFc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "1efd500e9805a9efbce401ed5999006d397b9f11", "rev": "e972a78f4a49cd92075d64b6feeef64d26bf2996",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1712014858, "lastModified": 1714641030,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -205,11 +205,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712014858, "lastModified": 1714641030,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +227,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709336216, "lastModified": 1712014858,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,6 +239,27 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": [
"nix-super",
"nixpkgs"
]
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@ -294,6 +315,21 @@
} }
}, },
"flake-utils_4": { "flake-utils_4": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_6"
}, },
@ -314,11 +350,11 @@
"gen-nvim": { "gen-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1712049871, "lastModified": 1714746280,
"narHash": "sha256-Bt7yJxToUnPv3JqBwWQeywIbVRqzHBqnu3NUaIxFx/M=", "narHash": "sha256-0AEB6im8Jz5foYzmL6KEGSAYo48g1bkFpjlCSWT6JeE=",
"owner": "David-Kunz", "owner": "David-Kunz",
"repo": "gen.nvim", "repo": "gen.nvim",
"rev": "87fbe811155b90eea58622614809705b966009ad", "rev": "bd19cf584b5b82123de977b44105e855e61e5f39",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +387,11 @@
"hawtkeys-nvim": { "hawtkeys-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1711836933, "lastModified": 1715069568,
"narHash": "sha256-wxxnQvIMHUbDOAbBAswueULavoIoIDHdJK7T09IHD8E=", "narHash": "sha256-oVpWh5pVU/OMnQ8ZRgW3iNG8I0xsLJnRBvt67yPWLQ0=",
"owner": "tris203", "owner": "tris203",
"repo": "hawtkeys.nvim", "repo": "hawtkeys.nvim",
"rev": "aeba04a4ccded2aa8c8fb5d74a3bea05a8f89dab", "rev": "261cc311d4abdc88decceca6dc1013faa14c56ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +409,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710478346, "lastModified": 1713898448,
"narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=", "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf", "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +450,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713682182, "lastModified": 1715486357,
"narHash": "sha256-2RSqVmQMFmn6OjQ21SXnWC+HuSeqDLWLftRv/ZhEDZE=", "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4cec20dbf5c0a716115745ae32531e34816ecbbe", "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -432,11 +468,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1712505318, "lastModified": 1713780596,
"narHash": "sha256-fzlBLhXUN6y7mzEtcGNRDXxFakBEfaj4Bmj5PuoCNaM=", "narHash": "sha256-DDAYNGSnrBwvVfpKx+XjkuecpoE9HiEf6JW+DBQgvm0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "5870244b592c22558b658dbaf94f9e41afb0316f", "rev": "110e6dc761d5c3d352574def3479a9c39dfc4358",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -479,22 +515,22 @@
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"systems": "systems_4", "systems": "systems_4",
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1713660608, "lastModified": 1713283263,
"narHash": "sha256-Wy9I4K1vuWtOv/UEpKmpDb6O8YaAY3GcC3pZu70DWMY=", "narHash": "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "7c3bd4c19fe47f2d92463b81d9b38651b7a1a268", "rev": "fe7b748eb668136dd0558b7c8279bfcd7ab4d759",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"ref": "v0.39.1",
"repo": "Hyprland", "repo": "Hyprland",
"type": "github" "type": "github"
} }
@ -511,11 +547,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691753796, "lastModified": 1714869498,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -549,31 +585,6 @@
"type": "github" "type": "github"
} }
}, },
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1713619586,
"narHash": "sha256-fIhNlYhPhG5AJ8DxX3LaitnccnQ+X2MCL39W2Abp7mM=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "9e13e0915273959bfd98a10662f678c15ac71c77",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1708968331, "lastModified": 1708968331,
@ -607,11 +618,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1713689773, "lastModified": 1715589090,
"narHash": "sha256-4M4c9n6sYbT7Sd/RvB9pej+7BoP7X1lNrFiboNV4O7I=", "narHash": "sha256-zrAP+EtMbOMx0XBFPgy/u0bfUBdh0F/mLUhHiaCPMi8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a8a8401b7b26112a9b75d6c00306e160fe8f8cb3", "rev": "983a74210808ebf5a93c5ed26de1adbc45ac6f4c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -669,11 +680,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1713650988, "lastModified": 1715551630,
"narHash": "sha256-YAbwiZkKxpbM+fdTVcXmp49XtHMDYQNng/wc9L85eZs=", "narHash": "sha256-hNuCVU96sDo1zmnt0OSLRYv56f2CrH9XrftPsK8fMWo=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "9e1bbb9813e0ea4e37f6325fe00e8f43617ef912", "rev": "c7958356bef304320d86cd541d0de8db968c6cc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -692,11 +703,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1713657840, "lastModified": 1715558773,
"narHash": "sha256-O99sOWro/5J4qWyIFZ3vEw+abLnzOv4jrfA7FaRoyrI=", "narHash": "sha256-yyKzLgpCjnY6Nns5O9M13LgNtevO5UCenQr61BO0AiI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "3ad9c1eae733e9ba5cc73c6833e3d62dbc12df9e", "rev": "2d293e623b20fc71d94c3c96d8fc47e280edd1c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -705,21 +716,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter": {
"locked": {
"lastModified": 1705332318,
"narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -727,11 +723,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713668931, "lastModified": 1715483403,
"narHash": "sha256-rVlwWQlgFGGK3aPVcKmtYqWgjYnPah5FOIsYAqrMN2w=", "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "07ece11b22217b8459df589f858e92212b74f1a1", "rev": "f9027322f48b427da23746aa359a6510dfcd0228",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -757,17 +753,16 @@
}, },
"nix-monitored": { "nix-monitored": {
"inputs": { "inputs": {
"nix-filter": "nix-filter",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1708169437, "lastModified": 1715016928,
"narHash": "sha256-qR3UF6xf+ts/lCY2UlacKtNzZq/9jxsgsdXxiQ5gcPU=", "narHash": "sha256-JZx+enK1RlsMSJGmX/KTpADtxrCPDztQRKpO22LKZZM=",
"owner": "ners", "owner": "ners",
"repo": "nix-monitored", "repo": "nix-monitored",
"rev": "382ed0cad468cb0b5426bf0905da573efa96c218", "rev": "776e497a13b8b403065d59c45a3fdc07b76a0db1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -779,16 +774,18 @@
"nix-super": { "nix-super": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_4",
"libgit2": "libgit2", "libgit2": "libgit2",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression",
"pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1713633256, "lastModified": 1713821351,
"narHash": "sha256-MKKP3oye1YlF4zq0cARo3BrYzinBaBSJzcdaTxatuew=", "narHash": "sha256-JctHGT1oa4pet4PgUKRM7pf0w+qGe0a/ahVij8bee3o=",
"owner": "privatevoid-net", "owner": "privatevoid-net",
"repo": "nix-super", "repo": "nix-super",
"rev": "1a2019bb819dde804d7aed43853e31e1a6ea6ea3", "rev": "5ecd820c18b1aaa3c8ee257a7a9a2624c4107031",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -815,20 +812,14 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "lastModified": 1714640452,
"lastModified": 1711703276, "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "type": "tarball",
"owner": "NixOS", "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
"repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github"
}, },
"original": { "original": {
"dir": "lib", "type": "tarball",
"owner": "NixOS", "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-regression": { "nixpkgs-regression": {
@ -865,11 +856,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1713254108, "lastModified": 1715499532,
"narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=", "narHash": "sha256-9UJLb8rdi2VokYcfOBQHUzP3iNxOPNWcbK++ENElpk0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00", "rev": "af8b9db5c00f1a8e4b83578acc578ff7d823b786",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -897,11 +888,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1713537308, "lastModified": 1715087517,
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -913,11 +904,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1713596654, "lastModified": 1715499532,
"narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", "narHash": "sha256-9UJLb8rdi2VokYcfOBQHUzP3iNxOPNWcbK++ENElpk0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", "rev": "af8b9db5c00f1a8e4b83578acc578ff7d823b786",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -945,11 +936,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1713627711, "lastModified": 1715499532,
"narHash": "sha256-kWlK1w/rqPBrs5rF4btRgXpzVstmNxA8rgc6kBzc89s=", "narHash": "sha256-9UJLb8rdi2VokYcfOBQHUzP3iNxOPNWcbK++ENElpk0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c97ced70e0b92d46e5e53e239fec5201f8b0811", "rev": "af8b9db5c00f1a8e4b83578acc578ff7d823b786",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -991,29 +982,29 @@
"type": "github" "type": "github"
} }
}, },
"none-ls-nvim": { "none-ls-shellcheck-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713584427, "lastModified": 1710845791,
"narHash": "sha256-tJEyILFUEdGASYkkaoUEsKcyTWU4XLHtkNF2MJstuyY=", "narHash": "sha256-t06Nu7wVEGoJtaaZh/psvuC9kdYhwh6JeOd0cg3WVHY=",
"owner": "nvimtools", "owner": "gbprod",
"repo": "none-ls.nvim", "repo": "none-ls-shellcheck.nvim",
"rev": "88821b67e6007041f43b802f58e3d9fa9bfce684", "rev": "0f84461241e76e376a95fb7391deac82dc3efdbf",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nvimtools", "owner": "gbprod",
"repo": "none-ls.nvim", "repo": "none-ls-shellcheck.nvim",
"type": "github" "type": "github"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1713683463, "lastModified": 1715588836,
"narHash": "sha256-4byae6EewzcPs1C1JGOts1PLVr+PlR7+FOOqJGNSBIQ=", "narHash": "sha256-H6dKRVSLE7rJfCFUuaSsjgJBhwKqodAK+QCdldD4gRw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "568cd159bad8d8a2e3c2f3f7b71dd27a3d553b45", "rev": "3478942a77be062c5914af2607021f8fbf3abc71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1025,11 +1016,11 @@
"nvim-lspconfig": { "nvim-lspconfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713507075, "lastModified": 1715493027,
"narHash": "sha256-/SqLT0PG2RUWyknYpcXlcU/aUyKWZMBs35s1sPRkEmc=", "narHash": "sha256-qOzuJLyJz3wiLoZ/Gy4EQvWDhVprNHID1oUbOIA4MwM=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5", "rev": "94513a5b246cf32a8f87ca714af50911df63351c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1040,11 +1031,21 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": [
"nix-super"
],
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"gitignore": "gitignore", "gitignore": [
"nixpkgs": "nixpkgs_8", "nix-super"
"nixpkgs-stable": "nixpkgs-stable" ],
"nixpkgs": [
"nix-super",
"nixpkgs"
],
"nixpkgs-stable": [
"nix-super",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1712897695, "lastModified": 1712897695,
@ -1060,14 +1061,36 @@
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks_2": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_5",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs_8",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1714478972,
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "2849da033884f54822af194400f8dff435ada242",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"river": { "river": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713527168, "lastModified": 1715523364,
"narHash": "sha256-oYVyqNfXjmR6axGyki+jZVOOHFVt1YWAX08eqxtVE6c=", "narHash": "sha256-Gzv/Gu4OwOJZAyWH3rNx+AW5hJR+5Alxss0lCP+gbQk=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "9bbd34a0e31b6d429df2d39a59d8990a9585e186", "rev": "1e3ef88bd573e4940f7e9dcffdbf119161473e4d",
"revCount": 1248, "revCount": 1254,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/riverwm/river" "url": "https://github.com/riverwm/river"
@ -1102,14 +1125,13 @@
"nix-monitored": "nix-monitored", "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-shellcheck-nvim": "none-ls-shellcheck-nvim",
"nur": "nur", "nur": "nur",
"nvim-lspconfig": "nvim-lspconfig", "nvim-lspconfig": "nvim-lspconfig",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks_2",
"river": "river", "river": "river",
"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"
} }
@ -1146,23 +1168,6 @@
"type": "github" "type": "github"
} }
}, },
"statuscol-nvim": {
"flake": false,
"locked": {
"lastModified": 1708023805,
"narHash": "sha256-I6Wefl83mcMURtJEq1yaR2thxVMfpJmjSplapeVyKYE=",
"owner": "luukvbaal",
"repo": "statuscol.nvim",
"rev": "e9e4c30b68abe456d80a0b144149ebf3f4527ed8",
"type": "github"
},
"original": {
"owner": "luukvbaal",
"ref": "0.10",
"repo": "statuscol.nvim",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -1271,11 +1276,11 @@
"telekasten-nvim": { "telekasten-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713339207, "lastModified": 1713773667,
"narHash": "sha256-eg1xJUl4a+tIyJyN+UcaK0bP1o+zEo6mARFlJcsAwM8=", "narHash": "sha256-RsxzOa9bQMKB6LRyo4Vc9hxIJGJ35NSBrLdEi2BSaBU=",
"owner": "renerocksai", "owner": "renerocksai",
"repo": "telekasten.nvim", "repo": "telekasten.nvim",
"rev": "24fd8c1e7eb989dba9efa5d174e42870f08da8fb", "rev": "319276a7853ff996b7bb1ed4250d8047c84ad29d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1359,11 +1364,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713214484, "lastModified": 1714662532,
"narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", "rev": "1f228ba2f1f254195c0b571302b37482861abee3",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
flake.nix
View File

@ -37,16 +37,14 @@
smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim"; smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
telekasten-nvim.flake = false; telekasten-nvim.flake = false;
telekasten-nvim.url = "github:renerocksai/telekasten.nvim"; telekasten-nvim.url = "github:renerocksai/telekasten.nvim";
none-ls-nvim.flake = false;
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
gen-nvim.flake = false; gen-nvim.flake = false;
gen-nvim.url = "github:David-Kunz/gen.nvim"; gen-nvim.url = "github:David-Kunz/gen.nvim";
hawtkeys-nvim.flake = false; hawtkeys-nvim.flake = false;
hawtkeys-nvim.url = "github:tris203/hawtkeys.nvim"; hawtkeys-nvim.url = "github:tris203/hawtkeys.nvim";
none-ls-shellcheck-nvim.flake = false;
none-ls-shellcheck-nvim.url = "github:gbprod/none-ls-shellcheck.nvim";
# river # river
river.url = "git+https://github.com/riverwm/river?submodules=1"; river.url = "git+https://github.com/riverwm/river?submodules=1";
@ -54,7 +52,7 @@
# Hyprland # Hyprland
hypr-contrib.url = "github:hyprwm/contrib"; hypr-contrib.url = "github:hyprwm/contrib";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland/v0.39.1";
# Laptop # Laptop
asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout"; asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
@ -67,6 +65,7 @@
outputs = inputs@{ self, flake-parts, ... }: outputs = inputs@{ self, flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } { flake-parts.lib.mkFlake { inherit inputs; } {
debug = true; # NOTE: for nixd
imports = [ imports = [
inputs.pre-commit-hooks.flakeModule inputs.pre-commit-hooks.flakeModule
inputs.devshell.flakeModule inputs.devshell.flakeModule

2
hosts/nixos-laptop/default.nix
View File

@ -21,7 +21,7 @@
impermanence.enable = true; impermanence.enable = true;
}; };
programs.hyprland.enable = true; programs.hyprland.enable = true;
# programs.river.enable = true; programs.gitbutler.enable = true;
programs.exercism.enable = true; programs.exercism.enable = true;
}; };

6
modules/profiles/desktop.nix
View File

@ -4,8 +4,8 @@
, ... , ...
}: }:
with lib;
let let
inherit (lib) mkEnableOption mkIf mkDefault;
cfg = config.my.profiles.desktop; cfg = config.my.profiles.desktop;
in in
{ {
@ -101,10 +101,6 @@ in
}) })
]; ];
nixpkgs.config.permittedInsecurePackages = [
"electron-25.9.0" # obsidian
];
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
home-manager.users.moritz = { home-manager.users.moritz = {

1
modules/profiles/impermanence.nix
View File

@ -49,6 +49,7 @@ in
".config/github-copilot" ".config/github-copilot"
".config/kdeconnect" ".config/kdeconnect"
".config/keepassxc" ".config/keepassxc"
".java/.userPrefs/jetbrains/"
".local/share/JetBrains" ".local/share/JetBrains"
".local/share/direnv" ".local/share/direnv"
".local/share/nvim" ".local/share/nvim"

24
modules/programs/gitbutler/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ config
, pkgs
, lib
, ...
}:
let
inherit (lib) mkEnableOption mkIf mkOption types;
cfg = config.my.programs.gitbutler;
in
{
options.my.programs.gitbutler = {
enable = mkEnableOption "gitbutler";
package = mkOption {
default = pkgs.callPackage ./package.nix { };
type = types.package;
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
};
}

16
modules/programs/gitbutler/package.nix Normal file
View File

@ -0,0 +1,16 @@
{ fetchzip, appimageTools }:
let
pname = "git-butler";
version = "0.12.4";
buildNum = "994";
srcZipped = fetchzip {
url = "https://releases.gitbutler.com/releases/release/${version}-${buildNum}/linux/x86_64/git-butler_${version}_amd64.AppImage.tar.gz";
hash = "sha256-+QP+H0bVSLbobv/W6lFBbl08RnwKvG8BVo68bwMrAzM=";
};
in
appimageTools.wrapType2 {
inherit pname version;
src = "${srcZipped}/git-butler_${version}_amd64.AppImage";
}

7
modules/programs/hyprland/_config.nix
View File

@ -117,6 +117,13 @@ in
force_default_wallpaper = 0 force_default_wallpaper = 0
} }
xwayland {
force_zero_scaling = true
}
# scale non native wayland gtk applications
env = GDK_SCALE,1.2
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
# Firefox Sharing Indicator # Firefox Sharing Indicator
${mkRules ["float" "move 49% 40" "noborder"] ["title:^(.*Sharing Indicator.*)$"]} ${mkRules ["float" "move 49% 40" "noborder"] ["title:^(.*Sharing Indicator.*)$"]}

1
modules/programs/jetbrains/ideavimrc
View File

@ -52,7 +52,6 @@ map gI <Action>(GotoImplementation)
"" Other "" Other
let g:WhichKeyDesc_terminal = '<leader>t Terminal' let g:WhichKeyDesc_terminal = '<leader>t Terminal'
map <leader>t <Action>(ActivateTerminalToolWindow) map <leader>t <Action>(ActivateTerminalToolWindow)
map <Esc> <Action>(HideActiveWindow)
map = <Action>(ReformatCode) map = <Action>(ReformatCode)
"" Folding "" Folding

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

@ -1,8 +1,8 @@
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, inputs, ... }:
with lib;
let let
cfg = config.my.programs.nvim; cfg = config.my.programs.nvim;
inherit (lib) mkEnableOption mkIf readFile;
in in
{ {
imports = lib.my.listModulesRec ./plugins; imports = lib.my.listModulesRec ./plugins;

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

@ -1,26 +1,28 @@
{ pkgs, lib, inputs, ... }: { pkgs, lib, inputs, ... }:
with builtins; let
inherit (builtins) readFile;
in
{ {
config.home-manager.users.moritz.programs.neovim.lazy.plugins = with pkgs.vimPlugins; [ config.home-manager.users.moritz.programs.neovim.lazy.plugins = [
{ {
plugin = oil-nvim; plugin = pkgs.vimPlugins.oil-nvim;
lazy = false; lazy = false;
opts = { }; opts = { };
dependencies = [{ plugin = nvim-web-devicons; }]; dependencies = [{ plugin = pkgs.vimPlugins.nvim-web-devicons; }];
} }
{ {
plugin = lualine-nvim; plugin = pkgs.vimPlugins.lualine-nvim;
opts = { }; opts = { };
dependencies = [{ plugin = nvim-web-devicons; }]; dependencies = [{ plugin = pkgs.vimPlugins.nvim-web-devicons; }];
} }
{ {
plugin = mini-nvim; plugin = pkgs.vimPlugins.mini-nvim;
lazy = false; lazy = false;
conf = readFile ./lua/mini-nvim.lua; conf = readFile ./lua/mini-nvim.lua;
} }
{ {
plugin = nvim-cmp; plugin = pkgs.vimPlugins.nvim-cmp;
keys = [ keys = [
{ key = "<leader>tc"; cmd = "<cmd>CmpToggle<cr>"; desc = "Toggle Cmp sources"; } { key = "<leader>tc"; cmd = "<cmd>CmpToggle<cr>"; desc = "Toggle Cmp sources"; }
]; ];
@ -28,26 +30,43 @@ with builtins;
event = [ "InsertEnter" ]; event = [ "InsertEnter" ];
dependencies = [ dependencies = [
{ {
plugin = nvim-autopairs; plugin = pkgs.vimPlugins.nvim-autopairs;
opts = { }; opts = { };
} }
{ plugin = cmp-async-path; } { plugin = pkgs.vimPlugins.cmp-async-path; }
{ plugin = cmp-buffer; } { plugin = pkgs.vimPlugins.cmp-buffer; }
{ plugin = cmp-cmdline; } { plugin = pkgs.vimPlugins.cmp-cmdline; }
{ plugin = cmp-nvim-lsp; } { plugin = pkgs.vimPlugins.cmp-nvim-lsp; }
{ plugin = cmp_luasnip; } { plugin = pkgs.vimPlugins.cmp_luasnip; }
{ plugin = cmp-spell; } { plugin = pkgs.vimPlugins.cmp-spell; }
{ plugin = cmp-nvim-lsp-signature-help; } { plugin = pkgs.vimPlugins.cmp-nvim-lsp-signature-help; }
{ plugin = friendly-snippets; }
{ plugin = lspkind-nvim; }
{ {
plugin = luasnip; plugin = pkgs.vimPlugins.copilot-cmp;
opts = { };
dependencies = [
{
plugin = pkgs.vimPlugins.copilot-lua;
opts = {
suggestion = { enabled = false; };
panel = { enabled = false; };
};
conf = /* lua */ ''
require("copilot").setup(opts)
vim.cmd("Copilot disable")
'';
}
];
}
{ plugin = pkgs.vimPlugins.friendly-snippets; }
{ plugin = pkgs.vimPlugins.lspkind-nvim; }
{
plugin = pkgs.vimPlugins.luasnip;
conf = readFile ./lua/luasnip.lua; conf = readFile ./lua/luasnip.lua;
} }
]; ];
} }
{ {
plugin = direnv-vim; plugin = pkgs.vimPlugins.direnv-vim;
lazy = false; lazy = false;
} }
{ {
@ -60,25 +79,26 @@ with builtins;
dependencies = [ dependencies = [
{ {
# TODO: add all required tools to neovim or silence warnings # TODO: add all required tools to neovim or silence warnings
plugin = pkgs.vimPlugins.null-ls-nvim.overrideAttrs (_: { plugin = pkgs.vimPlugins.none-ls-nvim;
version = lib.my.mkVersionInput inputs.none-ls-nvim;
src = inputs.none-ls-nvim;
});
conf = readFile ./lua/null-ls-nvim.lua; conf = readFile ./lua/null-ls-nvim.lua;
dependencies = [ dependencies = [
{ plugin = which-key-nvim; } {
{ plugin = plenary-nvim; } plugin = pkgs.vimUtils.buildVimPlugin {
pname = "none-ls-shellcheck.nvim";
version = lib.my.mkVersionInput inputs.none-ls-shellcheck-nvim;
src = inputs.none-ls-shellcheck-nvim;
};
}
]; ];
} }
{ plugin = which-key-nvim; } { plugin = pkgs.vimPlugins.lsp_lines-nvim; }
{ plugin = lsp_lines-nvim; }
{ {
plugin = inc-rename-nvim; plugin = pkgs.vimPlugins.inc-rename-nvim;
opts = { opts = {
input_buffer_type = "dressing"; input_buffer_type = "dressing";
}; };
dependencies = [ dependencies = [
{ plugin = dressing-nvim; } { plugin = pkgs.vimPlugins.dressing-nvim; }
]; ];
} }
{ {
@ -91,7 +111,7 @@ with builtins;
]; ];
} }
{ {
plugin = vim-fugitive; plugin = pkgs.vimPlugins.vim-fugitive;
cmd = [ cmd = [
"G" "G"
"Git" "Git"
@ -122,11 +142,11 @@ with builtins;
]; ];
} }
{ {
plugin = vim-tmux-navigator; plugin = pkgs.vimPlugins.vim-tmux-navigator;
event = [ "VeryLazy" ]; event = [ "VeryLazy" ];
} }
{ {
plugin = nvim-lastplace; plugin = pkgs.vimPlugins.nvim-lastplace;
event = [ "BufReadPost" "BufNewFile" ]; event = [ "BufReadPost" "BufNewFile" ];
opts = { opts = {
lastplace_ignore_buftype = [ "quickfix" "nofile" "help" ]; lastplace_ignore_buftype = [ "quickfix" "nofile" "help" ];
@ -135,7 +155,7 @@ with builtins;
}; };
} }
{ {
plugin = telescope-nvim; plugin = pkgs.vimPlugins.telescope-nvim;
cmd = [ "Telescope" ]; cmd = [ "Telescope" ];
conf = builtins.readFile ./lua/telescope.lua; conf = builtins.readFile ./lua/telescope.lua;
keys = [ keys = [
@ -159,31 +179,31 @@ with builtins;
{ key = "<leader>fr"; cmd = "<cmd>Telescope oldfiles<cr>"; desc = "Recent files"; } { key = "<leader>fr"; cmd = "<cmd>Telescope oldfiles<cr>"; desc = "Recent files"; }
]; ];
dependencies = [ dependencies = [
{ plugin = plenary-nvim; } { plugin = pkgs.vimPlugins.plenary-nvim; }
{ plugin = telescope-fzf-native-nvim; } { plugin = pkgs.vimPlugins.telescope-fzf-native-nvim; }
]; ];
} }
{ {
plugin = vim-startuptime; plugin = pkgs.vimPlugins.vim-startuptime;
cmd = [ "StartupTime" ]; cmd = [ "StartupTime" ];
conf = readFile ./lua/vim-startuptime.lua; conf = readFile ./lua/vim-startuptime.lua;
} }
{ {
plugin = typst-vim; plugin = pkgs.vimPlugins.typst-vim;
ft = [ "typst" "typ" ]; ft = [ "typst" "typ" ];
} }
{ {
plugin = comment-nvim; plugin = pkgs.vimPlugins.comment-nvim;
event = [ "BufReadPost" "BufNewFile" ]; event = [ "BufReadPost" "BufNewFile" ];
opts = { }; opts = { };
} }
{ {
plugin = nvim-surround; plugin = pkgs.vimPlugins.nvim-surround;
event = [ "BufReadPost" "BufNewFile" ]; event = [ "BufReadPost" "BufNewFile" ];
opts = { }; opts = { };
} }
{ {
plugin = conform-nvim; plugin = pkgs.vimPlugins.conform-nvim;
keys = [ keys = [
{ key = "="; cmd = "<cmd>lua require('conform').format()<cr>"; desc = "format buffer"; mode = [ "n" "v" ]; } { key = "="; cmd = "<cmd>lua require('conform').format()<cr>"; desc = "format buffer"; mode = [ "n" "v" ]; }
]; ];

4
modules/programs/nvim/plugins/lua/null-ls-nvim.lua
View File

@ -3,14 +3,14 @@ local null_ls = require("null-ls")
null_ls.setup({ null_ls.setup({
sources = { sources = {
-- Code actions -- Code actions
null_ls.builtins.code_actions.shellcheck, require("none-ls-shellcheck.code_actions"),
null_ls.builtins.code_actions.statix, null_ls.builtins.code_actions.statix,
-- Diagnostics -- Diagnostics
null_ls.builtins.diagnostics.checkmake, null_ls.builtins.diagnostics.checkmake,
null_ls.builtins.diagnostics.deadnix, null_ls.builtins.diagnostics.deadnix,
null_ls.builtins.diagnostics.dotenv_linter, null_ls.builtins.diagnostics.dotenv_linter,
null_ls.builtins.diagnostics.fish, null_ls.builtins.diagnostics.fish,
null_ls.builtins.diagnostics.shellcheck, require("none-ls-shellcheck.diagnostics"),
null_ls.builtins.diagnostics.statix, null_ls.builtins.diagnostics.statix,
null_ls.builtins.diagnostics.trail_space, null_ls.builtins.diagnostics.trail_space,
null_ls.builtins.diagnostics.yamllint, null_ls.builtins.diagnostics.yamllint,

18
modules/programs/nvim/plugins/lua/nvim-cmp.lua
View File

@ -8,6 +8,9 @@ cmp.setup({
mode = "symbol", -- show only symbol annotations mode = "symbol", -- show only symbol annotations
maxwidth = 50, -- prevent the popup from showing more than provided characters maxwidth = 50, -- prevent the popup from showing more than provided characters
ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead
symbol_map = {
Copilot = "",
},
}), }),
}, },
enabled = function() enabled = function()
@ -59,14 +62,13 @@ cmp.setup({
end, { "i", "s" }), end, { "i", "s" }),
}), }),
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = "async_path", priority = 1 }, { priority = 1, name = "async_path" },
{ name = "nvim_lsp", priority = 2 }, { priority = 1, name = "buffer" },
{ name = "nvim_lsp_signature_help", priority = 3 }, { priority = 1, name = "spell" },
{ name = "luasnip", priority = 4 }, { priority = 2, name = "nvim_lsp" },
}, { { priority = 3, name = "copilot" },
{ name = "async_path" }, { priority = 3, name = "nvim_lsp_signature_help" },
{ name = "buffer" }, { priority = 4, name = "luasnip" },
{ name = "spell" },
}), }),
}) })

22
modules/programs/nvim/plugins/lua/nvim-lspconfig.lua
View File

@ -124,7 +124,6 @@ local servers = {
"gleam", "gleam",
"gopls", "gopls",
"nil_ls", "nil_ls",
"nixd",
"pylsp", "pylsp",
"ruff_lsp", "ruff_lsp",
"templ", "templ",
@ -134,6 +133,27 @@ for _, lsp in ipairs(servers) do
lspconfig_setup(lsp, {}) lspconfig_setup(lsp, {})
end end
lspconfig_setup("nixd", {
settings = {
nixd = {
nixpkgs = {
expr = "import <nixpkgs> { }",
},
options = {
nixos = {
expr = '(builtins.getFlake ("git+file://" + toString ./.)).nixosConfigurations.nixos-desktop.options',
},
["flake-parts"] = {
expr = '(builtins.getFlake ("git+file://" + toString ./.)).debug.options',
},
["flake-parts2"] = {
expr = '(builtins.getFlake ("git+file://" + toString ./.)).currentSystem.options',
},
},
},
},
})
-- Add templ filetype -- Add templ filetype
vim.filetype.add({ extension = { templ = "templ" } }) vim.filetype.add({ extension = { templ = "templ" } })

22
modules/programs/nvim/plugins/lua/statuscol-nvim.lua
View File

@ -1,22 +0,0 @@
vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
local builtin = require("statuscol.builtin")
require("statuscol").setup({
segments = {
{
sign = { name = { ".*" }, auto = true },
click = "v:lua.ScSa",
},
{
text = { builtin.lnumfunc },
click = "v:lua.ScLa",
},
{
sign = { namespace = { "gitsigns*" }, auto = true },
click = "v:lua.ScSa",
},
{
text = { builtin.foldfunc, " " },
click = "v:lua.ScFa",
},
},
})

10
modules/programs/python.nix
View File

@ -4,8 +4,10 @@
, ... , ...
}: }:
with lib;
let let
inherit (lib) range filterAttrs attrNames foldl' head tail mkOption mkEnableOption intersectLists genAttrs flip getAttr;
inherit (lib.types) listOf enum package;
cfg = config.my.programs.python; cfg = config.my.programs.python;
pythonVersions = map (version: "3${toString version}") (range 8 11); pythonVersions = map (version: "3${toString version}") (range 8 11);
@ -23,7 +25,7 @@ let
enable = mkEnableOption (toString version); enable = mkEnableOption (toString version);
pythonPackages = mkOption { pythonPackages = mkOption {
default = [ ]; default = [ ];
type = with types; listOf (enum (pythonPackages version)); type = listOf (enum (pythonPackages version));
}; };
}; };
in in
@ -32,11 +34,11 @@ in
versions = genAttrs pythonVersions versionOpts; versions = genAttrs pythonVersions versionOpts;
defaultPackages = mkOption { defaultPackages = mkOption {
default = [ ]; default = [ ];
type = with types; listOf (enum commonPackages); type = listOf (enum commonPackages);
}; };
extraPackages = mkOption { extraPackages = mkOption {
default = [ ]; default = [ ];
type = with types; listOf package; type = listOf package;
}; };
}; };