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

Compare commits

base: moritz:d6fbbb945c20da640a0cdae7f83bbb54e00fd739
Branches Tags
moritz:nixos
..
compare: moritz:37c4cc70e3b0269559eeb2414d7809fced9aabf1
Branches Tags
moritz:nixos

3 commits
d6fbbb945c ... 37c4cc70e3

Author SHA1 Message Date
Moritz Böhme
37c4cc70e3
build!: update inputs 2023-04-05 08:54:30 +02:00
Moritz Böhme
f1f1ce943c
feat!: remove unused input and unneeded comments 2023-04-05 08:52:36 +02:00
Moritz Böhme
8a6cdf7632
feat(nvim): add comment-box.nvim 2023-04-05 08:52:02 +02:00
8 changed files with 123 additions and 115 deletions
Show stats Expand all files Collapse all files

167
flake.lock
View file

@ -3,11 +3,11 @@
"advanced-git-search-nvim": {
"flake": false,
"locked": {
"lastModified": 1677794481,
"narHash": "sha256-7G0WNcaIH1/4Zs4282UdWfRExdlAz6AHzqBlSu/qioQ=",
"lastModified": 1680558870,
"narHash": "sha256-p2G5VWTTlS1VhygwekuZoZ45s/vv+tHYYw8oA7NXpcw=",
"owner": "aaronhallaert",
"repo": "advanced-git-search.nvim",
"rev": "e36797ade1af3d0404e14db83fd09db4e619e8dc",
"rev": "500be1a583dfac0f7d715107fe29dac18b77ff49",
"type": "github"
},
"original": {
@ -24,11 +24,11 @@
]
},
"locked": {
"lastModified": 1677969766,
"narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=",
"lastModified": 1680281360,
"narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=",
"owner": "ryantm",
"repo": "agenix",
"rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e",
"rev": "e64961977f60388dd0b49572bb0fc453b871f896",
"type": "github"
},
"original": {
@ -40,11 +40,11 @@
"arkenfox-userjs": {
"flake": false,
"locked": {
"lastModified": 1678691587,
"narHash": "sha256-EGfPa1uGYwQLhM27nyWosJo5Pe4yIhC3JOW0vqajK7w=",
"lastModified": 1680151825,
"narHash": "sha256-EutseXvFnDkYq95GWiGrTFqI4fqybvsPQlVV0Wy5tFU=",
"owner": "arkenfox",
"repo": "user.js",
"rev": "e2e8c4ea8f9c8034a2ff72fe3c2d4a4a89404c10",
"rev": "c84c419544cbbe4442190cc6325b926b519d8db5",
"type": "github"
},
"original": {
@ -85,11 +85,11 @@
]
},
"locked": {
"lastModified": 1678041467,
"narHash": "sha256-qqHbiN0ZfEuZ2guMAW5T011TqgrPqGqNWlHtd8AXtQA=",
"lastModified": 1679445945,
"narHash": "sha256-UadTIRRA/okmLmdM+OzhCwSoovr72Pq0+3Tt7CAyYcg=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "1a3b6513b02202198bb497608d0cedc45119799b",
"rev": "4d92e69fc1b279676f997e6b99d2cacc4d0a3e87",
"type": "github"
},
"original": {
@ -98,14 +98,30 @@
"type": "github"
}
},
"comment-box-nvim": {
"flake": false,
"locked": {
"lastModified": 1678772374,
"narHash": "sha256-hD9eCcrDsispi+Nvwjy/MlNW0UmFfSbh8arQpCjeneM=",
"owner": "LudoPinelli",
"repo": "comment-box.nvim",
"rev": "6672213bd5d2625a666a297b66307967effa50bc",
"type": "github"
},
"original": {
"owner": "LudoPinelli",
"repo": "comment-box.nvim",
"type": "github"
}
},
"copilot-lua": {
"flake": false,
"locked": {
"lastModified": 1677479736,
"narHash": "sha256-n/SCrzzzL5WUHJk0sCXbgGusk/dQuy8DI9Pqdh+lVeQ=",
"lastModified": 1680027228,
"narHash": "sha256-3u+2azMRm24mp5iOrxwYg9QrM2xJHnSjGsldIDRS6HQ=",
"owner": "zbirenbaum",
"repo": "copilot.lua",
"rev": "b41d4c9c7d4f5e0272bcf94061b88e244904c56f",
"rev": "f0b41fb89ef2ed7ab4e8cd5208a30755aa638fc4",
"type": "github"
},
"original": {
@ -345,22 +361,6 @@
"type": "github"
}
},
"forgit-git": {
"flake": false,
"locked": {
"lastModified": 1677621471,
"narHash": "sha256-merUZ0IQ/qmDkquGFjKvc4vJBj4Ff62JpWYOB67lAVY=",
"owner": "wfxr",
"repo": "forgit",
"rev": "801239658718863b9c6e0ba21d027cb0caccd465",
"type": "github"
},
"original": {
"owner": "wfxr",
"repo": "forgit",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -414,11 +414,11 @@
]
},
"locked": {
"lastModified": 1678886248,
"narHash": "sha256-ff81NJtc+AgQhUlTCkx8t8hda0o72vSxDeHVGrfxH70=",
"lastModified": 1680597706,
"narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2bd74d92bc7345f323ebcbfeb631d5cf4067ed8e",
"rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a",
"type": "github"
},
"original": {
@ -454,11 +454,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1677679546,
"narHash": "sha256-L+QE6hIHxhYHWPA1jfgZsbQFYxheD/hzFhtwGFRdWOk=",
"lastModified": 1679036674,
"narHash": "sha256-2s3Hfq56jL8ePyc3+calPT34FNMK2zksqwPhIxAq20o=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "d4eccc8e7d31d30c7ce39dc2b864c4f23f173855",
"rev": "1af47a008e850c595aeddc83bb3f04fd81935caa",
"type": "github"
},
"original": {
@ -475,11 +475,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1678899680,
"narHash": "sha256-o+bo+n1HYvYJVnOG/Y/nnxdx4Lu1oFgVyrHemBbT2sE=",
"lastModified": 1680616746,
"narHash": "sha256-y+0NkdRSmZonUhBsvPG+9BCOfIgZzGXxLfAuzo/3ULU=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "f5669a7d6bdb54d21426f6aa31a66fe813fc4e7d",
"rev": "6519c0308c4dd6ab484c7854e1eca2dc8f400485",
"type": "github"
},
"original": {
@ -514,11 +514,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1678893556,
"narHash": "sha256-FHhBetkV/S7M9BMpbCzUWX/P5E7tGE4mZIpj/2m0K2M=",
"lastModified": 1680428635,
"narHash": "sha256-/Kz4Qy+jx1+bfSq6e2W3MbyODkhs6GqKiiybNtqzvbc=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "61961973cfd10853b32c7f904cdb88f9ab6d84dd",
"rev": "db56f164dd4d6bba8f606fd49885cdbe9803fe9b",
"type": "github"
},
"original": {
@ -530,11 +530,11 @@
"lspsaga-nvim": {
"flake": false,
"locked": {
"lastModified": 1678361457,
"narHash": "sha256-nrsMdfF43k0RavCq2hZ799HpY/40O0bi4kAM18dR+f4=",
"lastModified": 1680586822,
"narHash": "sha256-396xNjMoMvfpHGqu27JuTTafKepWGkHG29TjV8taHZY=",
"owner": "glepnir",
"repo": "lspsaga.nvim",
"rev": "db6cdf51bf5ae45e4aa65760e597cf0d587c66ee",
"rev": "fb476086012e18e0001c3dcc5b18fd34a847e5fe",
"type": "github"
},
"original": {
@ -545,11 +545,11 @@
},
"master": {
"locked": {
"lastModified": 1678898370,
"narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
"lastModified": 1680625698,
"narHash": "sha256-GLsNwSn8OqtE5qaw5viQR+iF3YSoS4dA4PIA+5nI7kg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ac718d02867a84b42522a0ece52d841188208f2c",
"rev": "5c54bec2de3a5cf005be903a5f3e33d0c9988c35",
"type": "github"
},
"original": {
@ -565,17 +565,18 @@
},
"locked": {
"dir": "contrib",
"lastModified": 1678886704,
"narHash": "sha256-eSeJva5Wg9Dlccc9eLR/iPunQPpzHAYh6eGjPCJnnPE=",
"lastModified": 1680264322,
"narHash": "sha256-nv1lSK+y/vv6ASMhNFoJE1YcNisJmQ0A+anNLzscvKk=",
"owner": "neovim",
"repo": "neovim",
"rev": "5a38e951ec1532ba1ee8b35b42181003866d479c",
"rev": "83bfd94d1df5eecb8e4069a227c7d24598636d63",
"type": "github"
},
"original": {
"dir": "contrib",
"owner": "neovim",
"repo": "neovim",
"rev": "83bfd94d1df5eecb8e4069a227c7d24598636d63",
"type": "github"
}
},
@ -590,11 +591,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1678728829,
"narHash": "sha256-KbA8uakGfjfvRH+Td/VegiLdHrnqIZHkMTQ5XBjL2dE=",
"lastModified": 1680544266,
"narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=",
"owner": "oxalica",
"repo": "nil",
"rev": "e7045f1779fd202a3316f84b864c304f339cccea",
"rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362",
"type": "github"
},
"original": {
@ -637,11 +638,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1673800717,
"narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=",
"lastModified": 1678872516,
"narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f",
"rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
"type": "github"
},
"original": {
@ -685,11 +686,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1677676435,
"narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
"lastModified": 1680487167,
"narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
"rev": "53dad94e874c9586e71decf82d972dfb640ef044",
"type": "github"
},
"original": {
@ -733,11 +734,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1678843226,
"narHash": "sha256-TkA5tsC8N38HNgaI/odBbSOJWkUrD1uIB2A7Yms72Is=",
"lastModified": 1680577567,
"narHash": "sha256-Y4W57i0TzczqwMTjfVSbAZT5RJx7u+mpQIW/ofrkTQs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "abb2ade261c33516716aa21068d8c10c48d03367",
"rev": "b01f185e4866de7c5b5a82f833ca9ea3c3f72fc4",
"type": "github"
},
"original": {
@ -749,11 +750,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1671271357,
"narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=",
"lastModified": 1678898370,
"narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "40f79f003b6377bd2f4ed4027dde1f8f922995dd",
"rev": "ac718d02867a84b42522a0ece52d841188208f2c",
"type": "github"
},
"original": {
@ -841,11 +842,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1678376203,
"narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=",
"lastModified": 1680599552,
"narHash": "sha256-rQQJFGvWQ3Sr+m/r5KGIFN0iVaVKr6u9uraCz6jSKj4=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "1a20b9708962096ec2481eeb2ddca29ed747770a",
"rev": "3342d7c51119030490fdcd07351b53b10806891c",
"type": "github"
},
"original": {
@ -861,10 +862,10 @@
"arkenfox-userjs": "arkenfox-userjs",
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
"attic": "attic",
"comment-box-nvim": "comment-box-nvim",
"copilot-lua": "copilot-lua",
"emacs": "emacs",
"flake-utils": "flake-utils_3",
"forgit-git": "forgit-git",
"home-manager": "home-manager",
"howdy": "howdy",
"hypr-contrib": "hypr-contrib",
@ -921,11 +922,11 @@
]
},
"locked": {
"lastModified": 1678415622,
"narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=",
"lastModified": 1680488274,
"narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7",
"rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
"type": "github"
},
"original": {
@ -937,11 +938,11 @@
"smartcolumn-nvim": {
"flake": false,
"locked": {
"lastModified": 1677732751,
"narHash": "sha256-uu9h5Pjw05IokTbJxrVlavZXpm3Ny6jrmhcHXzvwngU=",
"lastModified": 1679417638,
"narHash": "sha256-DjPWBOLbzdfOQAx+6xgV1CD5NKuP1N6An2lmHNHd39Q=",
"owner": "m4xshen",
"repo": "smartcolumn.nvim",
"rev": "6e16c7d1b5e8bf4cb7ddcab5c91745190e80e99d",
"rev": "0c572e3eae48874f25b74394a486f38cadb5c958",
"type": "github"
},
"original": {
@ -952,11 +953,11 @@
},
"stable": {
"locked": {
"lastModified": 1678761643,
"narHash": "sha256-tapXZvg6Kg5Fm7Fm6i+7cRC5Exp2lX7cgMrqsfrGhuc=",
"lastModified": 1680498889,
"narHash": "sha256-4nGFBm+oILOO6DPoKTPxVlfkZSxCOY4W25zSRHESK48=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c4aec3c021620d98861639946123214207e98344",
"rev": "799d153e4f316143a9db0eb869ecf44d8d4c0356",
"type": "github"
},
"original": {
@ -990,11 +991,11 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1677789111,
"narHash": "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c=",
"lastModified": 1680044309,
"narHash": "sha256-OojM0I5vpipp4HDxx8TVrW+ASt3KNBRBeyXl3BzyKTo=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "5ae17de23f5fd9bb252a698f3771c840280e2c05",
"rev": "89dcecba39d4f49b673f2fa976354c91413a4c3f",
"type": "gitlab"
},
"original": {

52
flake.nix
View file

@ -1,10 +1,11 @@
{
description = "My awesome system config";
##############
### Inputs ###
##############
/*
╔══════════════════════════════════════════════════════════╗
║ Inputs ║
╚══════════════════════════════════════════════════════════╝
*/
inputs = {
master.url = "github:nixos/nixpkgs";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
@ -24,11 +25,6 @@
home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.inputs.utils.follows = "flake-utils";
# Zsh specific
forgit-git.url = "github:wfxr/forgit";
forgit-git.flake = false;
# Laptop Touchpad
asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
asus-touchpad-numpad-driver.flake = false;
@ -40,13 +36,12 @@
emacs.url = "git+ssh://git@gitea.moritzboeh.me/moritz/emacs.git?ref=main";
neovim.url = "github:neovim/neovim?dir=contrib";
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
hyprland.url = "github:hyprwm/Hyprland";
hyprpaper.url = "github:hyprwm/hyprpaper";
hypr-contrib.url = "github:hyprwm/contrib";
@ -66,12 +61,20 @@
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";
};
/*
╔══════════════════════════════════════════════════════════╗
║ Outputs ║
╚══════════════════════════════════════════════════════════╝
*/
outputs =
inputs@{ self, nixpkgs, utils, ... }:
utils.lib.mkFlake {
@ -84,10 +87,11 @@
lib = nixpkgs.lib.extend
(self: super: { my = import ./lib { lib = self; }; });
################
### Overlays ###
################
/*
╔══════════════════════════════════════════════════════════╗
║ Overlays ║
╚══════════════════════════════════════════════════════════╝
*/
overlay = import ./overlays {
inherit inputs;
inherit (self) lib;
@ -108,10 +112,11 @@
overlays.default = self.overlay;
###############
### Modules ###
###############
/*
╔══════════════════════════════════════════════════════════╗
║ Modules ║
╚══════════════════════════════════════════════════════════╝
*/
nixosModules = utils.lib.exportModules [
./modules/profiles/base.nix
./modules/profiles/gaming.nix
@ -148,10 +153,11 @@
self.nixosModules.gaming
];
###############
### Outputs ###
###############
/*
╔══════════════════════════════════════════════════════════╗
║ Other Outputs ║
╚══════════════════════════════════════════════════════════╝
*/
outputsBuilder = channels:
with channels.nixpkgs; {
devShells.default = mkShell {

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

@ -15,7 +15,7 @@
my.programs.hyprland.nvidiaSupport = true;
# KERNEL
boot.kernelPackages = pkgs.linuxPackages_6_1; # HACK to get nvidia kernel package to build
boot.kernelPackages = pkgs.linuxPackages_latest;
# BOOT
boot = {

2
modules/config/shell.nix
View file

@ -17,7 +17,7 @@ in
};
aliases = mkOption {
default = { };
type = with types; attrsOf (nullOr (either str path));
type = with types; attrsOf str;
};
variables = mkOption {
default = { };

2
modules/profiles/desktop.nix
View file

@ -116,7 +116,7 @@ with lib; {
calibre
jellyfin-media-player
keepassxc
libreoffice
stable.libreoffice # HACK to fix build error
pavucontrol
stable.signal-desktop
tlaplusToolbox

1
modules/programs/nvim/plugins/comment-box-nvim.lua Normal file
View file

@ -0,0 +1 @@
require("comment-box").setup()

6
modules/programs/zsh.nix
View file

@ -31,12 +31,6 @@ in
readlink -f $(which $1)
}
'';
plugins = [
{
name = "forgit";
src = inputs.forgit-git;
}
];
};
};
};

6
overlays/vimPlugins.nix
View file

@ -31,5 +31,11 @@ with lib.my;
version = mkVersionInput inputs.advanced-git-search-nvim;
src = inputs.advanced-git-search-nvim;
};
comment-box-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
pname = "comment-box-nvim";
version = mkVersionInput inputs.comment-box-nvim;
src = inputs.comment-box-nvim;
};
};
}