n0vvvonder/my_nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of clank:repos/nixos

Browse Source 
whatever
This commit is contained in:
yaroslav
2026-04-13 23:01:58 +03:00
parent 53cc6b4370 393aca0d30
commit c33db29c04
4 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+25 -25
View File
@@ -41,11 +41,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770021984, "lastModified": 1774644700,
"narHash": "sha256-1YFUBsyXMOgw/6cfElhzCi+QYJ7951DZc7Ql3aNv/ow=", "narHash": "sha256-X4GW447oqOIdgpgfYHx3oH+koB0+09FNKqyLkdUBEwA=",
"owner": "asus-linux-drivers", "owner": "asus-linux-drivers",
"repo": "asus-numberpad-driver", "repo": "asus-numberpad-driver",
"rev": "b9fdd7710a1be6ed77420f01ff2d17b65a2f940b", "rev": "d0159d66906ce8262b80a12d591d20b5cfb028fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -167,11 +167,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771683283, "lastModified": 1775047159,
"narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=", "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a", "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -296,11 +296,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767364176, "lastModified": 1773460763,
"narHash": "sha256-l6YdEBYQxXjD8ujqvc0tKdwWc3K8UQOi+E4Y3DKQ318=", "narHash": "sha256-y9kC3ff89btXS8RD6pAtM50g0qtsim1I8HXBtgSqdbI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "1688100bba140492658d597f6b307c327f35c780", "rev": "5e56f5a973e24292b125dca9e9d506b0a91d6903",
"revCount": 179, "revCount": 180,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@@ -367,11 +367,11 @@
}, },
"locked": { "locked": {
"dir": "packages/nix", "dir": "packages/nix",
"lastModified": 1773092463, "lastModified": 1774491538,
"narHash": "sha256-U1XMtoBNs00icBqWeLZ8hfP5Ra+uTcc8jHaUU/BkI9w=", "narHash": "sha256-11rgTocaXAIFYVEcbb6ju/sDN6sZpxjneXj9FSbgwrA=",
"owner": "SteamClientHomebrew", "owner": "SteamClientHomebrew",
"repo": "Millennium", "repo": "Millennium",
"rev": "293401478502ac4f224c55468f0191083a3ef59b", "rev": "bf8b0cd016fcc4168c4e348cbcbfd237de4c01c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -483,11 +483,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1771369470, "lastModified": 1774709303,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0182a361324364ae3f436a63005877674cf45efb", "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -499,11 +499,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1771369470, "lastModified": 1774709303,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0182a361324364ae3f436a63005877674cf45efb", "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -597,11 +597,11 @@
"zapret-flowseal": "zapret-flowseal" "zapret-flowseal": "zapret-flowseal"
}, },
"locked": { "locked": {
"lastModified": 1771703105, "lastModified": 1774519537,
"narHash": "sha256-8cOAptbiCbs/TzsuNx42ex95M0vKp4Pi8uRengpaUAY=", "narHash": "sha256-NeJ5eI9YP9rBJDt4QJk44YmIOAR35hHdja0PaH7m638=",
"owner": "kartavkun", "owner": "kartavkun",
"repo": "zapret-discord-youtube", "repo": "zapret-discord-youtube",
"rev": "4fb1b80ea9121565556dcaa534b137c928eef16a", "rev": "bb2993fe26ef9752a5cb572b59cf9fd57bcdc093",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -613,11 +613,11 @@
"zapret-flowseal": { "zapret-flowseal": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1771700947, "lastModified": 1775046244,
"narHash": "sha256-bWMpCizbqNt/IT8gPK0F0AXp3N7dCk72iIvgY5ZS67M=", "narHash": "sha256-8vHa4JNBU0CC7zRIzV5gtP2IMNEHnCyS+o0LkXiZx/I=",
"owner": "Flowseal", "owner": "Flowseal",
"repo": "zapret-discord-youtube", "repo": "zapret-discord-youtube",
"rev": "bea49d3774ec8323578c45d13070de595b77a7d1", "rev": "0d5ab7b13cae8d14dc76b9e4f65b998a4a8e53d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
home/yaroslav/home_gui.nix
+2 -10
View File
@@ -1,13 +1,12 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
# android-studio
ayugram-desktop ayugram-desktop
audacity audacity
calibre calibre
firefox firefox
feh feh
helvum crosspipe
hunspellDicts.en-us hunspellDicts.en-us
hunspellDicts.ru-ru hunspellDicts.ru-ru
motrix motrix
@@ -15,14 +14,11 @@
ungoogled-chromium ungoogled-chromium
keepassxc keepassxc
libreoffice-qt6-fresh libreoffice-qt6-fresh
mpd-discord-rpc
obsidian obsidian
obs-studio obs-studio
onlyoffice-desktopeditors
pavucontrol pavucontrol
remmina remmina
rpcs3 rpcs3
# teamspeak3
thunderbird thunderbird
prismlauncher prismlauncher
kdePackages.dolphin kdePackages.dolphin
@@ -35,15 +31,11 @@
nextcloud-client nextcloud-client
nicotine-plus nicotine-plus
qbittorrent qbittorrent
qsstv
vesktop vesktop
# vscode-fhs
vlc vlc
vial vial
# vscodium vscodium
bottles
wl-kbptr wl-kbptr
brave
heroic heroic
xxd xxd
zoom-us zoom-us
hosts/Aphelion/hardware-Aphelion.nix
+7 -7
View File
@@ -16,7 +16,7 @@
boot.kernelParams = [ boot.kernelParams = [
"video=DP-1:1920x1080@60" "video=DP-1:1920x1080@60"
]; ];
boot.kernelPackages = pkgs.linuxKernel.packages.linux_lqx; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.zfs.package = pkgs.zfs_2_4; boot.zfs.package = pkgs.zfs_2_4;
fileSystems."/" = fileSystems."/" =
{ device = "none"; { device = "none";
@@ -55,12 +55,12 @@
fsType = "ext4"; fsType = "ext4";
options = [ "x-mount.mkdir" "rw" ]; options = [ "x-mount.mkdir" "rw" ];
}; };
fileSystems."/Volumes/ssd_g" = # fileSystems."/Volumes/ssd_g" =
{ # {
device = "/dev/disk/by-id/ata-KINGSTON_SA400S37240G_50026B77846D940A-part1"; # device = "/dev/disk/by-id/ata-KINGSTON_SA400S37240G_50026B77846D940A-part1";
fsType = "btrfs"; # fsType = "btrfs";
options = [ "x-mount.mkdir" "rw" ]; # options = [ "x-mount.mkdir" "rw" ];
}; # };
swapDevices = [ ]; swapDevices = [ ];
hosts/generic/configuration_generic.nix
+5 -2
View File
@@ -18,6 +18,9 @@
wget wget
nfs-utils nfs-utils
]; ];
#enable scanner support
hardware.sane.enable = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
programs.neovim = { programs.neovim = {
@@ -40,8 +43,8 @@
networkmanager-openvpn networkmanager-openvpn
]; ];
}; };
networking.firewall.allowedTCPPorts = [ 22 3240 2049 25565 554 80 27040 8044 ]; networking.firewall.allowedTCPPorts = [ 22 3240 2049 25565 554 80 27040 8044 38008 ];
networking.firewall.allowedUDPPorts = [ 38401 25565 554 80 27031 27032 27033 27034 27035 27036 3658 ]; networking.firewall.allowedUDPPorts = [ 38401 25565 554 80 27031 27032 27033 27034 27035 27036 3658 38008 ];
networking.nftables.enable = true; networking.nftables.enable = true;
# tailscale # tailscale