Compare commits

...

15 Commits

8 changed files with 53 additions and 21 deletions

View File

@ -28,6 +28,8 @@
fzf fzf
fzy fzy
git git
adwaita-icon-theme
gnomeExtensions.appindicator
gnupg gnupg
gptfdisk gptfdisk
hcxdumptool hcxdumptool

30
flake.lock generated
View File

@ -162,11 +162,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721135958, "lastModified": 1722630065,
"narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "rev": "afc892db74d65042031a093adb6010c4c3378422",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,11 +198,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1721379653, "lastModified": 1722630782,
"narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -247,11 +247,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1720915306, "lastModified": 1721524707,
"narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
"nixpkgs-24_05": "nixpkgs-24_05" "nixpkgs-24_05": "nixpkgs-24_05"
}, },
"locked": { "locked": {
"lastModified": 1718697807, "lastModified": 1721121314,
"narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=", "narHash": "sha256-zwc7YXga/1ppaZMWFreZykXtFwBgXodxUZiUx969r+g=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b", "rev": "059b50b2e729729ea00c6831124d3837c494f3d5",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -371,11 +371,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1720926522, "lastModified": 1722114803,
"narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", "narHash": "sha256-s6YhI8UHwQvO4cIFLwl1wZ1eS5Cuuw7ld2VzUchdFP0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "0703ba03fd9c1665f8ab68cc3487302475164617", "rev": "eb34eb588132d653e4c4925d862f1e5a227cc2ab",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -89,6 +89,7 @@
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.akill = import ./home/home.nix; home-manager.users.akill = import ./home/home.nix;
home-manager.extraSpecialArgs = {inherit inputs system;}; home-manager.extraSpecialArgs = {inherit inputs system;};
home-manager.backupFileExtension = "home_backup";
} }
peerix.nixosModules.peerix peerix.nixosModules.peerix
{ {

View File

@ -54,10 +54,11 @@ in {
chromium chromium
cmake cmake
compsize compsize
cura /*cura*/
deluge deluge
discord discord
dmenu-wayland dmenu-wayland
dualsensectl
ffmpeg-full ffmpeg-full
firefox firefox
freecad freecad
@ -98,6 +99,7 @@ in {
pass-wayland pass-wayland
patchelf patchelf
pavucontrol pavucontrol
pwvucontrol
pirate-get pirate-get
poppler_utils poppler_utils
powertop powertop
@ -114,8 +116,10 @@ in {
slurp slurp
steam-run steam-run
stm32cubemx stm32cubemx
swayimg
tea tea
teams-for-linux teams-for-linux
tessen
texlive.combined.scheme-full texlive.combined.scheme-full
thunderbird thunderbird
upx upx
@ -132,7 +136,7 @@ in {
yt-dlp yt-dlp
zapzap zapzap
zathura zathura
zeal-qt6 /*zeal-qt6*/
zig zig
] ]
++ [ ++ [

View File

@ -11,6 +11,10 @@
system.stateVersion = "23.05"; system.stateVersion = "23.05";
system.autoUpgrade.enable = false; system.autoUpgrade.enable = false;
system.switch = {
enable = false;
enableNg = true;
};
sops = { sops = {
age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
@ -64,7 +68,8 @@
boot = { boot = {
extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback]; extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback];
initrd.compressor = "zstd"; initrd.compressor = "zstd";
initrd.kernelModules = ["amdgpu"]; initrd.kernelModules = [];
initrd.systemd.enable = true;
binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"]; binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"];
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"]; kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"];
@ -151,6 +156,19 @@
} }
]; ];
}; };
neox_wg = {
ips = ["192.168.51.2/32"];
privateKeyFile = config.sops.secrets."wg_privkey".path;
peers = [
{
publicKey = builtins.readFile ../nixy/wg_pubkey_nx;
allowedIPs = ["192.168.2.0/24"];
endpoint = "185.194.64.26:51820";
persistentKeepalive = 25;
}
];
};
}; };
}; };
@ -169,6 +187,12 @@
}; };
programs = { programs = {
steam = {
enable = true;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = false;
localNetworkGameTransfers.openFirewall = true;
};
gnupg.agent = { gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
@ -522,7 +546,6 @@
}; };
}; };
hardware = { hardware = {
bluetooth = { bluetooth = {
enable = true; enable = true;

View File

@ -9,6 +9,7 @@
]; ];
boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a"; boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
boot.initrd.luks.devices."crypt_dev".allowDiscards = true;
boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-amd" "amd-gpu" ]; boot.kernelModules = [ "kvm-amd" "amd-gpu" ];

1
nixy/wg_pubkey_nx Normal file
View File

@ -0,0 +1 @@
eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=

View File

@ -44,12 +44,12 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "viber"; pname = "viber";
version = "21.8.0.11"; version = "23.2.0.3";
src = fetchurl { src = fetchurl {
# Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb
url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
hash = "sha256-RrObmN21QOm5nk0R2avgCH0ulrfiUIo2PnyYWvQaGVw="; hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM=";
}; };
nativeBuildInputs = [makeWrapper]; nativeBuildInputs = [makeWrapper];