Added various things, returned Aphelion back to functional state now

with zfs

Note: this is probably the first commit with coq-nvim working again,
don't remove uder any circumstances
This commit is contained in:
yaroslav
2025-07-27 16:18:35 +03:00
parent 7ceaa8e748
commit 7850408607
13 changed files with 70 additions and 37 deletions
Generated
+18 -18
View File
@@ -24,11 +24,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749154018, "lastModified": 1753288231,
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "narHash": "sha256-WcMW9yUDfER8kz4NdCaaI/ep0Ef91L+Nf7MetNzHZc4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "rev": "7b5a978e00273b8676c530c03d315f5b75fae564",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750263149, "lastModified": 1753373145,
"narHash": "sha256-VYSGDzq4ds4LIYvyEYG+RBqGMGBZhES2tvnmU4TJBn0=", "narHash": "sha256-UhuUj46dobD/POOdVNxKvAvP3luI2T0MZPm2IXl266Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "85e68c6a388ef1dfc799aaa01f00758c58e87d89", "rev": "64796151f79e6f3834bfc55f07c5487708bb5b3f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -92,11 +92,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1750133334, "lastModified": 1753345091,
"narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36ab78dab7da2e4e27911007033713bab534187b", "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -108,11 +108,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1750134718, "lastModified": 1753250450,
"narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -171,11 +171,11 @@
"ymExe": "ymExe" "ymExe": "ymExe"
}, },
"locked": { "locked": {
"lastModified": 1749257466, "lastModified": 1752886450,
"narHash": "sha256-/ZZIL3DZY/L28fCq4CD9vVuvX7xJK2hsyDY6gymdUWo=", "narHash": "sha256-WSYMRi1+R2g8G4k+79gINsl6vHXJPp0zLL4/xZacO8E=",
"owner": "cucumber-sp", "owner": "cucumber-sp",
"repo": "yandex-music-linux", "repo": "yandex-music-linux",
"rev": "3fde8f8ed83aba4950d67b69e8fd6da3932b9cde", "rev": "07cbbe06d0d61a99180577e5b3431785d81de4df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -187,13 +187,13 @@
"ymExe": { "ymExe": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-8wBFaFTYDGEbCvf3wlAI/BDTa0oY67Q52B19rQW+TaQ=", "narHash": "sha256-432uRNpFFlUa/776JX/WloWN5paR4ykufG2GIRzpyVE=",
"type": "file", "type": "file",
"url": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.54.0.exe" "url": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.60.0.exe"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.54.0.exe" "url": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.60.0.exe"
} }
}, },
"zapret": { "zapret": {
+1 -5
View File
@@ -60,18 +60,14 @@
./hosts/generic/persistence.nix ./hosts/generic/persistence.nix
./hosts/generic/configuration_generic.nix ./hosts/generic/configuration_generic.nix
./hosts/generic/users.nix ./hosts/generic/users.nix
./hosts/generic/home-persistence.nix
./hosts/generic/zapret.nix
./hosts/generic/virtualization.nix ./hosts/generic/virtualization.nix
./hosts/generic/unfree_allow.nix ./hosts/generic/unfree_allow.nix
./hosts/generic/plymouth.nix
./hosts/Aphelion/hardware-Aphelion.nix ./hosts/Aphelion/hardware-Aphelion.nix
./hosts/Aphelion/sunshine.nix ./hosts/Aphelion/sunshine.nix
./hosts/Aphelion/nfs.nix
./misc/disable_suspend.nix
./desktop/kde.nix ./desktop/kde.nix
./home/yaroslav/steam.nix ./home/yaroslav/steam.nix
./hosts/generic/teamspeak.nix ./hosts/generic/teamspeak.nix
# ./hosts/generic/zapret.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
+1 -1
View File
@@ -2,7 +2,7 @@
{ {
services.mpd = { services.mpd = {
enable = true; enable = true;
musicDirectory = /vol/Trash/Music; musicDirectory = /Volumes/Trash/Music;
network.listenAddress = "any"; network.listenAddress = "any";
extraConfig = '' extraConfig = ''
audio_output { audio_output {
+1 -1
View File
@@ -59,7 +59,7 @@ in
zsh-powerlevel10k zsh-powerlevel10k
meslo-lgs-nf meslo-lgs-nf
nekoray nekoray
python3 python313Full
distrobox distrobox
scrcpy scrcpy
android-tools android-tools
+2
View File
@@ -14,6 +14,7 @@
obs-studio obs-studio
onlyoffice-desktopeditors onlyoffice-desktopeditors
remmina remmina
rpcs3
teamspeak3 teamspeak3
prismlauncher prismlauncher
kdePackages.kcalc kdePackages.kcalc
@@ -23,6 +24,7 @@
qsstv qsstv
vesktop vesktop
vscode-fhs vscode-fhs
vlc
vscodium vscodium
bottles bottles
wl-kbptr wl-kbptr
+14
View File
@@ -0,0 +1,14 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
kitty
];
programs.kitty = {
enable = true;
settings = {
background_opacity = 0.6;
};
};
}
+1
View File
@@ -27,6 +27,7 @@ programs.neovim = {
nvim-cmp nvim-cmp
vimtex vimtex
coq_nvim coq_nvim
coq-artifacts
]; ];
extraLuaConfig = '' extraLuaConfig = ''
local function my_on_attach(bufnr) local function my_on_attach(bufnr)
+10 -1
View File
@@ -30,13 +30,20 @@
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/nix/persist/home" = fileSystems."/home" =
{ device = "aphelion-zroot/home"; { device = "aphelion-zroot/home";
fsType = "zfs"; fsType = "zfs";
}; };
swapDevices = [ ]; swapDevices = [ ];
hardware.graphics.extraPackages = with pkgs; [
rocmPackages.clr.icd
];
systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction
@@ -44,6 +51,8 @@
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp12s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp12s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp11s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp11s0.useDHCP = lib.mkDefault true;
hardware.bluetooth.enable = true; # enables support for Bluetooth
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+2 -5
View File
@@ -29,8 +29,8 @@
# networking # networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.firewall.allowedTCPPorts = [ 22 3240 2049 ]; networking.firewall.allowedTCPPorts = [ 22 3240 2049 25565 ];
networking.firewall.allowedUDPPorts = [ 38401 ]; networking.firewall.allowedUDPPorts = [ 38401 25565 ];
networking.nftables.enable = true; networking.nftables.enable = true;
networking.hosts = { networking.hosts = {
"192.168.1.116" = [ "Clank" ]; "192.168.1.116" = [ "Clank" ];
@@ -38,9 +38,6 @@
"192.168.1.94" = [ "Qwark" ]; "192.168.1.94" = [ "Qwark" ];
}; };
# mailing
services.exim.enable = true;
# locales # locales
i18n.extraLocales = [ "en_US.UTF-8/UTF-8" "C.UTF-8/UTF-8" "ru_RU.UTF-8/UTF-8" ]; i18n.extraLocales = [ "en_US.UTF-8/UTF-8" "C.UTF-8/UTF-8" "ru_RU.UTF-8/UTF-8" ];
+3
View File
@@ -17,6 +17,9 @@
".config/VSCodium" ".config/VSCodium"
".config/libreoffice" ".config/libreoffice"
".config/chromium" ".config/chromium"
".config/kdeconnect"
".config/plasma-org.kde.plasma.desktop-appletsrc"
".config/kwinoutputconfig"
".vscode" ".vscode"
".vscode-oss" ".vscode-oss"
".mozilla" ".mozilla"
+2
View File
@@ -9,6 +9,8 @@
"/var/lib/systemd/coredump" "/var/lib/systemd/coredump"
"/var/lib/systemd/timers" "/var/lib/systemd/timers"
"/var/lib/fprint" "/var/lib/fprint"
"/var/lib/libvirt"
"/var/lib/teamspeak3-server"
"/etc/NetworkManager" "/etc/NetworkManager"
"/var/lib/sddm" "/var/lib/sddm"
"/etc/ssh" "/etc/ssh"
+8 -1
View File
@@ -35,6 +35,13 @@
# Required for containers under podman-compose to be able to talk to each other. # Required for containers under podman-compose to be able to talk to each other.
defaultNetwork.settings.dns_enabled = true; defaultNetwork.settings.dns_enabled = true;
}; };
incus = {
enable = true;
ui.enable = true;
}; };
};
networking.firewall.interfaces.incusbr0.allowedTCPPorts = [ 53 67 ];
networking.firewall.interfaces.incusbr0.allowedUDPPorts = [ 53 67 ];
networking.firewall.interfaces.virbr0.allowedTCPPorts = [ 53 67 ];
networking.firewall.interfaces.virbr0.allowedUDPPorts = [ 53 67 ];
} }
+6 -4
View File
@@ -4,10 +4,12 @@
enable = true; enable = true;
configureFirewall = false; configureFirewall = false;
params = [ params = [
"--filter-tcp=80 --dpi-desync=fake,multisplit --dpi-desync-split-pos=method+2 --dpi-desync-fooling=md5sig --new" ''--filter-udp=443 --dpi-desync=fake --dpi-desync-repeats=6 --new''
"--filter-tcp=443 --dpi-desync=fake,multidisorder --dpi-desync-split-pos=1,midsld --dpi-desync-fooling=badseq,md5sig --new" ''--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new''
"--filter-udp=443 --dpi-desync=fake --dpi-desync-repeats=6" ''--filter-tcp=80 --dpi-desync=fake,multisplit --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new''
"--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new" ''--filter-tcp=443 --dpi-desync=multisplit --dpi-desync-split-seqovl=652 --dpi-desync-split-pos=2 --new''
''--filter-udp=443 --dpi-desync=fake --dpi-desync-repeats=6 --new''
''--filter-tcp=80 --dpi-desync=fake,multisplit --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new''
]; ];
}; };