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

Merge remote-tracking branch 'origin/nixos' into nixos-work

Browse source
This commit is contained in:
Moritz Böhme 2023-04-12 10:15:01 +02:00
commit d224549e56
69 changed files with 622 additions and 719 deletions
Download patch file Download diff file Expand all files Collapse all files

409
flake.lock generated
View file

@ -1,21 +1,5 @@
{ {
"nodes": { "nodes": {
"advanced-git-search-nvim": {
"flake": false,
"locked": {
"lastModified": 1680558870,
"narHash": "sha256-p2G5VWTTlS1VhygwekuZoZ45s/vv+tHYYw8oA7NXpcw=",
"owner": "aaronhallaert",
"repo": "advanced-git-search.nvim",
"rev": "500be1a583dfac0f7d715107fe29dac18b77ff49",
"type": "github"
},
"original": {
"owner": "aaronhallaert",
"repo": "advanced-git-search.nvim",
"type": "github"
}
},
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
@ -85,11 +69,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1679445945, "lastModified": 1680646146,
"narHash": "sha256-UadTIRRA/okmLmdM+OzhCwSoovr72Pq0+3Tt7CAyYcg=", "narHash": "sha256-NH+EhLFYDwLQ01BqfTwGvZAjfmZynnP1xxPjqH0XJss=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "4d92e69fc1b279676f997e6b99d2cacc4d0a3e87", "rev": "efa15b9788add910f6e8409dddfb7bb69c2ad201",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -182,47 +166,6 @@
"type": "github" "type": "github"
} }
}, },
"emacs": {
"inputs": {
"emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1676394233,
"narHash": "sha256-RHO/MgRyFqgmIgogrL5LBmBhAt8hTpUJJ6Dww46GyZI=",
"ref": "main",
"rev": "6fb9f917901160b2b212f420a8a8e4995c823626",
"revCount": 98,
"type": "git",
"url": "ssh://git@gitea.moritzboeh.me/moritz/emacs.git"
},
"original": {
"ref": "main",
"type": "git",
"url": "ssh://git@gitea.moritzboeh.me/moritz/emacs.git"
}
},
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1676025076,
"narHash": "sha256-sdYhoZsLLwRXZebP6DYfIgQRjFA+itdNXaPuCWfJYkk=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "581072bb0d49768da9370056f7b6e7b761b5d8be",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -255,29 +198,16 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1681037374,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "033b9f258ca96a10e543d4442071f614dc3f8412",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -302,51 +232,6 @@
} }
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"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_6": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -364,7 +249,6 @@
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"emacs",
"pre-commit-hooks", "pre-commit-hooks",
"nixpkgs" "nixpkgs"
] ]
@ -383,24 +267,19 @@
"type": "github" "type": "github"
} }
}, },
"gitignore_2": { "gitignore-nvim": {
"inputs": { "flake": false,
"nixpkgs": [
"pre-commit-hooks",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1660459072, "lastModified": 1680653909,
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", "narHash": "sha256-H6IXZTskIAOmp3U57NIT4Of45xXqrX/6VRm1s28S89Y=",
"owner": "hercules-ci", "owner": "wintermute-cell",
"repo": "gitignore.nix", "repo": "gitignore.nvim",
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", "rev": "b61e4a50b78f9a3702a4ed168ab6c9ceba5f6299",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hercules-ci", "owner": "wintermute-cell",
"repo": "gitignore.nix", "repo": "gitignore.nvim",
"type": "github" "type": "github"
} }
}, },
@ -414,11 +293,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680597706, "lastModified": 1680667162,
"narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=", "narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a", "rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -427,31 +306,9 @@
"type": "github" "type": "github"
} }
}, },
"howdy": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
],
"pre-commit-hooks": "pre-commit-hooks_2"
},
"locked": {
"lastModified": 1665343480,
"narHash": "sha256-mMaZFrDDiBcHDe8+lA87P3iMPea+RGfik5/E4Dyzk8U=",
"owner": "~moritzboehme",
"repo": "howdy",
"rev": "24a7cfb8c2fef1873275dbdf7c8ad562c22083de",
"type": "sourcehut"
},
"original": {
"owner": "~moritzboehme",
"repo": "howdy",
"type": "sourcehut"
}
},
"hypr-contrib": { "hypr-contrib": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1679036674, "lastModified": 1679036674,
@ -470,16 +327,16 @@
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_2",
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1680616746, "lastModified": 1681066980,
"narHash": "sha256-y+0NkdRSmZonUhBsvPG+9BCOfIgZzGXxLfAuzo/3ULU=", "narHash": "sha256-68e+4txZITxbHP9IPYfLm36kOoI+rkMjRCbrPgtdQK8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "6519c0308c4dd6ab484c7854e1eca2dc8f400485", "rev": "f3909cf2bfdd72aff69112f18c920ac6c9ca28f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -496,11 +353,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1671839510, "lastModified": 1681065697,
"narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -511,14 +368,14 @@
}, },
"hyprpaper": { "hyprpaper": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1680428635, "lastModified": 1681080114,
"narHash": "sha256-/Kz4Qy+jx1+bfSq6e2W3MbyODkhs6GqKiiybNtqzvbc=", "narHash": "sha256-rAKfgQJQRsw4QMOXdxfHIh/d5LPY6HHKBX1KtaPs2No=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "db56f164dd4d6bba8f606fd49885cdbe9803fe9b", "rev": "4bcedde1dc1a06107ec32c93a937de30f40aa1fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -530,11 +387,11 @@
"lspsaga-nvim": { "lspsaga-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1680586822, "lastModified": 1681041449,
"narHash": "sha256-396xNjMoMvfpHGqu27JuTTafKepWGkHG29TjV8taHZY=", "narHash": "sha256-ARbFiwfWsYapFH5p7xSCCe25RFUlUI/h8Jv81XHLBx4=",
"owner": "glepnir", "owner": "glepnir",
"repo": "lspsaga.nvim", "repo": "lspsaga.nvim",
"rev": "fb476086012e18e0001c3dcc5b18fd34a847e5fe", "rev": "1fbb3e4721354d0d0a20a28bb77b3f83fe68538b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -545,11 +402,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1680625698, "lastModified": 1681080342,
"narHash": "sha256-GLsNwSn8OqtE5qaw5viQR+iF3YSoS4dA4PIA+5nI7kg=", "narHash": "sha256-7GvJEuGANq9/zk549rf5zoeTyFdsw5irvVLf5crpBnE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5c54bec2de3a5cf005be903a5f3e33d0c9988c35", "rev": "340acec509d71d0d0decd7a82e7cb52ae4c76065",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -560,8 +417,8 @@
}, },
"neovim": { "neovim": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
@ -606,11 +463,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1673540789, "lastModified": 1658161305,
"narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", "rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -621,22 +478,6 @@
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": {
"lastModified": 1673800717,
"narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1678872516, "lastModified": 1678872516,
"narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
@ -654,53 +495,21 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1675758091, "lastModified": 1680669251,
"narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": {
"lastModified": 1658161305,
"narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1680487167,
"narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "53dad94e874c9586e71decf82d972dfb640ef044",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1674641431, "lastModified": 1674641431,
"narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
@ -716,7 +525,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1671983799, "lastModified": 1671983799,
"narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=",
@ -732,13 +541,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1680577567, "lastModified": 1681028957,
"narHash": "sha256-Y4W57i0TzczqwMTjfVSbAZT5RJx7u+mpQIW/ofrkTQs=", "narHash": "sha256-gKWkKT/nFg2d9HZyK7VAjRzkyPfKLx+uIGyWXDw0NB0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b01f185e4866de7c5b5a82f833ca9ea3c3f72fc4", "rev": "11c129c16f4051ad215ea7b0d297a6c7cf5d24d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -748,7 +557,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1678898370, "lastModified": 1678898370,
"narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
@ -783,70 +592,17 @@
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": [ "flake-utils": "flake-utils_3",
"emacs",
"flake-utils"
],
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": "nixpkgs_6",
"emacs",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1675688762, "lastModified": 1680981441,
"narHash": "sha256-oit/SxMk0B380ASuztBGQLe8TttO1GJiXF8aZY9AYEc=", "narHash": "sha256-Tqr2mCVssUVp1ZXXMpgYs9+ZonaWrZGPGltJz94FYi4=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "ab608394886fb04b8a5df3cb0bab2598400e3634", "rev": "2144d9ddcb550d6dce64a2b44facdc8c5ea2e28a",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"pre-commit-hooks_2": {
"inputs": {
"flake-utils": [
"howdy",
"flake-utils"
],
"nixpkgs": [
"howdy",
"nixpkgs"
]
},
"locked": {
"lastModified": 1664708386,
"narHash": "sha256-aCD8UUGNYb5nYzRmtsq/0yP9gFOQQHr/Lsb5vW+mucw=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "2e4a708918e14fdbd534cc94aaa9470cd19b2464",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"pre-commit-hooks_3": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_6",
"gitignore": "gitignore_2",
"nixpkgs": "nixpkgs_8",
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1680599552,
"narHash": "sha256-rQQJFGvWQ3Sr+m/r5KGIFN0iVaVKr6u9uraCz6jSKj4=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "3342d7c51119030490fdcd07351b53b10806891c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -857,17 +613,15 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"advanced-git-search-nvim": "advanced-git-search-nvim",
"agenix": "agenix", "agenix": "agenix",
"arkenfox-userjs": "arkenfox-userjs", "arkenfox-userjs": "arkenfox-userjs",
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver", "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
"attic": "attic", "attic": "attic",
"comment-box-nvim": "comment-box-nvim", "comment-box-nvim": "comment-box-nvim",
"copilot-lua": "copilot-lua", "copilot-lua": "copilot-lua",
"emacs": "emacs", "flake-utils": "flake-utils",
"flake-utils": "flake-utils_3", "gitignore-nvim": "gitignore-nvim",
"home-manager": "home-manager", "home-manager": "home-manager",
"howdy": "howdy",
"hypr-contrib": "hypr-contrib", "hypr-contrib": "hypr-contrib",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
@ -875,9 +629,9 @@
"master": "master", "master": "master",
"neovim": "neovim", "neovim": "neovim",
"nil": "nil", "nil": "nil",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_5",
"nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects", "nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects",
"pre-commit-hooks": "pre-commit-hooks_3", "pre-commit-hooks": "pre-commit-hooks",
"smartcolumn-nvim": "smartcolumn-nvim", "smartcolumn-nvim": "smartcolumn-nvim",
"stable": "stable", "stable": "stable",
"utils": "utils" "utils": "utils"
@ -953,11 +707,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1680498889, "lastModified": 1680865339,
"narHash": "sha256-4nGFBm+oILOO6DPoKTPxVlfkZSxCOY4W25zSRHESK48=", "narHash": "sha256-H6rmJ1CyJ3Q5ZyoLMYq/UEYMS9Q1orJjRpWiQ47HudE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "799d153e4f316143a9db0eb869ecf44d8d4c0356", "rev": "0040164e473509b4aee6aedb3b923e400d6df10b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -967,6 +721,21 @@
"type": "github" "type": "github"
} }
}, },
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -991,11 +760,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1680044309, "lastModified": 1680810405,
"narHash": "sha256-OojM0I5vpipp4HDxx8TVrW+ASt3KNBRBeyXl3BzyKTo=", "narHash": "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "89dcecba39d4f49b673f2fa976354c91413a4c3f", "rev": "7abda952d0000b72d240fe1d41457b9288f0b6e5",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -1017,11 +786,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673116118, "lastModified": 1681066882,
"narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", "narHash": "sha256-8szxuwDOQcYyS8TZokGpIJYzaTwBQ9pmmcCkeuX2YV8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", "rev": "e48165c5637260cf2a88494a112269922dee58de",
"type": "github" "type": "github"
}, },
"original": { "original": {

93
flake.nix
View file

@ -7,67 +7,66 @@
╚══════════════════════════════════════════════════════════╝ ╚══════════════════════════════════════════════════════════╝
*/ */
inputs = { inputs = {
# Nix
master.url = "github:nixos/nixpkgs"; master.url = "github:nixos/nixpkgs";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
stable.url = "github:nixos/nixpkgs/nixos-22.11"; stable.url = "github:nixos/nixpkgs/nixos-22.11";
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
utils.inputs.flake-utils.follows = "flake-utils"; utils.inputs.flake-utils.follows = "flake-utils";
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.nixpkgs.follows = "nixpkgs";
agenix.url = "github:ryantm/agenix";
attic.inputs.flake-utils.follows = "flake-utils";
attic.inputs.nixpkgs-stable.follows = "stable";
attic.inputs.nixpkgs.follows = "nixpkgs";
attic.url = "github:zhaofengli/attic";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.inputs.utils.follows = "flake-utils"; home-manager.inputs.utils.follows = "flake-utils";
home-manager.url = "github:nix-community/home-manager";
nil.inputs.flake-utils.follows = "flake-utils";
nil.inputs.nixpkgs.follows = "nixpkgs";
nil.url = "github:oxalica/nil";
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
# Neovim
neovim.url = "github:neovim/neovim/83bfd94d1df5eecb8e4069a227c7d24598636d63?dir=contrib"; # HACK to fix neovim not building at the moment
comment-box-nvim.flake = false;
comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim";
copilot-lua.flake = false;
copilot-lua.url = "github:zbirenbaum/copilot.lua";
gitignore-nvim.flake = false;
gitignore-nvim.url = "github:wintermute-cell/gitignore.nvim";
lspsaga-nvim.flake = false;
lspsaga-nvim.url = "github:glepnir/lspsaga.nvim";
nvim-treesitter-textsubjects.flake = false;
nvim-treesitter-textsubjects.url = "github:RRethy/nvim-treesitter-textsubjects";
smartcolumn-nvim.flake = false;
smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
# Hyprland
hypr-contrib.url = "github:hyprwm/contrib";
hyprland.url = "github:hyprwm/Hyprland";
hyprpaper.url = "github:hyprwm/hyprpaper";
# 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";
asus-touchpad-numpad-driver.flake = false; asus-touchpad-numpad-driver.flake = false;
# Firefox user.js
arkenfox-userjs.url = "github:arkenfox/user.js"; arkenfox-userjs.url = "github:arkenfox/user.js";
arkenfox-userjs.flake = false; arkenfox-userjs.flake = false;
howdy.url = "sourcehut:~moritzboehme/howdy";
howdy.inputs.nixpkgs.follows = "nixpkgs";
emacs.url = "git+ssh://git@gitea.moritzboeh.me/moritz/emacs.git?ref=main";
neovim.url = "github:neovim/neovim/83bfd94d1df5eecb8e4069a227c7d24598636d63?dir=contrib"; # HACK to fix neovim not building at the moment
nil.url = "github:oxalica/nil";
nil.inputs.nixpkgs.follows = "nixpkgs";
nil.inputs.flake-utils.follows = "flake-utils";
hyprland.url = "github:hyprwm/Hyprland";
hyprpaper.url = "github:hyprwm/hyprpaper";
hypr-contrib.url = "github:hyprwm/contrib";
nvim-treesitter-textsubjects.url = "github:RRethy/nvim-treesitter-textsubjects";
nvim-treesitter-textsubjects.flake = false;
smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
smartcolumn-nvim.flake = false;
copilot-lua.url = "github:zbirenbaum/copilot.lua";
copilot-lua.flake = false;
lspsaga-nvim.url = "github:glepnir/lspsaga.nvim";
lspsaga-nvim.flake = false;
advanced-git-search-nvim.url = "github:aaronhallaert/advanced-git-search.nvim";
advanced-git-search-nvim.flake = false;
comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim";
comment-box-nvim.flake = false;
attic.url = "github:zhaofengli/attic";
attic.inputs.nixpkgs.follows = "nixpkgs";
attic.inputs.nixpkgs-stable.follows = "stable";
attic.inputs.flake-utils.follows = "flake-utils";
}; };
/* /*
@ -85,7 +84,7 @@
channelsConfig.allowUnfree = true; channelsConfig.allowUnfree = true;
lib = nixpkgs.lib.extend lib = nixpkgs.lib.extend
(self: super: { my = import ./lib { lib = self; }; }); (self: _: { my = import ./lib { lib = self; }; });
/* /*
╔══════════════════════════════════════════════════════════╗ ╔══════════════════════════════════════════════════════════╗
@ -97,9 +96,7 @@
inherit (self) lib; inherit (self) lib;
}; };
channels.nixpkgs.overlaysBuilder = channels: [ channels.nixpkgs.overlaysBuilder = _: [
inputs.emacs.overlays.default
inputs.howdy.overlays.default
inputs.hypr-contrib.overlays.default inputs.hypr-contrib.overlays.default
inputs.hyprland.overlays.default inputs.hyprland.overlays.default
inputs.utils.overlay inputs.utils.overlay
@ -135,9 +132,7 @@
extraSpecialArgs = { inherit inputs self; }; extraSpecialArgs = { inherit inputs self; };
}; };
} }
inputs.hyprland.nixosModules.default
inputs.agenix.nixosModules.age inputs.agenix.nixosModules.age
inputs.howdy.nixosModules.default
]; ];

9
hosts/nixos-desktop/default.nix
View file

@ -1,12 +1,11 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ lib { pkgs
, config
, pkgs
, inputs
, ... , ...
}: { }:
{
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix

1
hosts/nixos-desktop/hardware-configuration.nix
View file

@ -3,7 +3,6 @@
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config { config
, lib , lib
, pkgs
, modulesPath , modulesPath
, ... , ...
}: { }: {

8
hosts/nixos-laptop/default.nix
View file

@ -1,8 +1,7 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config { pkgs
, pkgs
, inputs , inputs
, ... , ...
}: { }: {
@ -11,11 +10,6 @@
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
# services.howdy = {
# enable = true;
# certainty = 3.0;
# };
# BOOT # BOOT
boot = { boot = {
supportedFilesystems = [ "btrfs" ]; supportedFilesystems = [ "btrfs" ];

5
hosts/nixos-laptop/hardware-configuration.nix
View file

@ -1,10 +1,7 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config { modulesPath
, lib
, pkgs
, modulesPath
, ... , ...
}: { }: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

8
lib/default.nix
View file

@ -1,6 +1,6 @@
{ lib, ... }: { lib, ... }:
lib.makeExtensible (self: rec { lib.makeExtensible (_: rec {
mkDate = longDate: lib.concatStringsSep "-" [ mkDate = longDate: lib.concatStringsSep "-" [
(builtins.substring 0 4 longDate) (builtins.substring 0 4 longDate)
(builtins.substring 4 2 longDate) (builtins.substring 4 2 longDate)
@ -16,7 +16,7 @@ lib.makeExtensible (self: rec {
mapModules = f: dir: mapModules = f: dir:
let let
filter = name: type: filterModules = name: type:
let let
isPublic = !(lib.hasPrefix "_" name); isPublic = !(lib.hasPrefix "_" name);
isSomething = type != null; isSomething = type != null;
@ -30,6 +30,8 @@ lib.makeExtensible (self: rec {
in in
isPublic && isSomething && isModule; isPublic && isSomething && isModule;
modulesInDir = lib.filterAttrs filterModules (builtins.readDir dir);
mkModule = name: _: mkModule = name: _:
let let
path = "${toString dir}/${name}"; path = "${toString dir}/${name}";
@ -40,7 +42,7 @@ lib.makeExtensible (self: rec {
in in
lib.nameValuePair normalizedName (f path); lib.nameValuePair normalizedName (f path);
in in
lib.mapAttrs' mkModule (lib.filterAttrs filter (builtins.readDir dir)); lib.mapAttrs' mkModule modulesInDir;
mapModules' = f: dir: lib.attrValues (mapModules f dir); mapModules' = f: dir: lib.attrValues (mapModules f dir);
}) })

6
modules/config/default.nix
View file

@ -1,9 +1,3 @@
{ config
, lib
, pkgs
, ...
}:
{ {
imports = [ imports = [
./bin ./bin

1
modules/config/nix.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, inputs , inputs
, ... , ...
}: }:

7
modules/config/shell.nix
View file

@ -1,13 +1,8 @@
{ config { lib
, lib
, pkgs
, ... , ...
}: }:
with lib; with lib;
let
cfg = config.my.shell;
in
{ {
options.my.shell = { options.my.shell = {
abbreviations = mkOption { abbreviations = mkOption {

7
modules/config/theming/catppuccin.nix
View file

@ -1,6 +1,4 @@
{ config { config
, lib
, pkgs
, rosewater , rosewater
, flamingo , flamingo
, pink , pink
@ -27,12 +25,9 @@
, base , base
, mantle , mantle
, crust , crust
, ...
}: }:
with lib;
let
cfg = config.my.theming;
in
{ {
home-manager.users.moritz = { home-manager.users.moritz = {
programs = { programs = {

1
modules/config/theming/default.nix
View file

@ -1,7 +1,6 @@
{ config { config
, lib , lib
, pkgs , pkgs
, inputs
, ... , ...
}: }:

5
modules/config/theming/dracula.nix
View file

@ -1,4 +1,7 @@
{ config, lib, pkgs, ... }: { config
, lib
, ...
}:
with lib; with lib;
let let

1
modules/config/wallpapers.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

6
modules/default.nix
View file

@ -1,9 +1,3 @@
{ config
, lib
, pkgs
, ...
}:
{ {
imports = [ imports = [
./config ./config

5
modules/profiles/desktop.nix
View file

@ -1,5 +1,4 @@
{ config { lib
, lib
, pkgs , pkgs
, ... , ...
}: }:
@ -97,7 +96,7 @@ with lib; {
mullvad.enable = true; mullvad.enable = true;
openconnect.enable = true; openconnect.enable = true;
printing.enable = true; printing.enable = true;
redshift.enable = true; gammastep.enable = true;
wireguard.enable = true; wireguard.enable = true;
}; };
}; };

4
modules/profiles/gaming.nix
View file

@ -1,6 +1,4 @@
{ config { pkgs
, lib
, pkgs
, ... , ...
}: { }: {
programs.steam.enable = true; programs.steam.enable = true;

2
modules/profiles/work.nix
View file

@ -47,7 +47,7 @@ with lib; {
services = { services = {
kdeconnect.enable = true; kdeconnect.enable = true;
printing.enable = true; printing.enable = true;
redshift.enable = true; gammastep.enable = true;
}; };
}; };

1
modules/programs/adb.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

8
modules/programs/default.nix
View file

@ -1,16 +1,9 @@
{ config
, lib
, pkgs
, ...
}:
{ {
imports = [ imports = [
./adb.nix ./adb.nix
./bspwm ./bspwm
./code.nix ./code.nix
./direnv.nix ./direnv.nix
./emacs.nix
./firefox.nix ./firefox.nix
./fish.nix ./fish.nix
./git.nix ./git.nix
@ -31,7 +24,6 @@
./sway.nix ./sway.nix
./thunar.nix ./thunar.nix
./nvim ./nvim
./xmonad
./zathura.nix ./zathura.nix
./zsh.nix ./zsh.nix
]; ];

1
modules/programs/direnv.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

33
modules/programs/emacs.nix
View file

@ -1,33 +0,0 @@
{ config
, lib
, pkgs
, inputs
, ...
}:
with lib;
let
cfg = config.my.programs.emacs;
myEmacs = pkgs.emacsPgtkWithPackages;
in
{
options.my.programs.emacs.enable = mkEnableOption "emacs";
config = mkIf cfg.enable {
my.shell.aliases = {
emacs = "emacsclient -nw -a 'emacs -nw'";
};
fonts.fonts = with pkgs; [
emacs-all-the-icons-fonts
(iosevka-bin.override { variant = "aile"; })
];
users.users.moritz.packages = [ myEmacs ];
home-manager.users.moritz = {
home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ];
services.emacs = {
enable = true;
package = myEmacs;
};
};
};
}

1
modules/programs/firefox.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, inputs , inputs
, ... , ...
}: }:

1
modules/programs/fish.nix
View file

@ -1,7 +1,6 @@
{ config { config
, lib , lib
, pkgs , pkgs
, inputs
, ... , ...
}: }:

1
modules/programs/git.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

1
modules/programs/gpg.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

1
modules/programs/helix.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

1
modules/programs/hub.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

2
modules/programs/hyprland/config.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:
@ -161,7 +160,6 @@ in
bind = $mainMod , B , exec , rofi-bluetooth bind = $mainMod , B , exec , rofi-bluetooth
bind = $mainMod , C , exec , rofi -show calc -modi calc -no-show-match -no-sort | wl-copy bind = $mainMod , C , exec , rofi -show calc -modi calc -no-show-match -no-sort | wl-copy
bind = $mainMod , D , exec , hyprctl keyword general:layout dwindle bind = $mainMod , D , exec , hyprctl keyword general:layout dwindle
bind = $mainMod , E , exec , emacsclient -c -a emacs
bind = $mainMod , M , exec , hyprctl keyword general:layout master bind = $mainMod , M , exec , hyprctl keyword general:layout master
bind = $mainMod , R , exec , rofi -show combi bind = $mainMod , R , exec , rofi -show combi
bind = $mainMod , RETURN , exec , kitty bind = $mainMod , RETURN , exec , kitty

7
modules/programs/hyprland/default.nix
View file

@ -36,13 +36,6 @@ in
services.dunst.enable = true; services.dunst.enable = true;
}; };
# enable nix module
programs.hyprland = {
enable = true;
package = null; # because we use the home-manager module
};
# enable home-manager module # enable home-manager module
home-manager.users.moritz = { home-manager.users.moritz = {
# import home-manager module # import home-manager module

1
modules/programs/kakoune.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

1
modules/programs/kitty.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

2
modules/programs/ledger/default.nix
View file

@ -18,7 +18,7 @@ in
}; };
aliases = aliases =
let let
applyCommon = name: command: "${command} --payee note --strict --explicit"; applyCommon = _: command: "${command} --payee note --strict --explicit";
in in
mapAttrs applyCommon { mapAttrs applyCommon {
bal = "ledger bal"; bal = "ledger bal";

5
modules/programs/nvim/default.nix
View file

@ -49,14 +49,17 @@ in
extraPackages = with pkgs; [ extraPackages = with pkgs; [
alejandra alejandra
black black
deadnix
isort isort
jq jq
nil nil
nixpkgs-fmt nixpkgs-fmt
nodePackages.bash-language-server nodePackages.bash-language-server
nodePackages.cspell
rustfmt rustfmt
shellcheck shellcheck
shfmt shfmt
statix
stylua stylua
sumneko-lua-language-server sumneko-lua-language-server
taplo taplo
@ -67,7 +70,7 @@ in
cmp_luasnip cmp_luasnip
copilot-cmp copilot-cmp
direnv-vim direnv-vim
impatient-nvim friendly-snippets
lsp_lines-nvim lsp_lines-nvim
lspkind-nvim lspkind-nvim
lspsaga-nvim-original lspsaga-nvim-original

71
modules/programs/nvim/init.lua
View file

@ -1,4 +1,4 @@
require("impatient") vim.loader.enable()
require("nvim-treesitter.configs").setup({ require("nvim-treesitter.configs").setup({
sync_install = false, sync_install = false,
@ -14,6 +14,7 @@ vim.api.nvim_create_autocmd("InsertEnter", {
callback = function() callback = function()
local cmp = require("cmp") local cmp = require("cmp")
local luasnip = require("luasnip") local luasnip = require("luasnip")
require("luasnip.loaders.from_vscode").lazy_load()
require("copilot_cmp").setup() require("copilot_cmp").setup()
cmp.setup({ cmp.setup({
@ -69,34 +70,6 @@ vim.api.nvim_create_autocmd("InsertEnter", {
end, end,
}) })
---merge tables
---@param ... table[]
---@return table
local function table_merge(...)
local tables_to_merge = { ... }
assert(#tables_to_merge > 1, "There should be at least two tables to merge them")
for k, t in ipairs(tables_to_merge) do
assert(type(t) == "table", string.format("Expected a table as function parameter %d", k))
end
local result = tables_to_merge[1]
for i = 2, #tables_to_merge do
local from = tables_to_merge[i]
for k, v in pairs(from) do
if type(v) == "table" then
result[k] = result[k] or {}
result[k] = table_merge(result[k], v)
else
result[k] = v
end
end
end
return result
end
local lsp_lines = require("lsp_lines") local lsp_lines = require("lsp_lines")
lsp_lines.setup() lsp_lines.setup()
-- Disable virtual_text since it's redundant due to lsp_lines. -- Disable virtual_text since it's redundant due to lsp_lines.
@ -159,11 +132,8 @@ require("lspsaga").setup({
enable = false, enable = false,
}, },
lightbulb = { lightbulb = {
enable = true, enable = false,
enable_in_insert = true, enable_in_insert = false,
sign = true,
sign_priority = 40,
virtual_text = false,
}, },
}) })
@ -173,10 +143,7 @@ local on_attach_def = function(_, bufnr)
K = { "<cmd>Lspsaga hover_doc ++quiet<cr>", "show info" }, K = { "<cmd>Lspsaga hover_doc ++quiet<cr>", "show info" },
["<leader>"] = { ["<leader>"] = {
l = { l = {
name = "lsp",
d = { "<cmd>Lspsaga show_cursor_diagnostics<cr>", "open diagnostic window" }, d = { "<cmd>Lspsaga show_cursor_diagnostics<cr>", "open diagnostic window" },
n = { "<cmd>Lspsaga diagnostic_jump_next<CR>", "next error" },
p = { "<cmd>Lspsaga diagnostic_jump_prev<CR>", "prev error" },
c = { "<cmd>Lspsaga code_action<cr>", "code action" }, c = { "<cmd>Lspsaga code_action<cr>", "code action" },
r = { "<cmd>Lspsaga rename<cr>", "rename" }, r = { "<cmd>Lspsaga rename<cr>", "rename" },
i = { "<cmd>Lspsaga hover_doc ++keep<cr>", "show info (sticky)" }, i = { "<cmd>Lspsaga hover_doc ++keep<cr>", "show info (sticky)" },
@ -188,27 +155,23 @@ local on_attach_def = function(_, bufnr)
mode = { "n", "v" }, mode = { "n", "v" },
}, },
}, },
w = {
name = "workspace",
a = { vim.lsp.buf.add_workspace_folder, "add workspace folder" },
r = { vim.lsp.buf.remove_workspace_folder, "remove workspace folder" },
l = {
function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end,
"list workspace folders",
},
},
t = { t = {
name = "toggle",
l = { lsp_lines.toggle, "lsp lines" }, l = { lsp_lines.toggle, "lsp lines" },
}, },
}, },
g = { g = {
name = "goto", d = { "<cmd>Lspsaga peek_definition<cr>", "Goto definition" },
d = { "<cmd>Lspsaga peek_definition<cr>", "definition" }, t = { "<cmd>Lspsaga peek_type_definition<cr>", "Goto type defininition" },
t = { "<cmd>Lspsaga peek_type_definition<cr>", "type defininition" }, h = { "<cmd>Lspsaga lsp_finder<CR>", "Lsp finder" },
h = { "<cmd>Lspsaga lsp_finder<CR>", "lsp finder" }, r = { "<cmd>Telescope lsp_references<cr>", "Goto reference" },
D = { vim.lsp.buf.declaration, "Goto declaration" },
I = { "<cmd>Telescope lsp_implementations<cr>", "Goto implementation" },
},
["["] = {
d = { "<cmd>Lspsaga diagnostic_jump_prev<cr>", "Previous diagnostic" },
},
["]"] = {
d = { "<cmd>Lspsaga diagnostic_jump_next<cr>", "Next diagnostic" },
}, },
}, { buffer = bufnr, silent = true }) }, { buffer = bufnr, silent = true })
end end
@ -226,7 +189,7 @@ local lspconfig_default_options = {
---@param options table ---@param options table
---@return nil ---@return nil
local function lspconfig_setup(lsp, options) local function lspconfig_setup(lsp, options)
local final_options = table_merge(lspconfig_default_options, options) local final_options = vim.tbl_deep_extend("force", lspconfig_default_options, options)
lspconfig[lsp].setup(final_options) lspconfig[lsp].setup(final_options)
end end

68
modules/programs/nvim/keybinds.lua
View file

@ -1,14 +1,74 @@
-- buffers -- buffer
require("which-key").register({ require("which-key").register({
b = { b = {
name = "buffers", name = "buffer",
b = { "<cmd>Telescope buffers<cr>", "List buffers" }, b = { "<cmd>Telescope buffers<cr>", "List buffers" },
d = { "<cmd>bd<cr>", "Delete buffer" }, d = { "<cmd>bd<cr>", "Delete buffer" },
n = { "<cmd>bnext<cr>", "Next buffer" },
p = { "<cmd>bprevious<cr>", "Previous buffer" },
}, },
}) })
-- window
require("which-key").register({
w = {
name = "window",
["|"] = { "<C-w>v", "Split window horizontally" },
["-"] = { "<C-w>s", "Split window vertically" },
w = { "<C-w>w", "Switch window" },
d = { "<C-w>c", "Delete window" },
},
}, { prefix = "<leader>" })
require("which-key").register({
["["] = {
b = { "<cmd>bprevious<cr>", "Previous buffer" },
},
["]"] = {
b = { "<cmd>bnext<cr>", "Next buffer" },
},
})
-- fast window move
require("which-key").register({
["<C-h>"] = { "<C-w>h", "Move window left" },
["<C-j>"] = { "<C-w>j", "Move window down" },
["<C-k>"] = { "<C-w>k", "Move window up" },
["<C-l>"] = { "<C-w>l", "Move window right" },
})
-- tab
require("which-key").register({
["<tab>"] = {
name = "tab",
["<tab>"] = { "<cmd>tabnew<cr>", "New tab" },
n = { "<cmd>tabnext<cr>", "Next tab" },
p = { "<cmd>tabprevious<cr>", "Previous tab" },
d = { "<cmd>tabclose<cr>", "Close tab" },
},
}, { prefix = "<leader>" })
-- file
require("which-key").register({
f = {
name = "file/find",
n = { "<cmd>enew<cr>", "New file" },
},
}, { prefix = "<leader>" })
-- better descriptions for navigation
require("which-key").register({
["<leader>"] = {
f = { name = "file/find" },
g = { name = "git" },
l = { name = "lsp" },
o = { name = "org" },
s = { name = "search" },
t = { name = "toggle" },
x = { name = "diagnostics/quickfix" },
},
["["] = { name = "prev" },
["]"] = { name = "next" },
g = { name = "goto" },
})
-- Clear search with <esc> -- Clear search with <esc>
require("which-key").register({ require("which-key").register({
["<esc>"] = { "<cmd>noh<cr><esc>", "Escape and clear hlsearch", mode = { "n", "i" } }, ["<esc>"] = { "<cmd>noh<cr><esc>", "Escape and clear hlsearch", mode = { "n", "i" } },

18
modules/programs/nvim/plugins/advanced-git-search-nvim.lua
View file

@ -1,18 +0,0 @@
require("telescope").load_extension("advanced_git_search")
local advanced_git_search = require("telescope").extensions.advanced_git_search
vim.api.nvim_create_user_command(
"DiffCommitLine",
"lua require('telescope').extensions.advanced_git_search.diff_commit_line()",
{ range = true }
)
require("which-key").register({
g = {
name = "git",
b = { advanced_git_search.diff_branch_file, "diff branch file" },
l = { vim.cmd.DiffCommitLine, "diff commit line", mode = "v" },
f = { advanced_git_search.diff_commit_file, "diff commit file" },
c = { advanced_git_search.search_log_content, "search log content" },
C = { advanced_git_search.search_log_content_file, "search log content current file" },
r = { advanced_git_search.checkout_reflog, "checkout reflog" },
},
}, { prefix = "<leader>" })

3
modules/programs/nvim/plugins/gitignore-nvim.lua Normal file
View file

@ -0,0 +1,3 @@
require("which-key").register({
i = { "<cmd>Gitignore<cr>", "Create .gitignore" },
}, { prefix = "<leader>g" })

21
modules/programs/nvim/plugins/gitsigns-nvim.lua
View file

@ -1 +1,22 @@
require("gitsigns").setup() require("gitsigns").setup()
require("which-key").register({
["["] = {
h = { "<cmd>Gitsigns prev_hunk<cr>", "Previous hunk" },
},
["]"] = {
h = { "<cmd>Gitsigns next_hunk<cr>", "Next hunk" },
},
})
require("which-key").register({
h = {
name = "hunk",
s = { "<cmd>Gitsigns stage_hunk<cr>", "Stage hunk", mode = { "n", "v" } },
r = { "<cmd>Gitsigns reset_hunk<cr>", "Reset hunk", mode = { "n", "v" } },
S = { "<cmd>Gitsigns stage_buffer<cr>", "Stage buffer" },
R = { "<cmd>Gitsigns reset_buffer<cr>", "Reset buffer" },
u = { "<cmd>Gitsigns undo_stage_hunk<cr>", "Undo stage hunk" },
},
}, { prefix = "<leader>g" })
require("which-key").register({
h = { ":<C-U>Gitsigns select_hunk<cr>", "Gitsigns select hunk" },
}, { prefix = "i", mode = { "o", "x" } })

195
modules/programs/nvim/plugins/neo-tree-nvim.lua Normal file
View file

@ -0,0 +1,195 @@
-- Unless you are still migrating, remove the deprecated commands from v1.x
vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
require("neo-tree").setup({
close_if_last_window = true, -- Close Neo-tree if it is the last window left in the tab
popup_border_style = "rounded",
enable_git_status = true,
enable_diagnostics = true,
open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes or buftypes
sort_case_insensitive = false, -- used when sorting files and directories in the tree
sort_function = nil, -- use a custom function for sorting files and directories in the tree
-- sort_function = function (a,b)
-- if a.type == b.type then
-- return a.path > b.path
-- else
-- return a.type > b.type
-- end
-- end , -- this sorts files and directories descendantly
default_component_configs = {
container = {
enable_character_fade = true,
},
indent = {
indent_size = 2,
padding = 1, -- extra padding on left hand side
-- indent guides
with_markers = true,
indent_marker = "│",
last_indent_marker = "└",
highlight = "NeoTreeIndentMarker",
-- expander config, needed for nesting files
with_expanders = nil, -- if nil and file nesting is enabled, will enable expanders
expander_collapsed = "",
expander_expanded = "",
expander_highlight = "NeoTreeExpander",
},
icon = {
folder_closed = "",
folder_open = "",
folder_empty = "ﰊ",
-- The next two settings are only a fallback, if you use nvim-web-devicons and configure default icons there
-- then these will never be used.
default = "*",
highlight = "NeoTreeFileIcon",
},
modified = {
symbol = "[+]",
highlight = "NeoTreeModified",
},
name = {
trailing_slash = false,
use_git_status_colors = true,
highlight = "NeoTreeFileName",
},
git_status = {
symbols = {
-- Change type
added = "", -- or "✚", but this is redundant info if you use git_status_colors on the name
modified = "", -- or "", but this is redundant info if you use git_status_colors on the name
deleted = "✖", -- this can only be used in the git_status source
renamed = "", -- this can only be used in the git_status source
-- Status type
untracked = "",
ignored = "",
unstaged = "",
staged = "",
conflict = "",
},
},
},
window = {
position = "left",
width = 40,
mapping_options = {
noremap = true,
nowait = true,
},
mappings = {
["<cr>"] = "open",
["<esc>"] = "revert_preview",
["P"] = { "toggle_preview", config = { use_float = false } },
["S"] = "open_split",
["s"] = "open_vsplit",
["t"] = "open_tabnew",
["C"] = "close_node",
["z"] = "close_all_nodes",
["a"] = {
"add",
-- this command supports BASH style brace expansion ("x{a,b,c}" -> xa,xb,xc). see `:h neo-tree-file-actions` for details
-- some commands may take optional config options, see `:h neo-tree-mappings` for details
config = {
show_path = "none", -- "none", "relative", "absolute"
},
},
["A"] = "add_directory", -- also accepts the optional config.show_path option like "add". this also supports BASH style brace expansion.
["d"] = "delete",
["r"] = "rename",
["y"] = "copy_to_clipboard",
["x"] = "cut_to_clipboard",
["p"] = "paste_from_clipboard",
["c"] = "copy", -- takes text input for destination, also accepts the optional config.show_path option like "add":
["m"] = "move", -- takes text input for destination, also accepts the optional config.show_path option like "add".
["q"] = "close_window",
["R"] = "refresh",
["?"] = "show_help",
["<"] = "prev_source",
[">"] = "next_source",
},
},
nesting_rules = {},
filesystem = {
filtered_items = {
visible = false, -- when true, they will just be displayed differently than normal items
hide_dotfiles = true,
hide_gitignored = true,
hide_hidden = true, -- only works on Windows for hidden files/directories
hide_by_name = {
--"node_modules"
},
hide_by_pattern = { -- uses glob style patterns
--"*.meta",
--"*/src/*/tsconfig.json",
},
always_show = { -- remains visible even if other settings would normally hide it
--".gitignored",
},
never_show = { -- remains hidden even if visible is toggled to true, this overrides always_show
--".DS_Store",
--"thumbs.db"
},
never_show_by_pattern = { -- uses glob style patterns
--".null-ls_*",
},
},
follow_current_file = false, -- This will find and focus the file in the active buffer every
-- time the current file is changed while the tree is open.
group_empty_dirs = false, -- when true, empty folders will be grouped together
hijack_netrw_behavior = "disabled", -- netrw disabled, opening a directory opens neo-tree
-- in whatever position is specified in window.position
-- "open_current", -- netrw disabled, opening a directory opens within the
-- window like netrw would, regardless of window.position
-- "disabled", -- netrw left alone, neo-tree does not handle opening dirs
use_libuv_file_watcher = false, -- This will use the OS level file watchers to detect changes
-- instead of relying on nvim autocmd events.
window = {
mappings = {
["<bs>"] = "navigate_up",
["."] = "set_root",
["H"] = "toggle_hidden",
["/"] = "fuzzy_finder",
["D"] = "fuzzy_finder_directory",
["#"] = "fuzzy_sorter", -- fuzzy sorting using the fzy algorithm
["f"] = "filter_on_submit",
["<c-x>"] = "clear_filter",
["[g"] = "prev_git_modified",
["]g"] = "next_git_modified",
},
fuzzy_finder_mappings = { -- define keymaps for filter popup window in fuzzy_finder_mode
["<S-tab>"] = "move_cursor_up",
["<tab>"] = "move_cursor_down",
},
},
},
buffers = {
follow_current_file = true, -- This will find and focus the file in the active buffer every
-- time the current file is changed while the tree is open.
group_empty_dirs = true, -- when true, empty folders will be grouped together
show_unloaded = true,
window = {
mappings = {
["bd"] = "buffer_delete",
["<bs>"] = "navigate_up",
["."] = "set_root",
},
},
},
git_status = {
window = {
position = "float",
mappings = {
["A"] = "git_add_all",
["gu"] = "git_unstage_file",
["ga"] = "git_add_file",
["gr"] = "git_revert_file",
["gc"] = "git_commit",
["gp"] = "git_push",
["gg"] = "git_commit_and_push",
},
},
},
})
require("which-key").register({
t = { "<cmd>Neotree toggle reveal<cr>", "Neotree" },
}, { prefix = "<leader>t", silent = true })

58
modules/programs/nvim/plugins/null-ls-nvim.lua Normal file
View file

@ -0,0 +1,58 @@
local null_ls = require("null-ls")
null_ls.setup({
sources = {
-- Code actions
null_ls.builtins.code_actions.cspell,
null_ls.builtins.code_actions.gitsigns,
null_ls.builtins.code_actions.shellcheck,
null_ls.builtins.code_actions.statix,
-- Completion
null_ls.builtins.completion.spell,
-- Diagnostics
null_ls.builtins.diagnostics.cspell,
null_ls.builtins.diagnostics.deadnix,
null_ls.builtins.diagnostics.shellcheck,
null_ls.builtins.diagnostics.statix,
},
})
-- disable cspell initially
null_ls.disable("cspell")
-- make sources toggle able
require("which-key").register({
n = {
name = "null-ls",
c = {
function()
null_ls.toggle("cspell")
end,
"cspell",
},
g = {
function()
null_ls.toggle("gitsigns")
end,
"gitsigns",
},
s = {
function()
null_ls.toggle("shellcheck")
end,
"shellcheck",
},
S = {
function()
null_ls.toggle("statix")
end,
"statix",
},
d = {
function()
null_ls.toggle("deadnix")
end,
"deadnix",
},
},
}, { prefix = "<leader>t" })

2
modules/programs/nvim/plugins/nvim-surround.lua
View file

@ -1 +1 @@
require("nvim-surround").setup({}) require("nvim-surround").setup()

10
modules/programs/nvim/plugins/nvim-tree-lua.lua
View file

@ -1,10 +0,0 @@
-- disable netrw at the very start of your init.lua (strongly advised)
vim.g.loaded_netrw = 1
vim.g.loaded_netrwPlugin = 1
-- set termguicolors to enable highlight groups
vim.opt.termguicolors = true
-- empty setup using defaults
require("nvim-tree").setup()
require("which-key").register({
t = { "<cmd>NvimTreeFindFileToggle<cr>", "nvim tree" },
}, { prefix = "<leader>t", silent = true })

23
modules/programs/nvim/plugins/telescope-nvim.lua
View file

@ -1,9 +1,22 @@
require("which-key").register({ require("which-key").register({
f = { f = {
name = "find", f = { "<cmd>Telescope find_files<cr>", "Find files" },
f = { "<cmd>Telescope find_files<cr>", "find file" }, b = { "<cmd>Telescope buffers<cr>", "Find buffers" },
l = { "<cmd>Telescope current_buffer_fuzzy_find<cr>", "find line" }, r = { "<cmd>Telescope oldfiles<cr>", "Find recent files" },
g = { "<cmd>Telescope live_grep<cr>", "live grep" }, },
b = { "<cmd>Telescope buffers<cr>", "find buffer" }, s = {
l = { "<cmd>Telescope current_buffer_fuzzy_find<cr>", "Search lines" },
g = { "<cmd>Telescope live_grep<cr>", "Live grep" },
c = { "<cmd>Telescope command_history<cr>", "Command history" },
C = { "<cmd>Telescope commands<cr>", "Commands" },
d = { "<cmd>Telescope diagnostics<cr>", "Diagnostics" },
h = { "<cmd>Telescope help_tags<cr>", "Help tags" },
k = { "<cmd>Telescope keymaps<cr>", "Keymaps" },
s = { "<cmd>Telescope lsp_document_symbols<cr>", "Symbols (Document)" },
S = { "<cmd>Telescope lsp_workspace_symbols<cr>", "Symbols (Workspace)" },
},
g = {
c = { "<cmd>Telescope git_commits<cr>", "Commits" },
s = { "<cmd>Telescope git_status<cr>", "Status" },
}, },
}, { prefix = "<leader>" }) }, { prefix = "<leader>" })

7
modules/programs/nvim/plugins/telescope-zoxide.lua
View file

@ -1,7 +1,4 @@
require("telescope").load_extension("zoxide") require("telescope").load_extension("zoxide")
require("which-key").register({ require("which-key").register({
f = { z = { "<cmd>Telescope zoxide list<cr>", "Find location (Zoxide)" },
name = "find", }, { prefix = "<leader>f" })
z = { "<cmd>Telescope zoxide list<cr>", "find location" },
},
}, { prefix = "<leader>" })

2
modules/programs/nvim/plugins/todo-comments-nvim.lua
View file

@ -1 +1 @@
require("todo-comments").setup({}) require("todo-comments").setup()

38
modules/programs/nvim/plugins/trouble-nvim.lua Normal file
View file

@ -0,0 +1,38 @@
require("trouble").setup()
require("which-key").register({
x = { "<cmd>TroubleToggle document_diagnostics<cr>", "Document Diagnostics (Trouble)" },
X = { "<cmd>TroubleToggle workspace_diagnostics<cr>", "Workspace Diagnostics (Troule)" },
l = { "<cmd>TroubleToggle loclist<cr>", "Location List (Trouble)" },
q = { "<cmd>TroubleToggle quickfix<cr>", "Quickfix List (Trouble)" },
t = { "<cmd>TodoTrouble<cr>", "Todo (Trouble)" },
T = { "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>", "Todo/Fix/Fixme (Trouble)" },
}, { prefix = "<leader>x" })
require("which-key").register({
t = { "<cmd>TodoTelescope<cr>", "Todo" },
}, { prefix = "<leader>s" })
require("which-key").register({
["["] = {
q = {
function()
if require("trouble").is_open() then
require("trouble").previous({ skip_groups = true, jump = true })
else
vim.cmd.cprev()
end
end,
"Previous trouble/quickfix item",
},
},
["]"] = {
q = {
function()
if require("trouble").is_open() then
require("trouble").next({ skip_groups = true, jump = true })
else
vim.cmd.cnext()
end
end,
"Next trouble/quickfix item",
},
},
})

3
modules/programs/nvim/plugins/twilight-nvim.lua Normal file
View file

@ -0,0 +1,3 @@
require("twilight").setup({
context = 20,
})

2
modules/programs/nvim/plugins/vim-startuptime.lua Normal file
View file

@ -0,0 +1,2 @@
vim.g.startuptime_tries = 10
vim.g.startuptime_exe_path = "vim"

4
modules/programs/nvim/plugins/zen-mode-nvim.lua Normal file
View file

@ -0,0 +1,4 @@
require("zen-mode").setup()
require("which-key").register({
z = { "<cmd>ZenMode<cr>", "Zen mode" },
}, { prefix = "<leader>t" })

2
modules/programs/python.nix
View file

@ -9,7 +9,7 @@ let
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);
enabledVersions = filterAttrs (name: value: value.enable) cfg.versions; enabledVersions = filterAttrs (_: value: value.enable) cfg.versions;
pythonPackages = version: attrNames pkgs."python${version}Packages"; pythonPackages = version: attrNames pkgs."python${version}Packages";

1
modules/programs/ssh.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

50
modules/programs/xmonad/default.nix
View file

@ -1,50 +0,0 @@
{ config
, lib
, pkgs
, ...
}:
with lib;
let
cfg = config.my.programs.xmonad;
in
{
options.my.programs.xmonad.enable = mkEnableOption "xmonad";
config = lib.mkIf cfg.enable {
services = {
xserver = {
enable = true;
layout = "de";
displayManager = {
defaultSession = "none+xmonad";
autoLogin = {
enable = true;
user = "moritz";
};
lightdm.enable = true;
};
windowManager.xmonad.enable = true;
};
};
home-manager.users.moritz =
let
xmonadPackages = haskellPackages: [
haskellPackages.xmonad-contrib
haskellPackages.xmonad-extras
haskellPackages.xmonad
haskellPackages.xmobar
];
in
{
xsession.windowManager.xmonad = {
enable = true;
enableContribAndExtras = true;
config = ./xmonad.hs;
# extraPackages = xmonadPackages;
};
programs.xmobar.enable = true;
};
};
}

39
modules/programs/xmonad/xmonad.hs
View file

@ -1,39 +0,0 @@
import XMonad
( Choose,
Default (def),
Full,
KeyMask,
Mirror,
Tall,
X,
XConfig (modMask, terminal),
mod4Mask,
spawn,
xmonad,
)
import XMonad.Hooks.EwmhDesktops (ewmh)
import XMonad.Util.EZConfig (additionalKeysP)
myModMask :: KeyMask
myModMask = mod4Mask
myTerminal :: String
myTerminal = "kitty"
myKeys :: [(String, X ())]
myKeys =
[ ("M-d", spawn "rofi -show combi"),
("M-e", spawn "emacsclient -c -a emacs"),
("M-f", spawn "firefox")
]
myConfig :: (XConfig (Choose Tall (Choose (Mirror Tall) Full)))
myConfig =
def
{ modMask = myModMask,
terminal = myTerminal
}
`additionalKeysP` myKeys
main :: IO ()
main = xmonad $ ewmh $ ewmhFullscreen myConfig

1
modules/programs/zathura.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

1
modules/programs/zsh.nix
View file

@ -1,7 +1,6 @@
{ config { config
, lib , lib
, pkgs , pkgs
, inputs
, ... , ...
}: }:

8
modules/services/default.nix
View file

@ -1,8 +1,4 @@
{ config {
, lib
, pkgs
, ...
}: {
imports = [ imports = [
./dunst.nix ./dunst.nix
./kdeconnect.nix ./kdeconnect.nix
@ -10,7 +6,7 @@
./openconnect.nix ./openconnect.nix
./picom.nix ./picom.nix
./printing.nix ./printing.nix
./redshift.nix ./gammastep.nix
./wireguard.nix ./wireguard.nix
]; ];
} }

17
modules/services/gammastep.nix Normal file
View file

@ -0,0 +1,17 @@
{ config, lib, ... }:
with lib;
let
cfg = config.my.services.gammastep;
in
{
options.my.services.gammastep.enable = mkEnableOption "gammastep";
config = lib.mkIf cfg.enable {
home-manager.users.moritz.services.gammastep = {
enable = true;
latitude = 52.3;
longitude = 12.4;
};
};
}

1
modules/services/kdeconnect.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

1
modules/services/openconnect.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

17
modules/services/redshift.nix
View file

@ -1,17 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.my.services.redshift;
in
{
options.my.services.redshift.enable = mkEnableOption "redshift";
config = lib.mkIf cfg.enable {
services.redshift.enable = true;
location = {
latitude = 52.3;
longitude = 12.4;
};
};
}

1
modules/services/wireguard.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

5
modules/virtualisation/default.nix
View file

@ -1,8 +1,3 @@
{ config
, lib
, pkgs
, ...
}:
{ {
imports = [ imports = [
./podman.nix ./podman.nix

1
modules/virtualisation/podman.nix
View file

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:

4
overlays/channels.nix
View file

@ -1,6 +1,6 @@
{ lib, inputs }: { inputs, ... }:
final: prev: { _: prev: {
master = import inputs.master { master = import inputs.master {
inherit (prev) system; inherit (prev) system;
config.allowUnfree = true; config.allowUnfree = true;

4
overlays/lib.nix
View file

@ -1,5 +1,5 @@
{ lib, inputs }: { lib, ... }:
final: prev: { _: _: {
inherit lib; inherit lib;
} }

4
overlays/packages.nix
View file

@ -1,6 +1,6 @@
{ inputs, lib }: { inputs, ... }:
final: prev: _: prev:
{ {
agenix = inputs.agenix.packages.${prev.system}.default; agenix = inputs.agenix.packages.${prev.system}.default;
attic = inputs.attic.packages.${prev.system}.default; attic = inputs.attic.packages.${prev.system}.default;

12
overlays/vimPlugins.nix
View file

@ -1,6 +1,6 @@
{ inputs, lib }: { inputs, lib }:
final: prev: _: prev:
with lib.my; with lib.my;
{ {
vimPlugins = prev.vimPlugins // { vimPlugins = prev.vimPlugins // {
@ -16,12 +16,12 @@ with lib.my;
src = inputs.smartcolumn-nvim; src = inputs.smartcolumn-nvim;
}; };
copilot-lua = prev.vimPlugins.copilot-lua.overrideAttrs (old: { copilot-lua = prev.vimPlugins.copilot-lua.overrideAttrs (_: {
version = mkVersionInput inputs.copilot-lua; version = mkVersionInput inputs.copilot-lua;
src = inputs.copilot-lua; src = inputs.copilot-lua;
}); });
lspsaga-nvim-original = prev.vimPlugins.lspsaga-nvim-original.overrideAttrs (old: { lspsaga-nvim-original = prev.vimPlugins.lspsaga-nvim-original.overrideAttrs (_: {
version = mkVersionInput inputs.lspsaga-nvim; version = mkVersionInput inputs.lspsaga-nvim;
src = inputs.lspsaga-nvim; src = inputs.lspsaga-nvim;
}); });
@ -37,5 +37,11 @@ with lib.my;
version = mkVersionInput inputs.comment-box-nvim; version = mkVersionInput inputs.comment-box-nvim;
src = inputs.comment-box-nvim; src = inputs.comment-box-nvim;
}; };
gitignore-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
pname = "gitignore-nvim";
version = mkVersionInput inputs.gitignore-nvim;
src = inputs.gitignore-nvim;
};
}; };
} }

2
overlays/wayland.nix
View file

@ -1,4 +1,4 @@
{ lib, inputs }: _:
final: prev: { final: prev: {
neovide-hyprland = final.symlinkJoin { neovide-hyprland = final.symlinkJoin {