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

Compare commits

base: moritz:968e70c387b43a1ddd5045794eb10b0c3b5a2681
Branches Tags
moritz:nixos
...
compare: moritz:75be58861b06463f196dbd493b99c0b010a6cc35
Branches Tags
moritz:nixos

4 commits
968e70c387 ... 75be58861b

Author SHA1 Message Date
Moritz Böhme
75be58861b
wireguard: add dns 2023-02-24 18:42:37 +01:00
Moritz Böhme
55c7f4d57d
base: add attic 2023-02-24 18:42:20 +01:00
Moritz Böhme
9b7403f235
Merge remote-tracking branch 'origin/nixos' into nixos 2023-02-24 14:08:36 +01:00
Moritz Böhme
05014b9ec7
nvim: add rust_analyzer as language server 2023-02-24 14:07:58 +01:00
6 changed files with 185 additions and 100 deletions
Show stats Expand all files Collapse all files

260
flake.lock
View file

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1676910639, "lastModified": 1677247280,
"narHash": "sha256-YvZ2lQiUZrv5PCQ0nC/fn/0OT2ag8spCIOQx0COnFZ0=", "narHash": "sha256-sa+8MtoAOSLsWP9vf0qiJUyMovIEYgDzHE8TkoK04Hk=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "5f66c8aa774d8d488cba1cdc4f0c954d2a14e3a1", "rev": "833f87c8ff574a29aea3e091045cbaed3cf86bc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,6 +54,65 @@
"type": "github" "type": "github"
} }
}, },
"attic": {
"inputs": {
"crane": "crane",
"flake-compat": "flake-compat",
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": [
"stable"
]
},
"locked": {
"lastModified": 1676581287,
"narHash": "sha256-a/6ClchROZ5PoLz0WK42mkAkUtJlMDbe5QyyZZ7bomc=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "0bb3d001365a5d75947a7a713dfd06307b3934d4",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"repo": "attic",
"type": "github"
}
},
"crane": {
"inputs": {
"flake-compat": [
"attic",
"flake-compat"
],
"flake-utils": [
"attic",
"flake-utils"
],
"nixpkgs": [
"attic",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1673405853,
"narHash": "sha256-6Nq9DuOo+gE2I8z5UZaKuumykz2xxZ9JGYmUthOuwSA=",
"owner": "ipetkov",
"repo": "crane",
"rev": "b13963c8c18026aa694acd98d14f66d24666f70b",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"rev": "b13963c8c18026aa694acd98d14f66d24666f70b",
"type": "github"
}
},
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -149,6 +208,22 @@
"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": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
@ -181,11 +256,11 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1676283394,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,11 +271,11 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1659877975,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,21 +314,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_7": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"forgit-git": { "forgit-git": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -318,14 +378,16 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1676892629, "lastModified": 1677104801,
"narHash": "sha256-rlvsqoSBO5dCwfnn7xvImYREidIPJaiFS3b54TZF4pU=", "narHash": "sha256-2V5nKOYVFMYlseYdDKiEaww2xqcE0GtS1ax3SoUX99I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "72ce74d3eae78a6b31538ea7ebe0c1fcf4a10f7a", "rev": "4295fdfa6b0005c32f2e1f0b732faf5810c1bc7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,7 +398,7 @@
}, },
"howdy": { "howdy": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -382,11 +444,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1676902515, "lastModified": 1677162463,
"narHash": "sha256-tFvDUIWmsEdAWnbwCDCDwcPxcZNGQzPfRpx5tSL/yl0=", "narHash": "sha256-wjZbwJvIagJ0i82LYm3eIHNsqwblOjIzAyegA3z9olA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "474ada9267ccb98015991ee9d0d93fbb5da72034", "rev": "60e37d727def25c87a3fd6c47751c05f6082260f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,11 +498,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1676912548, "lastModified": 1677259386,
"narHash": "sha256-5KH+YpMju3Zj6PU4wV3qaEznRvyt0y7Ei4hS7jsEh2c=", "narHash": "sha256-gFXSvo9CuTJa6V0bK0Gm+JwizlJD+YyJ1VAUW2ij1R4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20c135b191fd84f556cc5eb37b8d9d683a580b1e", "rev": "e8d97da2540b9de5962849c75c425cc2469d77ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -451,16 +513,16 @@
}, },
"neovim": { "neovim": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1676908542, "lastModified": 1677257437,
"narHash": "sha256-a5J7LPxpmB69oOzCz0kuh6pXV/IVNMlDfs3pIYwnvHo=", "narHash": "sha256-fxEb0DrGXv3Q03Gz/oqI8x47WhXLlGtHQFgGIhBl4c0=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "3507474611a03d88137a1d97666515b551c39cb3", "rev": "15cce77b383d0b0bfdaa1415cdde005cc43267d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -472,9 +534,13 @@
}, },
"nil": { "nil": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": [
"nixpkgs": "nixpkgs_7", "flake-utils"
"rust-overlay": "rust-overlay" ],
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1676390054, "lastModified": 1676390054,
@ -556,11 +622,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1658161305, "lastModified": 1677063315,
"narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -572,11 +638,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1675273418, "lastModified": 1677063315,
"narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -588,11 +654,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1674641431, "lastModified": 1677063315,
"narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -620,11 +686,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1675309347, "lastModified": 1677142198,
"narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=", "narHash": "sha256-Y/uC2ZmkQkyrdRZ5szZilhZ/46786Wio5CGTgL+Vb/c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5", "rev": "03fb72201639e5274fee6d77b0d9c66e98329aba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -635,22 +701,6 @@
} }
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": {
"lastModified": 1676790509,
"narHash": "sha256-W9uWAWokgS8US8rJf79qBLS2M+ZgIscfoz+KsNE7VGQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a1291d0d020a200c7ce3c48e96090bfa4890a475",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1671271357, "lastModified": 1671271357,
"narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=",
@ -684,7 +734,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat_2",
"flake-utils": [ "flake-utils": [
"emacs", "emacs",
"flake-utils" "flake-utils"
@ -737,18 +787,18 @@
}, },
"pre-commit-hooks_3": { "pre-commit-hooks_3": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_6",
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_8",
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1676879534, "lastModified": 1677160285,
"narHash": "sha256-HU4RXcwsAX1u7AUbGOBDxkYQkeODcn+HZjXqKa1y/hk=", "narHash": "sha256-tBzpCjMP+P3Y3nKLYvdBkXBg3KvTMo3gvi8tLQaqXVY=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "c9495f017f67a11e9c9909b032dc7762dfc853cf", "rev": "2bd861ab81469428d9c823ef72c4bb08372dd2c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,7 +812,9 @@
"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",
"emacs": "emacs", "emacs": "emacs",
"flake-utils": "flake-utils_3",
"forgit-git": "forgit-git", "forgit-git": "forgit-git",
"home-manager": "home-manager", "home-manager": "home-manager",
"howdy": "howdy", "howdy": "howdy",
@ -772,15 +824,42 @@
"master": "master", "master": "master",
"neovim": "neovim", "neovim": "neovim",
"nil": "nil", "nil": "nil",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_7",
"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_3",
"smartcolumn-nvim": "smartcolumn-nvim", "smartcolumn-nvim": "smartcolumn-nvim",
"stable": "stable", "stable": "stable",
"utils": "utils_2" "utils": "utils"
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": {
"flake-utils": [
"attic",
"crane",
"flake-utils"
],
"nixpkgs": [
"attic",
"crane",
"nixpkgs"
]
},
"locked": {
"lastModified": 1675391458,
"narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"nil", "nil",
@ -823,11 +902,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1676817468, "lastModified": 1677075010,
"narHash": "sha256-ovuJ1jQOC2/EEibufBkXmSN/O9mLx80Wh7aDmHmHAhA=", "narHash": "sha256-X+UmR1AkdR//lPVcShmLy8p1n857IGf7y+cyCArp8bU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0cf4274b5d06325bd16dbf879a30981bc283e58a", "rev": "c95bf18beba4290af25c60cbaaceea1110d0f727",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -838,23 +917,10 @@
} }
}, },
"utils": { "utils": {
"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"
}
},
"utils_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_7" "flake-utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1657226504, "lastModified": 1657226504,

