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

Compare commits

base: moritz:57f2094c446d16e2214e89f8feb8d4cc3cf4a6ad
Branches Tags
moritz:nixos
...
compare: moritz:a66a17984ea43106149320ff2676d830476d8319
Branches Tags
moritz:nixos

7 Commits
57f2094c44 ... a66a17984e

Author SHA1 Message Date
Moritz Böhme a66a17984e
Merge remote-tracking branch 'origin/nixos' into nixos 2023-05-27 12:03:51 +02:00
Moritz Böhme 069aaa55bb
build: update inputs 2023-05-27 12:03:28 +02:00
Moritz Böhme 6e33ac7509
feat(git): replace delta with difftastic 2023-05-27 12:01:36 +02:00
Moritz Böhme e51a263590
feat: add idea for desktop 2023-05-27 12:01:06 +02:00
Moritz Böhme d2111cc645
feat(code)!: improve interface 2023-05-27 12:00:08 +02:00
Moritz Böhme a6e8356cb5
feat(nvim)!: remove unused plugins 2023-05-27 11:59:07 +02:00
Moritz Böhme 83ed573c54
feat: add ouch 2023-05-27 11:58:10 +02:00
10 changed files with 138 additions and 90 deletions
Show Stats Expand all files Collapse all files

138
flake.lock
View File

