Skip to content

Commit ac49326

Browse files
TchekdaTchekda
committed
chore: commit all changes
1 parent 1ba8a66 commit ac49326

14 files changed

+73
-145
lines changed

‎gretchen/configuration.nix

+6-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ let
88
in
99
{
1010
imports =
11-
[ # Include the results of the hardware scan.
11+
[
12+
# Include the results of the hardware scan.
1213
./hardware-configuration.nix
1314
<home-manager/nixos>
1415
../tchekda_user.nix
@@ -35,11 +36,11 @@ in
3536
gnome.excludePackages = (with pkgs; [
3637
gnome-photos
3738
gnome-tour
39+
gedit # text editor
3840
]) ++ (with pkgs.gnome; [
3941
cheese # webcam tool
4042
gnome-music
4143
gnome-terminal
42-
gedit # text editor
4344
epiphany # web browser
4445
geary # email reader
4546
evince # document viewer
@@ -84,7 +85,7 @@ in
8485
enableAllFirmware = true; # For wifi : https://github.com/NixOS/nixos-hardware/issues/8
8586
enableRedistributableFirmware = true;
8687

87-
firmware = with pkgs; [];
88+
firmware = with pkgs; [ ];
8889

8990
i2c.enable = true;
9091

@@ -129,7 +130,7 @@ in
129130
i18n.defaultLocale = "en_US.UTF-8";
130131

131132
location.provider = "geoclue2";
132-
133+
133134
nix = {
134135
extraOptions = "experimental-features = nix-command flakes";
135136
gc = {
@@ -309,7 +310,7 @@ in
309310

310311
useGlamor = true;
311312

312-
# videoDrivers = [ "nvidia" ];
313+
# videoDrivers = [ "nvidia" ];
313314

314315
windowManager = {
315316
i3 = {

‎home-manager/aurora.nix

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ in
4343
alpha = generic {
4444
channel = "alpha";
4545
downloadId = "70";
46-
sha256 = "sha256-4IW/wFhq8gPmLA/x5nbVlTgfcdkBB6ChWQEAusebBUE=";
47-
version = "1.0.30a";
46+
sha256 = "sha256-lcyZhRmDUUCrfgFK1SF9kOyBEBg1im8Bb2LfbWTr9h8=";
47+
version = "1.0.33a";
4848
};
4949
beta = generic {
5050
channel = "beta";
5151
downloadId = "90";
52-
sha256 = "sha256-4bV+UWYCGmkTM7ePC/T4y1BiNm84n0LRL7/EfNgWHAc=";
53-
version = "1.0.30b";
52+
sha256 = "sha256-4AI/u1NHEbyCxM0yiAKV6WUfCwIP3FZNfBMaQlKlDgI=";
53+
version = "1.0.33b";
5454
};
5555
public = generic {
5656
channel = "public";
5757
downloadId = "98";
58-
sha256 = "sha256-1WOVehe8b8mSaDWpmcGyohxD+UQt/8D1Q0++13MvS7k=";
59-
version = "1.0.30b";
58+
sha256 = "sha256-0IKBdnJ0Bsocu2cXyAYOehKHV0sTFMNf++QrK9z4njI=";
59+
version = "1.0.33b";
6060
};
6161
}

‎home-manager/desktop-packages.nix

+8-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ in
2626
lxappearance
2727
# adapta-gtk-theme
2828
gnome3.adwaita-icon-theme
29-
pcmanfm
3029
gnome3.gnome-calculator
30+
gnome.gnome-power-manager
31+
pcmanfm
3132
libgnome-keyring
3233
libreoffice
3334
hunspell
@@ -43,9 +44,12 @@ in
4344
vlc
4445
simplescreenrecorder
4546
];
46-
services.flameshot = {
47-
enable = true;
48-
# package = flameshot;
47+
services = {
48+
flameshot = {
49+
enable = true;
50+
# package = flameshot;
51+
};
52+
gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
4953
};
5054
systemd.user.targets.tray = {
5155
Unit = {

‎home-manager/gretchen/default.nix

+1-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ in
2020

2121
home = {
2222

23-
packages = [aurora];
23+
packages = [ aurora ];
2424

2525
sessionPath = [
2626
"/home/tchekda/.yarn/bin"
@@ -60,12 +60,6 @@ in
6060

6161
gnome-keyring.enable = true;
6262

63-
gpg-agent = {
64-
enable = true;
65-
enableExtraSocket = true;
66-
pinentryFlavor = "tty";
67-
};
68-
6963
mpris-proxy.enable = true;
7064

7165
picom = {

‎home-manager/home.nix

+4-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ in
5151
home-manager.enable = true;
5252
command-not-found.enable = true;
5353

54-
man.generateCaches = false;
54+
man.enable = false;
5555

5656
htop.enable = true;
5757

@@ -75,9 +75,10 @@ in
7575
gpg-agent = {
7676
enable = true;
7777
defaultCacheTtl = 7200;
78-
maxCacheTtl = 7200;
79-
# pinentryFlavor = "curses";
8078
enableSshSupport = true;
79+
enableExtraSocket = true;
80+
maxCacheTtl = 7200;
81+
pinentryPackage = pkgs.pinentry-tty;
8182
};
8283
};
8384

‎home-manager/hspecter/default.nix

+3-6
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ in
3030
"/home/tchekda/.yarn/bin"
3131
];
3232
sessionVariables = {
33+
# https://github.com/ionic-team/vscode-ionic/issues/151#issuecomment-2129296199
34+
COREPACK_ENABLE_AUTO_PIN = "0";
35+
3336
EDITOR = "vim";
3437

3538
HTTPSTAT_SAVE_BODY = "false";
@@ -71,12 +74,6 @@ in
7174

7275
gnome-keyring.enable = true;
7376

74-
gpg-agent = {
75-
enable = true;
76-
enableExtraSocket = true;
77-
pinentryFlavor = "tty";
78-
};
79-
8077
mpris-proxy.enable = true;
8178

8279
picom = {

‎home-manager/hspecter/packages.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ in
110110
# wkhtmltopdf
111111
# mailcatcher
112112
httpstat
113-
dbeaver
113+
dbeaver-bin
114114
# redli # Thanks to me :)
115115
arandr
116116
ventoy-bin
@@ -145,7 +145,7 @@ in
145145
zoom-us
146146
slack
147147
filezilla
148-
nixopsUnstable
148+
nixops_unstable_minimal
149149
termius
150150
transmission-gtk
151151
gimp

‎hspecter/configuration.nix

+28-24
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ in
107107
gnome.excludePackages = (with pkgs; [
108108
gnome-photos
109109
gnome-tour
110+
gedit # text editor
110111
]) ++ (with pkgs.gnome; [
111112
cheese # webcam tool
112113
gnome-music
113114
gnome-terminal
114-
gedit # text editor
115115
epiphany # web browser
116116
geary # email reader
117117
evince # document viewer
@@ -159,6 +159,15 @@ in
159159

160160
hardware = {
161161

162+
amdgpu = {
163+
amdvlk = {
164+
enable = true;
165+
support32Bit.enable = true;
166+
};
167+
initrd.enable = true;
168+
opencl.enable = true;
169+
};
170+
162171
bluetooth = {
163172
enable = true;
164173
# hsphfpd.enable = true;
@@ -175,7 +184,6 @@ in
175184
};
176185
};
177186

178-
179187
cpu.amd.updateMicrocode = true;
180188

181189
enableAllFirmware = true; # For wifi : https://github.com/NixOS/nixos-hardware/issues/8
@@ -363,7 +371,8 @@ in
363371

364372
avahi = {
365373
enable = true;
366-
nssmdns = true; # Restart nscd in case stops working again
374+
nssmdns4 = true; # Restart nscd in case stops working again
375+
nssmdns6 = true; # Restart nscd in case stops working again
367376
ipv4 = true;
368377
ipv6 = true;
369378
publish = {
@@ -393,14 +402,17 @@ in
393402
at-spi2-core.enable = true;
394403
};
395404

405+
libinput = {
406+
enable = true;
407+
touchpad = {
408+
naturalScrolling = true;
409+
accelProfile = "flat";
410+
disableWhileTyping = true;
411+
};
412+
};
413+
396414
logind = {
397-
lidSwitch = "suspend-then-hibernate";
398-
lidSwitchExternalPower = "ignore";
399-
lidSwitchDocked = "ignore";
400-
extraConfig = ''
401-
HandlePowerKey=suspend-then-hibernate
402-
HandleSuspendKey=ignore
403-
'';
415+
lidSwitch = "suspend";
404416
};
405417

406418
openssh.enable = true;
@@ -451,8 +463,8 @@ in
451463
pkgs.cnijfilter2
452464
pkgs.gutenprint
453465
pkgs.hplipWithPlugin
454-
dcpj515wDriver.driver
455-
dcpj515wDriver.cupswrapper
466+
# dcpj515wDriver.driver
467+
# dcpj515wDriver.cupswrapper
456468
];
457469
enable = true;
458470
logLevel = "error";
@@ -534,17 +546,6 @@ in
534546
''
535547
];
536548

537-
layout = "us";
538-
539-
libinput = {
540-
enable = true;
541-
touchpad = {
542-
naturalScrolling = true;
543-
accelProfile = "flat";
544-
disableWhileTyping = true;
545-
};
546-
};
547-
548549
# useGlamor = true;
549550

550551
videoDrivers = [ "amdgpu" ];
@@ -560,7 +561,10 @@ in
560561
};
561562
};
562563

563-
xkbVariant = "altgr-intl";
564+
xkb = {
565+
layout = "us";
566+
variant = "altgr-intl";
567+
};
564568

565569

566570
};

‎llitt/configuration.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
ipv6.addresses = [{ address = "2a01:e0a:7a:641::1"; prefixLength = 64; }];
7777
};
7878

79-
nameservers = [ "127.0.0.1" "1.1.1.1" "2606:4700:4700::1111" ];
79+
nameservers = [ "1.1.1.1" "2606:4700:4700::1111" ];
8080

8181
resolvconf.enable = false;
8282
};

‎llitt/containers.nix

+3-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# crash the whole service.
1515
check=$(${dockercli} network ls | grep "local_net" || true)
1616
if [ -z "$check" ]; then
17-
${dockercli} network create local_net --subnet=2a01:0e0a:02b1:f401:2::/80 --gateway=2a01:e0a:2b1:f401:2::1 --ipv6
17+
${dockercli} network create local_net --subnet=2a01:e0a:7a:641:2::/80 --gateway=2a01:e0a:7a:641:2::1 --ipv6
1818
else
1919
echo "local_net already exists in docker"
2020
fi
@@ -23,7 +23,7 @@
2323
virtualisation = {
2424
docker = {
2525
enable = true;
26-
extraOptions = "--ipv6 --fixed-cidr-v6 2a01:0e0a:02b1:f401:1::/80";
26+
extraOptions = "--ipv6 --fixed-cidr-v6 2a01:e0a:7a:641:1::/80";
2727
autoPrune.enable = true;
2828
};
2929
oci-containers = {
@@ -36,17 +36,14 @@
3636
"/var/lib/dnsmasq.d:/etc/dnsmasq.d/"
3737
];
3838
ports = [
39-
# "0.0.0.0:53:53"
40-
"53:53/tcp"
41-
"53:53/udp"
4239
"127.0.0.1:3080:80"
4340
];
4441
environment = {
4542
TZ = "Europe/Paris";
4643
PIHOLE_DNS_ = "2606:4700:4700::1111;1.1.1.1;1.0.0.1;2606:4700:4700::1001";
4744
DNSSEC = "true";
4845
DNS_BOGUS_PRIV = "false";
49-
ServerIP = "192.168.2.253";
46+
ServerIP = "192.168.0.144";
5047
};
5148
extraOptions = [
5249
"--cap-add=NET_ADMIN"
@@ -55,8 +52,6 @@
5552
];
5653
# workdir = "/var/lib/pihole/";
5754
};
58-
59-
6055
home-assistant = {
6156
# image = "homeassistant/raspberrypi4-homeassistant:stable";
6257
image = "ghcr.io/home-assistant/home-assistant:stable";

‎llitt/nginx.nix

+8
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@
3939
'';
4040
};
4141
};
42+
"solver.tchekda.fr" = {
43+
default = false;
44+
http2 = true;
45+
enableSSL = false;
46+
locations."/" = {
47+
proxyPass = "http://127.0.0.1:8191";
48+
};
49+
};
4250
};
4351
};
4452
security.acme = {

‎llitt/nixops.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
llitt = {
99
deployment = {
1010
targetEnv = "none";
11-
targetHost = "llitt";
12-
# targetPort = 2217;
11+
targetHost = "192.168.0.144";
12+
targetPort = 22;
1313
};
1414

1515
nixpkgs = {

0 commit comments

Comments
 (0)