Skip to content

Commit b26adc1

Browse files
TchekdaTchekda
committed
updates
1 parent 6a1b54f commit b26adc1

23 files changed

+323
-132
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ result
88
ssl/*pem
99
**/**.key
1010
hgunderson/qrcode.config
11-
kbennett/fider/secrets.nix
11+
kbennett/fider/secrets.nix
12+
kbennett/cf-apikey

‎hgunderson/configuration.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030

3131
networking = {
32-
defaultGateway = { address = "195.93.173.1"; interface = "ens3"; };
33-
defaultGateway6 = { address = "2001:678:cfc::1"; interface = "ens3"; };
32+
defaultGateway = { address = "46.173.218.1"; interface = "ens3"; };
33+
defaultGateway6 = { address = "2a03:5a00:1:4:3::1"; interface = "ens3"; };
3434

3535
firewall = {
3636
allowedTCPPorts = [ 22 ];
@@ -43,7 +43,7 @@
4343
addresses = [{ address = "46.173.218.118"; prefixLength = 24; }];
4444
};
4545
ipv6 = {
46-
addresses = [{ address = "2a03:5a00:1:4:3::200a"; prefixLength = 96; }];
46+
addresses = [{ address = "2a03:5a00:1:4:3::200a"; prefixLength = 128; }];
4747
};
4848
# tempAddress = "disabled";
4949
};

‎hgunderson/hardware-configuration.nix

+3-7
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@
66
(modulesPath + "/profiles/qemu-guest.nix")
77
];
88

9-
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ];
10-
boot.initrd.kernelModules = [ ];
9+
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" "xen_blkfront" "vmw_pvscsi" ];
10+
boot.initrd.kernelModules = [ "nvme" ];
1111
boot.kernelModules = [ ];
1212
boot.extraModulePackages = [ ];
1313
boot.loader.grub.device = "/dev/vda";
14-
fileSystems."/" =
15-
{
16-
device = "/dev/disk/by-uuid/61410205-1db3-4fb0-bd49-185ef704977c";
17-
fsType = "ext4";
18-
};
14+
fileSystems."/" = { device = "/dev/vda5"; fsType = "ext4"; };
1915

2016
swapDevices = [ ];
2117

‎hgunderson/wireguard.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
persistentKeepalive = 25;
3131
}
3232
{
33-
publicKey = "ZaT3qiDAPiVEwvIiN9/oIYqmArD5lb2MAXdIvOyi4Eo="; # OnePlus
33+
publicKey = "qD9y5dFLjx4oTwueEBTLU0a6rP+7hSqa7kgKE7k+xTU="; # Samsung
3434
allowedIPs = [ "192.168.5.3/32" "fd42:42:42::3/128" ];
3535
persistentKeepalive = 25;
3636
}

‎home-manager/aurora.nix

+36-35
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,63 @@
11
{ pkgs ? import <nixpkgs> { } }:
2-
let generic = { channel, downloadId, sha256, version }:
3-
let
4-
pname = "aurora-electron-${channel}";
5-
name = "Aurora.${channel}-${version}";
2+
let
3+
generic = { channel, downloadId, sha256, version }:
4+
let
5+
pname = "aurora-electron-${channel}";
6+
name = "Aurora.${channel}-${version}";
67

7-
src = pkgs.fetchurl {
8-
inherit sha256;
9-
url = "https://download.ivao.aero/v2/softwares/aurora/${downloadId}/files/latest/download";
10-
};
8+
src = pkgs.fetchurl {
9+
inherit sha256;
10+
url = "https://download.ivao.aero/v2/softwares/aurora/${downloadId}/files/latest/download";
11+
};
1112

12-
appimageContents = pkgs.appimageTools.extract { inherit name src; };
13-
in
14-
pkgs.appimageTools.wrapType2 {
15-
inherit name src;
13+
appimageContents = pkgs.appimageTools.extract { inherit name src; };
14+
in
15+
pkgs.appimageTools.wrapType2 {
16+
inherit name src;
1617

17-
multiPkgs = null; # no 32bit needed
18-
extraPkgs = pkgs: with pkgs; appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ icu libsecret ];
18+
multiPkgs = null; # no 32bit needed
19+
extraPkgs = pkgs: with pkgs; appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ icu libsecret ];
1920

