Skip to content

Commit 7fbc03a

Browse files
TchekdaTchekda
committed
chore: commit all changes
1 parent 4411503 commit 7fbc03a

31 files changed

+810
-198
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ home-manager/hspecter/result
33
home-manager/swheeler/appart.secrets.nix
44
hspecter/wg*
55
hspecter/smb-secrets
6-
result
6+
result*
77
**/dn42/peers/tunnels.nix
88
ssl/*pem
99
**/**.key

‎hgunderson/wireguard.nix

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
allowedIPsAsRoutes = false;
2626
peers = [
2727
{
28-
publicKey = "OpbpDL+E4VOgzGTXga8F3h2aNqlVX6ZKowsWWa83rDA="; # Tablet
28+
publicKey = "OpbpDL+E4VOgzGTXga8F3h2aNqlVX6ZKowsWWa83rDA="; # Tablet Dad
2929
allowedIPs = [ "192.168.5.2/32" "fd42:42:42::2/128" ];
3030
persistentKeepalive = 25;
3131
}
@@ -44,6 +44,11 @@
4444
allowedIPs = [ "192.168.5.5/32" "fd42:42:42::5/128" ];
4545
persistentKeepalive = 25;
4646
}
47+
{
48+
publicKey = "9zK1uREqqU9lFQQSgLpkj0GxDqU6Q4AzfvMXLDbtABU="; # Tablet Mom
49+
allowedIPs = [ "192.168.5.6/32" "fd42:42:42::6/128" ];
50+
persistentKeepalive = 25;
51+
}
4752
];
4853
postSetup = ''
4954
${pkgs.iptables}/bin/iptables -t nat -I POSTROUTING -o ens3 -j MASQUERADE

‎home-manager/aurora.nix

+5-7
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ let
2424
install -m 444 -D ${appimageContents}/aurora-electron.desktop $out/share/applications/${pname}.desktop
2525
substituteInPlace $out/share/applications/${pname}.desktop \
2626
--replace 'Exec=AppRun' 'Exec=${pname}' \
27-
--replace 'Name=Aurora' 'Name=Aurora ${version} (${channel})'
27+
--replace 'Name=Aurora' 'Name=Aurora ${channel} (${version})'
2828
'' + pkgs.lib.strings.optionalString (channel == "public") ''
29+
mkdir -p $out/share/icons/hicolor/512x512/apps
2930
cp -r ${appimageContents}/usr/share/icons $out/share
30-
'';
31-
32-
profile = ''
33-
export LC_ALL=fr_FR.UTF-8
31+
cp $out/share/icons/hicolor/0x0/apps/aurora-electron.png $out/share/icons/hicolor/512x512/apps/aurora-electron.png
3432
'';
3533

3634
meta = with pkgs.lib; {
@@ -45,13 +43,13 @@ in
4543
alpha = generic {
4644
channel = "alpha";
4745
downloadId = "70";
48-
sha256 = "sha256-+xKNeQONRGi8bnd8O8qgWQRY34j2p4yAJY9rmAhqETs=";
46+
sha256 = "sha256-jGya2EN7s7l53UVsyWo4UA+OQwWlBamKgw/pltl+Ldk=";
4947
version = "1.0.27a";
5048
};
5149
beta = generic {
5250
channel = "beta";
5351
downloadId = "90";
54-
sha256 = "sha256-RGJ5/+fBj8tqpF/sH8fOUNurqMBpWg7eDN/ayyndkc0=";
52+
sha256 = "sha256-3fceUjX3Y7//GIcgEynnPufOEadh7K07IMUEUe5tVag=";
5553
version = "1.0.28b";
5654
};
5755
public = generic {

‎home-manager/desktop-packages.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ in
77
# Dependencies
88
feh
99
libnotify
10-
hicolor-icon-theme
1110
# Utils
1211
alacritty
1312
gparted
@@ -46,7 +45,7 @@ in
4645
];
4746
services.flameshot = {
4847
enable = true;
49-
package = unstable.flameshot;
48+
# package = flameshot;
5049
};
5150
systemd.user.targets.tray = {
5251
Unit = {

‎home-manager/fish.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ia = "ip a";
1616
s = "sudo";
1717
ls = "ls -lsah";
18-
gs = "git status";
18+
gs = "git status -u";
1919
ga = "git add .";
2020
gc = "git commit -a -m \"\"";
2121
gp = "git push";

‎home-manager/git.nix

+18
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,24 @@
3131
".yalc/"
3232
"yalc*"
3333
"*.swp"
34+
"compile_commands.json"
35+
".cache/"
36+
".clang_format"
37+
];
38+
extraConfig.push.autoSetupRemote = true;
39+
includes = [
40+
{
41+
path = "~/Prog/IVAO/.gitconfig";
42+
condition = "gitdir:~/Prog/IVAO/";
43+
}
44+
{
45+
path = "~/Prog/Deloitte/.gitconfig";
46+
condition = "gitdir:~/Prog/Deloitte/";
47+
}
48+
{
49+
path = "~/Prog/EPITA/.gitconfig";
50+
condition = "gitdir:~/Prog/EPITA/";
51+
}
3452
];
3553
};
3654
}