@ -3,16 +3,17 @@
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1682101079, "lastModified": 1684153753,
"narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", "rev": "db5637d10f797bb251b94ef9040b237f4702cde3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -69,11 +70,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681335578, "lastModified": 1683433501,
"narHash": "sha256-yIZqE6WpkgAllsJ7IAbn8k6IRz/0CS/xp6IR+8yrEP8=", "narHash": "sha256-9L+OZeU3bcNZ55mhMINBxnqskbaEU0mhiZIMhkEtNl0=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "171c89fbe0f099e8bf6e466a1a1a12578f703f0e", "rev": "5f85e35a25085b75e1cbb6cc7291726fa4fab2ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -85,11 +86,11 @@
"bufferline-nvim": { "bufferline-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1683111101, "lastModified": 1684703438,
"narHash": "sha256-KiJ/jyqNCW28dazs6ex7Ng5TjRetZFjQunsmG5Wp5C8=", "narHash": "sha256-WM8/dHqiEykuw0qEQtenM5Rcv/Jr3Jxj5vulC/IKfAE=",
"owner": "akinsho", "owner": "akinsho",
"repo": "bufferline.nvim", "repo": "bufferline.nvim",
"rev": "41660189da6951d14436147dff30ed7f0d12ed01", "rev": "32d74d5d044f7cc89892d4781a83d55ee4ed552a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +134,11 @@
"copilot-lua": { "copilot-lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1683276482, "lastModified": 1683572689,
"narHash": "sha256-xZFDqZUdrD69LuUIu8MjhZ8WFH0hC5yX5nYKJkxzlJs=", "narHash": "sha256-+dqwwBHDRh1vmbgx8o1RVMEAN7Hlr5I5L71wdagDo/o=",
"owner": "zbirenbaum", "owner": "zbirenbaum",
"repo": "copilot.lua", "repo": "copilot.lua",
"rev": "8b0fd23747ef82154ef9f919c75623156465cc89", "rev": "653bbdc44cd569a5fd0617e5a9d3df2b1359e230",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +271,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680392223, "lastModified": 1683560683,
"narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -510,15 +511,36 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"agenix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1683276742, "lastModified": 1682203081,
"narHash": "sha256-QURv/m81hd6TN5RMjlSHhE1zLpXHsvDEm66qv3MRBsM=", "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "38271ead8e7b291beb9d3b8312e66c3268796c0a", "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1684824189,
"narHash": "sha256-k3nCkn5Qy67rCguuw6YkGuL6hOUNRKxQoKOjnapk5sU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "58eb968c21d309a6c2b020ea8d64e25c38ceebba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -532,11 +554,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1683107384, "lastModified": 1684479483,
"narHash": "sha256-maCeGSr7UaxMzHgqHBtahwhf8nhenTytJnCWOA+DoXI=", "narHash": "sha256-NCkOkgR7PtkAQmYgeYd6vOzkulQjxlf+vWGUmrQu4uw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "a5792efdb113e9e971dc6fe5114fee814afbfb81", "rev": "805bedf51a2f75a2279b6fc75b3066ff21f235ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -553,11 +575,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1683276380, "lastModified": 1684844798,
"narHash": "sha256-Sd8dfgA46ov9bynmGysBXsrqGuqi49Pa3OrUvPtSXQE=", "narHash": "sha256-ZrMXFoEA535jOZ+eDA3s+URZ5MkVRksBgL5qGnb6Ciw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "d1d4683c9162aa4777a4a0da0691ba8c0bd6b7e7", "rev": "eb1f832fcec5838053c6b031b656e4f949ada57b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -592,11 +614,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1682542538, "lastModified": 1684265311,
"narHash": "sha256-752hHXEGsvKdw1Hm2LoFfi6sj2zVxu2AuKi4sRA7HN0=", "narHash": "sha256-zFOShOYS7zMcyCT9bFQlWB/ZtTelAFKKGUq4XBRQLE0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "b4fdc0be52d7c3e48e932698bafc3f69dbd45b3b", "rev": "b82254e957cfa60124240e8d94e7368cbf6d392d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -608,11 +630,11 @@
"lspsaga-nvim": { "lspsaga-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1683277504, "lastModified": 1684482876,
"narHash": "sha256-0F5Lyp/XWMTd01YuLKEIk3Xg1pLy6enRMbisQHioRmY=", "narHash": "sha256-ETT0HPLTA6ZO2C51+YXQ2PTkol61Azzn9FhLhmObrr8=",
"owner": "glepnir", "owner": "glepnir",
"repo": "lspsaga.nvim", "repo": "lspsaga.nvim",
"rev": "76696bed4397c3b58563c246dc1f7856ed4af023", "rev": "01b9633aefd010f272d6c7e3d8293c44fcfe7696",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,11 +645,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1683293296, "lastModified": 1684857135,
"narHash": "sha256-bDFpYbryuE2wSy3iRbkyD1kX6P9YW+fGhc7sYHDRW8o=", "narHash": "sha256-MrX+6QO3xf+Gkm+BgU45jBB/l9XRvH/hGsLfx8fEetU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f797fa93d996ed714c2877af0a663dd0a99d10b", "rev": "499cad7a722caf0bebb2a382a67fa39c992acebd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -646,11 +668,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1682581904, "lastModified": 1684757802,
"narHash": "sha256-9P4T2erXXrPxXTTLgD29U/IdKCOYqP4xbwdYswtVBA8=", "narHash": "sha256-Uo8HJ5j33mzgfrpK2zo0N/vgzTFG8KhMBE4+M1C9oCo=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "d321deb4a9b05e9d81b79ac166274f4a6e7981bf", "rev": "07883940b2294e0ab32fb58e6624d18d9dd1715a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -669,11 +691,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1682955971, "lastModified": 1684800319,
"narHash": "sha256-6Orm5CIh/Zz3X/RHbMbLnii5jSyEjLxV9KF7lrrI5pA=", "narHash": "sha256-cyR9g1WSX1WCPGOgL/JXjzwir0Db7k9WMWfwuMgMl5w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "a9719c5050b1abbb0adada7dd9f98e0cdbd3ed53", "rev": "1d9dcda97f8d16214821ace2cf92f61f1cc348c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -693,11 +715,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1683254762, "lastModified": 1684534870,
"narHash": "sha256-BjJ3hNPCGBHJ/PttVFdVc2ogDAQqrOLSuWqLPAl72Lw=", "narHash": "sha256-QrOkY6Ei/7FZg50Ht8iC9ryqrQyBzjtnSQoftL8ZNNc=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "c2f303fd8be05039958b5fefcd0ea38e362cf04b", "rev": "17ed1578f3a225f2760d4da3adb440eb8677f2d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -813,11 +835,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1674641431, "lastModified": 1683014792,
"narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -845,11 +867,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1682929865, "lastModified": 1684724044,
"narHash": "sha256-jxVrgnf5QNjO+XoxDxUWtN2G5xyJSGZ5SWDQFxMuHxc=", "narHash": "sha256-OysG4ORx60BcUyBVClbOBVybqZ4Ep8Xh8EIDvNam4WU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f2e9a130461950270f87630b11132323706b4d91", "rev": "b31c968ff28927d477eed85012e8090578c70852",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -861,11 +883,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1683267615, "lastModified": 1684759798,
"narHash": "sha256-A/zAy9YauwdPut90h6cYC1zgP/WmuW9zmJ+K/c5i6uc=", "narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0b6445b611472740f02eae9015150c07c5373340", "rev": "c7eb65213bd7d95eafb8c5e2e181f04da103d054",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -916,11 +938,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1682596858, "lastModified": 1684842236,
"narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=", "narHash": "sha256-rYWsIXHvNhVQ15RQlBUv67W3YnM+Pd+DuXGMvCBq2IE=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "fb58866e20af98779017134319b5663b8215d912", "rev": "61e567d6497bc9556f391faebe5e410e6623217f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -968,7 +990,7 @@
"copilot-lua": "copilot-lua", "copilot-lua": "copilot-lua",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"gitignore-nvim": "gitignore-nvim", "gitignore-nvim": "gitignore-nvim",
"home-manager": "home-manager", "home-manager": "home-manager_2",
"hypr-contrib": "hypr-contrib", "hypr-contrib": "hypr-contrib",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
@ -1053,11 +1075,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1683207485, "lastModified": 1684661732,
"narHash": "sha256-gs+PHt/y/XQB7S8+YyBLAM8LjgYpPZUVFQBwpFSmJro=", "narHash": "sha256-2/Xo/UmUUoMXc0T5tzoUsYjMLLMjEfzRWDAQB0WwtW0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cc45a3f8c98e1c33ca996e3504adefbf660a72d1", "rev": "b0671cbf1e5c443f7fbfd4941ee0f8a151435114",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
hosts/nixos-desktop/default.nix
View File

@ -22,6 +22,10 @@
programs.ledger.enable = true; programs.ledger.enable = true;
}; };
home-manager.users.moritz.home.packages = with pkgs; [
jetbrains.idea-community
];
# KERNEL # KERNEL
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
@ -31,7 +35,6 @@
loader = { loader = {
grub = { grub = {
enable = true; enable = true;
version = 2;
device = "nodev"; device = "nodev";
efiSupport = true; efiSupport = true;
useOSProber = true; useOSProber = true;

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

@ -25,7 +25,6 @@
loader = { loader = {
grub = { grub = {
enable = true; enable = true;
version = 2;
device = "nodev"; device = "nodev";
efiSupport = true; efiSupport = true;
}; };

4
modules/profiles/base.nix
View File

@ -84,9 +84,7 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# archives # archives
p7zip ouch
unzip
zip
# file management # file management
trash-cli trash-cli

58
modules/programs/code.nix
View File

@ -9,21 +9,57 @@ let
cfg = config.my.programs.code; cfg = config.my.programs.code;
in in
{ {
options.my.programs.code.enable = mkEnableOption "code"; options.my.programs.code = {
enable = mkEnableOption "code";
config = mkIf cfg.enable { package = mkOption {
home-manager.users.moritz = { type = types.package;
programs.vscode = { default = pkgs.vscode;
enable = true; };
package = pkgs.vscode-fhsWithPackages (ps: with ps; [ git ]); extensions = mkOption {
extensions = with pkgs.vscode-extensions; [ type = types.listOf types.package;
default = with pkgs.vscode-extensions; [
bbenoist.nix bbenoist.nix
dracula-theme.theme-dracula
esbenp.prettier-vscode
pkief.material-icon-theme
vscodevim.vim vscodevim.vim
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{
name = "copilot-nightly";
publisher = "GitHub";
version = "1.86.118";
sha256 = "04nspnmd5cfnv3m9igww6h6la6pvhdqzqmdnbm1znapxqiw2m927";
}
{
name = "copilot-chat";
publisher = "GitHub";
version = "0.1.2023052602";
sha256 = "0anlzzs4g7c9mmw7yxy5bgjcs0niwa3bswgvhwspf5fh8bbq5n44";
}
]; ];
}; };
wayland = mkOption {
type = types.bool;
default = true;
}; };
}; };
config = mkIf cfg.enable {
environment.systemPackages =
let
withExtensions = pkgs.vscode-with-extensions.override {
vscode = cfg.package;
vscodeExtensions = cfg.extensions;
};
maybeExtensions = if cfg.extensions == [ ] then cfg.package else withExtensions;
withWayland = pkgs.symlinkJoin {
name = "${maybeExtensions.name}-wayland";
paths = [ maybeExtensions ];
nativeBuildInputs = [ pkgs.makeWrapper ];
postBuild = ''
wrapProgram $out/bin/code* \
--set NIXOS_OZONE_WL 1
'';
};
final = if cfg.wayland then withWayland else maybeExtensions;
in
[ final ];
};
} }

3
modules/programs/git.nix
View File

@ -1,5 +1,6 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:
@ -51,8 +52,8 @@ in
extraConfig = { extraConfig = {
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.conflictstyle = "zdiff3"; merge.conflictstyle = "zdiff3";
diff.external = getExe pkgs.difftastic;
}; };
delta.enable = true;
signing = mkIf cfg.signing { signing = mkIf cfg.signing {
key = "0x970C6E89EB0547A9"; key = "0x970C6E89EB0547A9";
signByDefault = true; signByDefault = true;

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

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

3
modules/programs/nvim/plugins/gitignore-nvim.lua
View File

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

3
modules/programs/nvim/plugins/twilight-nvim.lua
View File

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

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

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