From 94d1f1574f78df717c145e2e6e9bfbae7794a49f Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Fri, 22 Nov 2024 23:23:30 +0100
Subject: [PATCH 1/7] fix nixvim warnings
---
users/willifan/common/nixvim/cmp.nix | 1 -
users/willifan/common/nixvim/lsp.nix | 12 ++++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/users/willifan/common/nixvim/cmp.nix b/users/willifan/common/nixvim/cmp.nix
index 764f074..69070bc 100644
--- a/users/willifan/common/nixvim/cmp.nix
+++ b/users/willifan/common/nixvim/cmp.nix
@@ -23,7 +23,6 @@
option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
keywordLength = 3;
}
- {name = "copilot";}
{
name = "path"; # file system paths
keywordLength = 3;
diff --git a/users/willifan/common/nixvim/lsp.nix b/users/willifan/common/nixvim/lsp.nix
index b029b2f..416aba9 100644
--- a/users/willifan/common/nixvim/lsp.nix
+++ b/users/willifan/common/nixvim/lsp.nix
@@ -8,14 +8,18 @@
enable = true;
inlayHints = true;
servers = {
- clangd = {enable = true;};
+ clangd = {enable = true;};
html = {enable = true;};
- lua-ls = {enable = true;};
- nixd = {enable = true;};
+ lua_ls = {enable = true;};
+ nixd = {enable = true;};
pyright = {enable = true;};
gopls = {enable = true;};
jsonls = {enable = true;};
- rust-analyzer = {enable = true;};
+ rust_analyzer = {
+ enable = true;
+ installCargo = true;
+ installRustc = true;
+ };
yamlls = {enable = true;};
};
From 196d77bc8d7c93f65a60a4ec0921caf05e29c2a0 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sat, 23 Nov 2024 22:25:56 +0100
Subject: [PATCH 2/7] set icon theme
---
users/willifan/common/theme/stylix.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/users/willifan/common/theme/stylix.nix b/users/willifan/common/theme/stylix.nix
index 907a5b4..39ada39 100644
--- a/users/willifan/common/theme/stylix.nix
+++ b/users/willifan/common/theme/stylix.nix
@@ -69,4 +69,11 @@ in
};
};
+ home-manager.users.willifan = {
+ gtk.iconTheme = {
+ name = "Papirus-Dark";
+ package = pkgs.papirus-icon-theme;
+ };
+ };
+
}
From 27e3c170edc0636280aa5b95ecd5ed9809366680 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sat, 23 Nov 2024 22:43:00 +0100
Subject: [PATCH 3/7] temp
---
users/willifan/desktop/applications.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/users/willifan/desktop/applications.nix b/users/willifan/desktop/applications.nix
index f1efda3..8f496e9 100644
--- a/users/willifan/desktop/applications.nix
+++ b/users/willifan/desktop/applications.nix
@@ -27,6 +27,7 @@
UVtools
audacity
+ glib
])
++
[
From 2203a31721ab81c1e6a2e62de5e5f2789b77ac69 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sat, 30 Nov 2024 18:56:17 +0100
Subject: [PATCH 4/7] added protonmail and signal
---
users/willifan/desktop/applications.nix | 46 +++++++++++++------------
1 file changed, 24 insertions(+), 22 deletions(-)
diff --git a/users/willifan/desktop/applications.nix b/users/willifan/desktop/applications.nix
index 8f496e9..4cfd8b2 100644
--- a/users/willifan/desktop/applications.nix
+++ b/users/willifan/desktop/applications.nix
@@ -4,34 +4,36 @@
environment.systemPackages =
(with pkgs; [
- bc
- jq
- xorg.xrandr
+ bc
+ jq
+ xorg.xrandr
- feh
+ feh
- enpass
- vesktop
- obsidian
+ enpass
+ vesktop
+ obsidian
#kicad
+ protonmail-desktop
+ signal-desktop
- piper
+ piper
- qemu
+ qemu
- libreoffice
- blender
- gimp
- inkscape
- prusa-slicer
- UVtools
- audacity
+ libreoffice
+ blender
+ gimp
+ inkscape
+ prusa-slicer
+ UVtools
+ audacity
- glib
- ])
- ++
- [
- attrs.zen.packages.${system}.specific
- ];
+ glib
+ ])
+ ++
+ [
+ attrs.zen.packages.${system}.specific
+ ];
}
From bbb492a6708b4cab017112b1bcb0c71f1463f186 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sun, 1 Dec 2024 11:56:18 +0100
Subject: [PATCH 5/7] fixed stylix contrast for Base0F
---
users/willifan/common/theme/stylix.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/users/willifan/common/theme/stylix.nix b/users/willifan/common/theme/stylix.nix
index 39ada39..29010d6 100644
--- a/users/willifan/common/theme/stylix.nix
+++ b/users/willifan/common/theme/stylix.nix
@@ -19,6 +19,7 @@ in
base16Scheme = "${pkgs.base16-schemes}/share/themes/pasque.yaml";
override = {
base0D = "F3196E";
+ base0F = "CFAACF";
};
cursor = {
From 5b2131fd1d068d7d12ee83d55a61873c90c21166 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sun, 1 Dec 2024 12:10:51 +0100
Subject: [PATCH 6/7] update flake
---
flake.lock | 120 ++++++++++++++++++++++++++---------------------------
1 file changed, 60 insertions(+), 60 deletions(-)
diff --git a/flake.lock b/flake.lock
index 8cc8d32..8cdba86 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
"fromYaml": "fromYaml"
},
"locked": {
- "lastModified": 1708890466,
- "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
+ "lastModified": 1732200724,
+ "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
"owner": "SenchoPens",
"repo": "base16.nix",
- "rev": "665b3c6748534eb766c777298721cece9453fdae",
+ "rev": "153d52373b0fb2d343592871009a286ec8837aec",
"type": "github"
},
"original": {
@@ -53,11 +53,11 @@
"base16-vim": {
"flake": false,
"locked": {
- "lastModified": 1716150083,
- "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
+ "lastModified": 1731949548,
+ "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=",
"owner": "tinted-theming",
"repo": "base16-vim",
- "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
+ "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6",
"type": "github"
},
"original": {
@@ -94,11 +94,11 @@
]
},
"locked": {
- "lastModified": 1731746438,
- "narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=",
+ "lastModified": 1732988076,
+ "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=",
"owner": "nix-community",
"repo": "disko",
- "rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8",
+ "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1",
"type": "github"
},
"original": {
@@ -124,11 +124,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
- "lastModified": 1673956053,
- "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "lastModified": 1696426674,
+ "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
@@ -184,11 +184,11 @@
]
},
"locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@@ -200,11 +200,11 @@
"fromYaml": {
"flake": false,
"locked": {
- "lastModified": 1689549921,
- "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
+ "lastModified": 1731966426,
+ "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
"owner": "SenchoPens",
"repo": "fromYaml",
- "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
+ "rev": "106af9e2f715e2d828df706c386a685698f3223b",
"type": "github"
},
"original": {
@@ -230,11 +230,11 @@
]
},
"locked": {
- "lastModified": 1731363552,
- "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+ "lastModified": 1732021966,
+ "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+ "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github"
},
"original": {
@@ -289,11 +289,11 @@
]
},
"locked": {
- "lastModified": 1731832479,
- "narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=",
+ "lastModified": 1733045511,
+ "narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111",
+ "rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e",
"type": "github"
},
"original": {
@@ -310,11 +310,11 @@
]
},
"locked": {
- "lastModified": 1731604581,
- "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
+ "lastModified": 1732884235,
+ "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
+ "rev": "819f682269f4e002884702b87e445c82840c68f2",
"type": "github"
},
"original": {
@@ -331,11 +331,11 @@
]
},
"locked": {
- "lastModified": 1730837930,
- "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
+ "lastModified": 1732482255,
+ "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
+ "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"type": "github"
},
"original": {
@@ -380,11 +380,11 @@
]
},
"locked": {
- "lastModified": 1731736013,
- "narHash": "sha256-AYB3yeogE9vtBuSStdFFmGR0kzGuumW4nrpdlcuZ/As=",
+ "lastModified": 1732739177,
+ "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "a2c6d8d1acce49de8dc7ed951428aae901908316",
+ "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75",
"type": "github"
},
"original": {
@@ -401,11 +401,11 @@
]
},
"locked": {
- "lastModified": 1731642829,
- "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=",
+ "lastModified": 1732603785,
+ "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
"owner": "lnl7",
"repo": "nix-darwin",
- "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a",
+ "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
"type": "github"
},
"original": {
@@ -438,11 +438,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1731797098,
- "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
+ "lastModified": 1732483221,
+ "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
"owner": "nixos",
"repo": "nixos-hardware",
- "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
+ "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
"type": "github"
},
"original": {
@@ -453,11 +453,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1731676054,
- "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+ "lastModified": 1732837521,
+ "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+ "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
"type": "github"
},
"original": {
@@ -469,11 +469,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1731531548,
- "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
+ "lastModified": 1732238832,
+ "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "24f0d4acd634792badd6470134c387a3b039dace",
+ "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
"type": "github"
},
"original": {
@@ -498,11 +498,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1731780782,
- "narHash": "sha256-CG3rcxcZEViYEUTAXatqXrW0Gn9tQvydF+lLYH+0VPA=",
+ "lastModified": 1733010437,
+ "narHash": "sha256-xPf3jjDBDA9oMVnWU5DJ8gINCq2EPiupvF/4rD/0eEI=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "9d99d7cfdbd7f94da9571a4d7bbb9de185241935",
+ "rev": "80e49e7fd3fa720b93d18e6d859d9b9e7aad4a62",
"type": "github"
},
"original": {
@@ -521,11 +521,11 @@
]
},
"locked": {
- "lastModified": 1731582522,
- "narHash": "sha256-1w6aM4bG5cl2E4jHLPnMKkrUO4tY1jUX1NI6/RwJN7Y=",
+ "lastModified": 1731936508,
+ "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
"owner": "NuschtOS",
"repo": "search",
- "rev": "13300b2297c51368e0892c3ebe220f688014fe15",
+ "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
"type": "github"
},
"original": {
@@ -563,11 +563,11 @@
"tinted-tmux": "tinted-tmux"
},
"locked": {
- "lastModified": 1731849042,
- "narHash": "sha256-AfK26eccWP7IUDAlCF/UzkwI8Ggg949CuTxGLEyiNNA=",
+ "lastModified": 1732993760,
+ "narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=",
"owner": "danth",
"repo": "stylix",
- "rev": "cf5be812bdc889f10ada644e4736138c5757e1e9",
+ "rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe",
"type": "github"
},
"original": {
@@ -643,11 +643,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
- "lastModified": 1696725902,
- "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
+ "lastModified": 1729501581,
+ "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
- "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
+ "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14",
"type": "github"
},
"original": {
@@ -664,11 +664,11 @@
]
},
"locked": {
- "lastModified": 1730321837,
- "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
+ "lastModified": 1732894027,
+ "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
+ "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
"type": "github"
},
"original": {
From 9df10f70d58a2b9b63bcef8e1077548dc11f36e6 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sun, 1 Dec 2024 12:14:01 +0100
Subject: [PATCH 7/7] adapted nerd-fonts breaking change
---
users/willifan/common/theme/stylix.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/users/willifan/common/theme/stylix.nix b/users/willifan/common/theme/stylix.nix
index 29010d6..8c5a0d1 100644
--- a/users/willifan/common/theme/stylix.nix
+++ b/users/willifan/common/theme/stylix.nix
@@ -35,7 +35,7 @@ in
# name = "";
# };
monospace = {
- package = pkgs.nerdfonts;
+ package = pkgs.nerd-fonts.jetbrains-mono;
name = "JetBrainsMono Nerd Font";
};
# sansSerif = {