20-
extraInstallCommands = ''
21-
mv $out/bin/${name} $out/bin/${pname}
21+
extraInstallCommands = ''
22+
mv $out/bin/${name} $out/bin/${pname}
2223
23-
install -m 444 -D ${appimageContents}/aurora-electron.desktop $out/share/applications/${pname}.desktop
24-
substituteInPlace $out/share/applications/${pname}.desktop \
25-
--replace 'Exec=AppRun' 'Exec=${pname}' \
26-
--replace 'Name=Aurora' 'Name=Aurora ${version} (${channel})'
27-
'' + pkgs.lib.strings.optionalString (channel == "public") ''
28-
cp -r ${appimageContents}/usr/share/icons $out/share
29-
'';
24+
install -m 444 -D ${appimageContents}/aurora-electron.desktop $out/share/applications/${pname}.desktop
25+
substituteInPlace $out/share/applications/${pname}.desktop \
26+
--replace 'Exec=AppRun' 'Exec=${pname}' \
27+
--replace 'Name=Aurora' 'Name=Aurora ${version} (${channel})'
28+
'' + pkgs.lib.strings.optionalString (channel == "public") ''
29+
cp -r ${appimageContents}/usr/share/icons $out/share
30+
'';
3031

31-
profile = ''
32-
export LC_ALL=fr_FR.UTF-8
33-
'';
32+
profile = ''
33+
export LC_ALL=fr_FR.UTF-8
34+
'';
3435

35-
meta = with pkgs.lib; {
36-
description = "Unofficial Aurora for Linux desktop client";
37-
homepage = "https://ivao.aero";
38-
license = licenses.mit;
39-
maintainers = [ maintainers.tchekda ];
36+
meta = with pkgs.lib; {
37+
description = "Unofficial Aurora for Linux desktop client";
38+
homepage = "https://ivao.aero";
39+
license = licenses.mit;
40+
maintainers = [ maintainers.tchekda ];
41+
};
4042
};
41-
};
4243
in
4344
{
4445
alpha = generic {
4546
channel = "alpha";
4647
downloadId = "70";
4748
sha256 = "sha256-+xKNeQONRGi8bnd8O8qgWQRY34j2p4yAJY9rmAhqETs=";
48-
version = "0.1.27a";
49+
version = "1.0.27a";
4950
};
5051
beta = generic {
5152
channel = "beta";
5253
downloadId = "90";
5354
sha256 = "sha256-RGJ5/+fBj8tqpF/sH8fOUNurqMBpWg7eDN/ayyndkc0=";
54-
version = "0.1.28b";
55+
version = "1.0.28b";
5556
};
5657
public = generic {
5758
channel = "public";
5859
downloadId = "98";
5960
sha256 = "sha256-sIzbnOt3mnn3sxCK/E1Lv4ovmsNmbieZN9yd/pqPk/Y=";
60-
version = "0.1.28b";
61+
version = "1.0.28b";
6162
};
6263
}

‎home-manager/desktop-packages.nix

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ in
7575
"application/x-extension-ics" = [ "thunderbird.desktop" ];
7676
"x-scheme-handler/webcals" = [ "thunderbird.desktop" ];
7777
"x-scheme-handler/postman" = [ "Postman.desktop" ];
78+
"x-scheme-handler/msteams" = [ "teams.desktop" ];
7879
};
7980
};
8081
}

‎home-manager/git.nix

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
".envrc"
3131
".yalc/"
3232
"yalc*"
33+
"*.swp"
3334
];
3435
};
3536
}

‎home-manager/home.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ in
4040
defaultCacheTtl = 7200;
4141
maxCacheTtl = 7200;
4242
# pinentryFlavor = "curses";
43+
enableSshSupport = true;
4344
};
4445
};
4546

@@ -63,7 +64,7 @@ in
6364
python39
6465
python39Packages.pip
6566
file
66-
busybox
67+
# busybox
6768
init-shell-command
6869
] ++ my_lnav;
6970
stateVersion = "21.05";

‎home-manager/hspecter/default.nix

+31-3
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,30 @@ in
1818
../i3.nix
1919
./polybar.nix
2020
../dunst.nix
21+
./vim.nix
22+
./neovim.nix
23+
./helix.nix
2124
];
2225

2326
home = {
2427
sessionPath = [
2528
"/home/tchekda/.yarn/bin"
2629
];
2730
sessionVariables = {
31+
EDITOR = "vim";
32+
2833
HTTPSTAT_SAVE_BODY = "false";
34+
NIXPKGS_ALLOW_UNFREE = "1";
35+
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";
38+
39+
IDEA_JDK = "/run/current-system/sw/lib/openjdk/";
40+
PKG_CONFIG_PATH = "/run/current-system/sw/lib/pkgconfig:/home/tchekda/.nix-profile/lib/pkgconfig";
2941
};
3042
};
3143