20
flake.nix
View file

@ -12,7 +12,12 @@
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus"; flake-utils.url = "github:numtide/flake-utils";
utils = {
url = "github:gytis-ivaskevicius/flake-utils-plus";
inputs.flake-utils.follows = "flake-utils";
};
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
@ -22,6 +27,7 @@
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
}; };
# Zsh specific # Zsh specific
@ -50,7 +56,11 @@
neovim.url = "github:neovim/neovim?dir=contrib"; neovim.url = "github:neovim/neovim?dir=contrib";
nil.url = "github:oxalica/nil"; nil = {
url = "github:oxalica/nil";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
# Hyprland # Hyprland
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
@ -67,6 +77,12 @@
flake = false; flake = false;
}; };
attic = {
url = "github:zhaofengli/attic";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "stable";
inputs.flake-utils.follows = "flake-utils";
};
}; };
outputs = outputs =

1
modules/profiles/base.nix
View file

@ -88,6 +88,7 @@ in
statix statix
manix manix
nix-output-monitor nix-output-monitor
attic
# other # other
bat bat

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

@ -298,7 +298,7 @@ local function lspconfig_setup(lsp, options)
lspconfig[lsp].setup(final_options) lspconfig[lsp].setup(final_options)
end end
local servers = { "nil_ls", "pylsp" } local servers = { "nil_ls", "pylsp", "rust_analyzer" }
for _, lsp in ipairs(servers) do for _, lsp in ipairs(servers) do
lspconfig_setup(lsp, {}) lspconfig_setup(lsp, {})
end end

1
modules/services/wireguard.nix
View file

@ -25,6 +25,7 @@ in
address = [ "10.8.0.3/24" ]; address = [ "10.8.0.3/24" ];
listenPort = 51820; listenPort = 51820;
privateKeyFile = "/run/agenix/wireguard-private-key"; privateKeyFile = "/run/agenix/wireguard-private-key";
dns = [ "192.168.0.4" "9.9.9.9" ];
peers = [ peers = [
{ {
publicKey = "bT/U8ko3i//vH8LNn2R56JkGMg+0GLFrZSF81BBax08="; publicKey = "bT/U8ko3i//vH8LNn2R56JkGMg+0GLFrZSF81BBax08=";

1
overlays/default.nix
View file

@ -1,5 +1,6 @@
{ inputs }: final: prev: { { inputs }: final: prev: {
agenix = inputs.agenix.packages.${prev.system}.default; agenix = inputs.agenix.packages.${prev.system}.default;
attic = inputs.attic.packages.${prev.system}.default;
hyprpaper = inputs.hyprpaper.packages.${prev.system}.default; hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
neovim-nightly = inputs.neovim.packages.${prev.system}.default; neovim-nightly = inputs.neovim.packages.${prev.system}.default;
nil = inputs.nil.packages.${prev.system}.default; nil = inputs.nil.packages.${prev.system}.default;