diff --git a/flake.lock b/flake.lock index 7215578..9639775 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1749154018, - "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", + "lastModified": 1753288231, + "narHash": "sha256-WcMW9yUDfER8kz4NdCaaI/ep0Ef91L+Nf7MetNzHZc4=", "owner": "nix-community", "repo": "home-manager", - "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", + "rev": "7b5a978e00273b8676c530c03d315f5b75fae564", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1750263149, - "narHash": "sha256-VYSGDzq4ds4LIYvyEYG+RBqGMGBZhES2tvnmU4TJBn0=", + "lastModified": 1753373145, + "narHash": "sha256-UhuUj46dobD/POOdVNxKvAvP3luI2T0MZPm2IXl266Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "85e68c6a388ef1dfc799aaa01f00758c58e87d89", + "rev": "64796151f79e6f3834bfc55f07c5487708bb5b3f", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750133334, - "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { @@ -108,11 +108,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "ymExe": "ymExe" }, "locked": { - "lastModified": 1749257466, - "narHash": "sha256-/ZZIL3DZY/L28fCq4CD9vVuvX7xJK2hsyDY6gymdUWo=", + "lastModified": 1752886450, + "narHash": "sha256-WSYMRi1+R2g8G4k+79gINsl6vHXJPp0zLL4/xZacO8E=", "owner": "cucumber-sp", "repo": "yandex-music-linux", - "rev": "3fde8f8ed83aba4950d67b69e8fd6da3932b9cde", + "rev": "07cbbe06d0d61a99180577e5b3431785d81de4df", "type": "github" }, "original": { @@ -187,13 +187,13 @@ "ymExe": { "flake": false, "locked": { - "narHash": "sha256-8wBFaFTYDGEbCvf3wlAI/BDTa0oY67Q52B19rQW+TaQ=", + "narHash": "sha256-432uRNpFFlUa/776JX/WloWN5paR4ykufG2GIRzpyVE=", "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": { "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": { diff --git a/flake.nix b/flake.nix index 643ed27..278509a 100644 --- a/flake.nix +++ b/flake.nix @@ -60,18 +60,14 @@ ./hosts/generic/persistence.nix ./hosts/generic/configuration_generic.nix ./hosts/generic/users.nix - ./hosts/generic/home-persistence.nix - ./hosts/generic/zapret.nix ./hosts/generic/virtualization.nix ./hosts/generic/unfree_allow.nix - ./hosts/generic/plymouth.nix ./hosts/Aphelion/hardware-Aphelion.nix ./hosts/Aphelion/sunshine.nix - ./hosts/Aphelion/nfs.nix - ./misc/disable_suspend.nix ./desktop/kde.nix ./home/yaroslav/steam.nix ./hosts/generic/teamspeak.nix +# ./hosts/generic/zapret.nix home-manager.nixosModules.home-manager { home-manager.useUserPackages = true; diff --git a/home/yaroslav/Aphelion/mpd.nix b/home/yaroslav/Aphelion/mpd.nix index d5f7bf6..674d601 100644 --- a/home/yaroslav/Aphelion/mpd.nix +++ b/home/yaroslav/Aphelion/mpd.nix @@ -2,7 +2,7 @@ { services.mpd = { enable = true; - musicDirectory = /vol/Trash/Music; + musicDirectory = /Volumes/Trash/Music; network.listenAddress = "any"; extraConfig = '' audio_output { diff --git a/home/yaroslav/home.nix b/home/yaroslav/home.nix index fcaf89b..9fb419c 100644 --- a/home/yaroslav/home.nix +++ b/home/yaroslav/home.nix @@ -59,7 +59,7 @@ in zsh-powerlevel10k meslo-lgs-nf nekoray - python3 + python313Full distrobox scrcpy android-tools diff --git a/home/yaroslav/home_gui.nix b/home/yaroslav/home_gui.nix index 8058e94..6c4252b 100644 --- a/home/yaroslav/home_gui.nix +++ b/home/yaroslav/home_gui.nix @@ -14,6 +14,7 @@ obs-studio onlyoffice-desktopeditors remmina + rpcs3 teamspeak3 prismlauncher kdePackages.kcalc @@ -23,6 +24,7 @@ qsstv vesktop vscode-fhs + vlc vscodium bottles wl-kbptr diff --git a/home/yaroslav/kitty.nix b/home/yaroslav/kitty.nix new file mode 100644 index 0000000..2ec16bd --- /dev/null +++ b/home/yaroslav/kitty.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + kitty + ]; + programs.kitty = { + enable = true; + settings = { + background_opacity = 0.6; + }; + }; + +} + diff --git a/home/yaroslav/nvim.nix b/home/yaroslav/nvim.nix index acf8a8c..e1089e3 100644 --- a/home/yaroslav/nvim.nix +++ b/home/yaroslav/nvim.nix @@ -27,6 +27,7 @@ programs.neovim = { nvim-cmp vimtex coq_nvim + coq-artifacts ]; extraLuaConfig = '' local function my_on_attach(bufnr) diff --git a/hosts/Aphelion/hardware-Aphelion.nix b/hosts/Aphelion/hardware-Aphelion.nix index 367d270..09c62b0 100644 --- a/hosts/Aphelion/hardware-Aphelion.nix +++ b/hosts/Aphelion/hardware-Aphelion.nix @@ -30,13 +30,20 @@ fsType = "zfs"; }; - fileSystems."/nix/persist/home" = + fileSystems."/home" = { device = "aphelion-zroot/home"; fsType = "zfs"; }; 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 # (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 @@ -44,6 +51,8 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp12s0.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"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/generic/configuration_generic.nix b/hosts/generic/configuration_generic.nix index 07050b3..a79d72a 100644 --- a/hosts/generic/configuration_generic.nix +++ b/hosts/generic/configuration_generic.nix @@ -29,8 +29,8 @@ # networking networking.networkmanager.enable = true; - networking.firewall.allowedTCPPorts = [ 22 3240 2049 ]; - networking.firewall.allowedUDPPorts = [ 38401 ]; + networking.firewall.allowedTCPPorts = [ 22 3240 2049 25565 ]; + networking.firewall.allowedUDPPorts = [ 38401 25565 ]; networking.nftables.enable = true; networking.hosts = { "192.168.1.116" = [ "Clank" ]; @@ -38,9 +38,6 @@ "192.168.1.94" = [ "Qwark" ]; }; - # mailing - services.exim.enable = true; - # locales i18n.extraLocales = [ "en_US.UTF-8/UTF-8" "C.UTF-8/UTF-8" "ru_RU.UTF-8/UTF-8" ]; diff --git a/hosts/generic/home-persistence.nix b/hosts/generic/home-persistence.nix index 1ff46df..0bfe81c 100644 --- a/hosts/generic/home-persistence.nix +++ b/hosts/generic/home-persistence.nix @@ -17,6 +17,9 @@ ".config/VSCodium" ".config/libreoffice" ".config/chromium" + ".config/kdeconnect" + ".config/plasma-org.kde.plasma.desktop-appletsrc" + ".config/kwinoutputconfig" ".vscode" ".vscode-oss" ".mozilla" diff --git a/hosts/generic/persistence.nix b/hosts/generic/persistence.nix index 4418525..59054c0 100644 --- a/hosts/generic/persistence.nix +++ b/hosts/generic/persistence.nix @@ -9,6 +9,8 @@ "/var/lib/systemd/coredump" "/var/lib/systemd/timers" "/var/lib/fprint" + "/var/lib/libvirt" + "/var/lib/teamspeak3-server" "/etc/NetworkManager" "/var/lib/sddm" "/etc/ssh" diff --git a/hosts/generic/virtualization.nix b/hosts/generic/virtualization.nix index 0ac1f07..1bd9b8c 100644 --- a/hosts/generic/virtualization.nix +++ b/hosts/generic/virtualization.nix @@ -34,7 +34,14 @@ # Required for containers under podman-compose to be able to talk to each other. 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 ]; } diff --git a/hosts/generic/zapret.nix b/hosts/generic/zapret.nix index 0c27c13..e7ad882 100644 --- a/hosts/generic/zapret.nix +++ b/hosts/generic/zapret.nix @@ -4,10 +4,12 @@ enable = true; configureFirewall = false; params = [ - "--filter-tcp=80 --dpi-desync=fake,multisplit --dpi-desync-split-pos=method+2 --dpi-desync-fooling=md5sig --new" - "--filter-tcp=443 --dpi-desync=fake,multidisorder --dpi-desync-split-pos=1,midsld --dpi-desync-fooling=badseq,md5sig --new" - "--filter-udp=443 --dpi-desync=fake --dpi-desync-repeats=6" - "--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 --new'' + ''--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new'' + ''--filter-tcp=80 --dpi-desync=fake,multisplit --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --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'' ]; };