3244
programs = {
33-
34-
home-manager.enable = true;
35-
3645
fish = {
3746
shellAbbrs =
3847
{
@@ -43,6 +52,10 @@ in
4352
};
4453
};
4554

55+
home-manager.enable = true;
56+
57+
# man.generateCaches = true;
58+
4659
ssh.extraOptionOverrides = {
4760
"IdentityFile" = "~/.ssh/id_ecdsa_sk";
4861
};
@@ -120,6 +133,21 @@ in
120133
ExecStart = "${pkgs.xss-lock}/bin/xss-lock -l -s \${XDG_SESSION_ID} -- ${pkgs.xautolock}/bin/xautolock -locknow";
121134
};
122135
};
136+
137+
yubikey-touch-detector = {
138+
Unit = {
139+
Description = "Yubikey Touch Detector";
140+
After = [ "graphical-session-pre.target" ];
141+
PartOf = [ "graphical-session.target" ];
142+
};
143+
144+
Install = { WantedBy = [ "graphical-session.target" ]; };
145+
146+
Service = {
147+
ExecStart = "${pkgs.yubikey-touch-detector}/bin/yubikey-touch-detector --libnotify";
148+
Restart = "on-failure";
149+
};
150+
};
123151
};
124152

125153

‎home-manager/hspecter/helix.nix

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{ pkgs, ... }:
2+
{
3+
programs.helix = {
4+
enable = true;
5+
};
6+
}

‎home-manager/hspecter/lens.nix

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{ lib, fetchurl, appimageTools, wrapGAppsHook, makeWrapper }:
2+
3+
let
4+
pname = "lens";
5+
version = "6.3.1";
6+
build = "2023.1.110749-latest";
7+
name = "${pname}-${version}";
8+
9+
src = fetchurl {
10+
url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage";
11+
sha256 = "sha256-wRi9Hz3o7Fvi4vEhLNdzcaYUeDUUKwpH3rdPkZW9TbY=";
12+
name = "${pname}.AppImage";
13+
};
14+
15+
appimageContents = appimageTools.extractType2 {
16+
inherit name src;
17+
};
18+
19+
in
20+
appimageTools.wrapType2 {
21+
inherit name src;
22+
23+
extraInstallCommands =
24+
''
25+
mv $out/bin/${name} $out/bin/${pname}
26+
source "${makeWrapper}/nix-support/setup-hook"
27+
wrapProgram $out/bin/${pname} \
28+
--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 \
31+
$out/share/icons/hicolor/512x512/apps/${pname}.png
32+
substituteInPlace $out/share/applications/${pname}.desktop \
33+
--replace 'Icon=lens' 'Icon=${pname}' \
34+
--replace 'Exec=AppRun' 'Exec=${pname}'
35+
'';
36+
37+
meta = with lib; {
38+
description = "The Kubernetes IDE";
39+
homepage = "https://k8slens.dev/";
40+
license = licenses.mit;
41+
maintainers = with maintainers; [ dbirks RossComputerGuy ];
42+
platforms = [ "x86_64-linux" ];
43+
};
44+
}

‎home-manager/hspecter/neovim.nix

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{ pkgs, ... }:
2+
{
3+
programs.neovim = {
4+
enable = true;
5+
extraConfig = ''
6+
lua << EOF
7+
local packer = require('packer')
8+
require('packer').startup(function()
9+
use 'wbthomason/packer.nvim' -- Package manager
10+
use 'neovim/nvim-lspconfig' -- Configurations for Nvim LSP
11+
end)
12+
EOF
13+
'';
14+
extraPackages = with pkgs; [
15+
tree-sitter
16+
clang
17+
];
18+
plugins = with pkgs.vimPlugins; [
19+
packer-nvim
20+
vim-nix
21+
nvim-treesitter
22+
nvim-lspconfig
23+
];
24+
};
25+
}

‎home-manager/hspecter/packages.nix

+13-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ let
44
pdfrankenstein = pkgs.callPackage ./pdfrankenstein.nix { };
55
myRedli = pkgs.callPackage ./redli.nix { };
66
aurora = pkgs.callPackage ../aurora.nix { };
7+
myLens = pkgs.callPackage ./lens.nix { };
8+
m68k = pkgs.qt5.callPackage ./m68k.nix { };
79
in
810
{
911
home.packages = with pkgs; [
@@ -23,11 +25,11 @@ in
2325
yarn
2426
docker-compose
2527
kubectl
26-
lens
28+
myLens
2729
unstable.teleport
2830
postman
2931
openssl
30-
wkhtmltopdf
32+
# wkhtmltopdf
3133
mailcatcher
3234
httpstat
3335
dbeaver
@@ -36,22 +38,30 @@ in
3638
radeontop
3739
arandr
3840
ventoy-bin
41+
yubioath-desktop
3942
# mono
4043
jetbrains.jdk
4144
jetbrains.webstorm
4245
jetbrains.phpstorm
4346
# EPITA
4447
gnumake
4548
gcc
49+
man-pages
4650
gdb
51+
tree
52+
pkg-config
53+
bear
54+
clang-tools
55+
m68k
56+
# clang
4757
# Applications
4858
teams
4959
kvirc
5060
zoom-us
5161
slack
5262
element-desktop
5363
filezilla
54-
nixopsUnstable
64+
unstable.nixops_unstable
5565
termius
5666
transmission-gtk
5767
gimp

0 commit comments

Comments
 (0)