‎home-manager/hspecter/android.nix

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{ pkgs, ... }: {
2+
home = {
3+
packages = with pkgs; [
4+
android-studio
5+
];
6+
sessionPath = [ "$HOME/Android/Sdk/platform-tools" ];
7+
sessionVariables = {
8+
ANDROID_HOME = "$HOME/Android/Sdk";
9+
};
10+
};
11+
}

‎home-manager/hspecter/default.nix

+51-52
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@ in
99
{
1010
imports = [
1111
../home.nix
12-
../battery.nix
12+
# ../battery.nix
1313
./packages.nix
1414
../desktop-packages.nix
1515
./ssh.nix
1616
../alacritty.nix
1717
./autorandr.nix
1818
../i3.nix
19-
./polybar.nix
19+
# ./polybar.nix
2020
../dunst.nix
2121
./vim.nix
22-
./neovim.nix
22+
../neovim/default.nix
2323
./helix.nix
24+
# ./android.nix
2425
];
2526

2627
home = {
@@ -33,8 +34,8 @@ in
3334
HTTPSTAT_SAVE_BODY = "false";
3435
NIXPKGS_ALLOW_UNFREE = "1";
3536

36-
NIX_CFLAGS_COMPILE_x86_64_unknown_linux_gnu = "-I/run/current-system/sw/include";
37-
NIX_CFLAGS_LINK_x86_64_unknown_linux_gnu = "-L/run/current-system/sw/lib:/home/tchekda/.nix-profile/lib";
37+
NIX_CFLAGS_COMPILE_x86_64_unknown_linux_gnu = "-I/run/current-system/sw/include -I/home/tchekda/.nix-profile/include";
38+
NIX_CFLAGS_LINK_x86_64_unknown_linux_gnu = "-L/run/current-system/sw/lib -L/home/tchekda/.nix-profile/lib";
3839

3940
IDEA_JDK = "/run/current-system/sw/lib/openjdk/";
4041
PKG_CONFIG_PATH = "/run/current-system/sw/lib/pkgconfig:/home/tchekda/.nix-profile/lib/pkgconfig";
@@ -54,24 +55,22 @@ in
5455

5556
home-manager.enable = true;
5657

57-
# man.generateCaches = true;
58-
59-
ssh.extraOptionOverrides = {
60-
"IdentityFile" = "~/.ssh/id_ecdsa_sk";
61-
};
58+
man.generateCaches = true;
6259

6360
vscode = {
6461
enable = true;
65-
package = pkgs.vscode;
62+
package = unstable.vscode;
63+
extensions = with pkgs.vscode-extensions; [
64+
llvm-vs-code-extensions.vscode-clangd
65+
];
6666
};
6767
};
6868

6969
services = {
7070

71-
caffeine.enable = true;
71+
caffeine.enable = false;
7272

73-
74-
dropbox.enable = true;
73+
# dropbox.enable = true;
7574

7675
gnome-keyring.enable = true;
7776

@@ -84,7 +83,7 @@ in
8483
mpris-proxy.enable = true;
8584

8685
picom = {
87-
enable = true;
86+
enable = false;
8887
vSync = true;
8988
shadow = true;
9089
shadowExclude = [ "window_type *= 'normal' && ! name ~= ''" ];
@@ -96,43 +95,43 @@ in
9695

9796
systemd.user.services = {
9897

99-
dropbox.Install.WantedBy = lib.mkForce [ ];
100-
101-
xautolock = {
102-
Unit = {
103-
Description = "xautolock, session locker service";
104-
After = [ "graphical-session-pre.target" ];
105-
PartOf = [ "graphical-session.target" ];
106-
};
107-
108-
Install = { WantedBy = [ "graphical-session.target" ]; };
109-
110-
Service = {
111-
ExecStart = ''
112-
${pkgs.xautolock}/bin/xautolock -noclose -detectsleep -time 60 \
113-
-locker "${pkgs.i3lock-color}/bin/i3lock-color -ti ${screenlocker} \
114-
--clock --pass-media-keys --pass-screen-keys --pass-power-keys --pass-volume-keys" \
115-
-notifier "${pkgs.libnotify}/bin/notify-send 'Locking in 30 seconds'" -notify 30 \
116-
'';
117-
# -killer "/run/current-system/systemd/bin/systemctl hibernate" -killtime 15
118-
Restart = "on-failure";
119-
};
120-
};
121-
122-
xss-lock = {
123-
Unit = {
124-
Description = "xss-lock, session locker service";
125-
After = [ "graphical-session-pre.target" ];
126-
PartOf = [ "graphical-session.target" ];
127-
};
128-
129-
Install = { WantedBy = [ "graphical-session.target" ]; };
130-
131-
Service = {
132-
Environment = "XDG_SESSION_TYPE=x11";
133-
ExecStart = "${pkgs.xss-lock}/bin/xss-lock -l -s \${XDG_SESSION_ID} -- ${pkgs.xautolock}/bin/xautolock -locknow";
134-
};
135-
};
98+
# dropbox.Install.WantedBy = lib.mkForce [ ];
99+
100+
# xautolock = {
101+
# Unit = {
102+
# Description = "xautolock, session locker service";
103+
# After = [ "graphical-session-pre.target" ];
104+
# PartOf = [ "graphical-session.target" ];
105+
# };
106+
107+
# Install = { WantedBy = [ "graphical-session.target" ]; };
108+
109+
# Service = {
110+
# ExecStart = ''
111+
# ${pkgs.xautolock}/bin/xautolock -noclose -detectsleep -time 60 \
112+
# -locker "${pkgs.i3lock-color}/bin/i3lock-color -ti ${screenlocker} \
113+
# --clock --pass-media-keys --pass-screen-keys --pass-power-keys --pass-volume-keys" \
114+
# -notifier "${pkgs.libnotify}/bin/notify-send 'Locking in 30 seconds'" -notify 30 \
115+
# '';
116+
# # -killer "/run/current-system/systemd/bin/systemctl hibernate" -killtime 15
117+
# Restart = "on-failure";
118+
# };
119+
# };
120+
121+
# xss-lock = {
122+
# Unit = {
123+
# Description = "xss-lock, session locker service";
124+
# After = [ "graphical-session-pre.target" ];
125+
# PartOf = [ "graphical-session.target" ];
126+
# };
127+
128+
# Install = { WantedBy = [ "graphical-session.target" ]; };
129+
130+
# Service = {
131+
# Environment = "XDG_SESSION_TYPE=x11";
132+
# ExecStart = "${pkgs.xss-lock}/bin/xss-lock -l -s \${XDG_SESSION_ID} -- ${pkgs.xautolock}/bin/xautolock -locknow";
133+
# };
134+
# };
136135

137136
yubikey-touch-detector = {
138137
Unit = {

‎home-manager/hspecter/lens.nix

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
let
44
pname = "lens";
5-
version = "6.3.1";
6-
build = "2023.1.110749-latest";
5+
version = "6.3.0";
6+
build = "2023.5.120950-latest";
77
name = "${pname}-${version}";
88

99
src = fetchurl {
10-
url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage";
11-
sha256 = "sha256-wRi9Hz3o7Fvi4vEhLNdzcaYUeDUUKwpH3rdPkZW9TbY=";
10+
url = "https://api.k8slens.dev/binaries/latest.x86_64.AppImage";
11+
sha256 = "sha256-u4T0vgVx8DqqCkCd4Fk0fJw1dpnd2adUwotrHl9NRxA=";
1212
name = "${pname}.AppImage";
1313
};
1414

@@ -26,11 +26,11 @@ appimageTools.wrapType2 {
2626
source "${makeWrapper}/nix-support/setup-hook"
2727
wrapProgram $out/bin/${pname} \
2828
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
29-
install -m 444 -D ${appimageContents}/lens.desktop $out/share/applications/${pname}.desktop
30-
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/lens.png \
29+
install -m 444 -D ${appimageContents}/lens-desktop.desktop $out/share/applications/${pname}.desktop
30+
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/lens-desktop.png \
3131
$out/share/icons/hicolor/512x512/apps/${pname}.png
3232
substituteInPlace $out/share/applications/${pname}.desktop \
33-
--replace 'Icon=lens' 'Icon=${pname}' \
33+
--replace 'Icon=lens-desktop' 'Icon=${pname}' \
3434
--replace 'Exec=AppRun' 'Exec=${pname}'
3535
'';
3636

‎home-manager/hspecter/neovim.nix

-25
This file was deleted.

0 commit comments

Comments
 (0)