Compare commits
1 Commits
updates
...
08b80e8860
| Author | SHA1 | Date | |
|---|---|---|---|
|
08b80e8860
|
24
flake.lock
generated
24
flake.lock
generated
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760130406,
|
"lastModified": 1752814804,
|
||||||
"narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=",
|
"narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d305eece827a3fe317a2d70138f53feccaf890a1",
|
"rev": "d0300c8808e41da81d6edfc202f3d3833c157daf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -58,11 +58,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760038930,
|
"lastModified": 1752687322,
|
||||||
"narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
|
"narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
|
"rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -82,11 +82,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759321049,
|
"lastModified": 1748196248,
|
||||||
"narHash": "sha256-8XkU4gIrLT2DJZWQyvsP5woXGZF5eE/7AnKfwQkiwYU=",
|
"narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "plasma-manager",
|
"repo": "plasma-manager",
|
||||||
"rev": "205dcfd4a30d4a5d1b4f28defee69daa7c7252cd",
|
"rev": "b7697abe89967839b273a863a3805345ea54ab56",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -111,11 +111,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753137768,
|
"lastModified": 1746643487,
|
||||||
"narHash": "sha256-bCQ8IHak1hF38amAgz2YKIEwteU5eAkgoC0fwfoRxO0=",
|
"narHash": "sha256-dcB/DArJObCvqE/ZEdQSDW2BZMeDyF83Se5KPfJvz60=",
|
||||||
"owner": "Platonic-Systems",
|
"owner": "Platonic-Systems",
|
||||||
"repo": "secrix",
|
"repo": "secrix",
|
||||||
"rev": "f783b038ee639a589affcf3c612187dafcfa0476",
|
"rev": "4c64203fa5b377953b1fb6d5388187df8b60c6d5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.sharedModules = [ plasma-manager.homeModules.plasma-manager ];
|
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
|
||||||
|
|
||||||
home-manager.users.cazzzer = import file;
|
home-manager.users.cazzzer = import file;
|
||||||
# Optionally, use home-manager.extraSpecialArgs to pass
|
# Optionally, use home-manager.extraSpecialArgs to pass
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
"sysrq_always_enabled=1"
|
"sysrq_always_enabled=1"
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_16;
|
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_15;
|
||||||
boot.loader = {
|
boot.loader = {
|
||||||
efi.canTouchEfiVariables = true;
|
efi.canTouchEfiVariables = true;
|
||||||
timeout = 3;
|
timeout = 3;
|
||||||
@@ -24,9 +24,6 @@
|
|||||||
|
|
||||||
# Enable networking
|
# Enable networking
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
networking.networkmanager.plugins = [
|
|
||||||
pkgs.networkmanager-openvpn
|
|
||||||
];
|
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
# You can disable this if you're only using the Wayland session.
|
# You can disable this if you're only using the Wayland session.
|
||||||
@@ -61,7 +58,7 @@
|
|||||||
programs.git.enable = true;
|
programs.git.enable = true;
|
||||||
programs.git.lfs.enable = true;
|
programs.git.lfs.enable = true;
|
||||||
# https://nixos.wiki/wiki/Git
|
# https://nixos.wiki/wiki/Git
|
||||||
programs.git.package = pkgs.git.override { withLibsecret = true; doInstallCheck = false; };
|
programs.git.package = pkgs.git.override { withLibsecret = true; };
|
||||||
programs.lazygit.enable = true;
|
programs.lazygit.enable = true;
|
||||||
programs.neovim.enable = true;
|
programs.neovim.enable = true;
|
||||||
programs.wireshark.enable = true;
|
programs.wireshark.enable = true;
|
||||||
@@ -145,7 +142,6 @@
|
|||||||
android-studio
|
android-studio
|
||||||
rustup
|
rustup
|
||||||
zed-editor
|
zed-editor
|
||||||
package-version-server # for zed
|
|
||||||
] ++ [
|
] ++ [
|
||||||
# Python
|
# Python
|
||||||
python3
|
python3
|
||||||
@@ -168,8 +164,5 @@
|
|||||||
# Gleam
|
# Gleam
|
||||||
gleam
|
gleam
|
||||||
beamMinimal26Packages.erlang
|
beamMinimal26Packages.erlang
|
||||||
|
|
||||||
# Racket
|
|
||||||
racket
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
type = "fcitx5";
|
type = "fcitx5";
|
||||||
fcitx5.waylandFrontend = true;
|
fcitx5.waylandFrontend = true;
|
||||||
# fcitx5.plasma6Support = true;
|
fcitx5.plasma6Support = true;
|
||||||
fcitx5.addons = [ pkgs.fcitx5-mozc ];
|
fcitx5.addons = [ pkgs.fcitx5-mozc ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -56,12 +56,6 @@ in
|
|||||||
udp . 45608 : ${vars.extra.opnsense.addr4} . 45608,
|
udp . 45608 : ${vars.extra.opnsense.addr4} . 45608,
|
||||||
udp . 35848 : ${vars.extra.opnsense.addr4} . 35848,
|
udp . 35848 : ${vars.extra.opnsense.addr4} . 35848,
|
||||||
udp . 48425 : ${vars.extra.opnsense.addr4} . 48425,
|
udp . 48425 : ${vars.extra.opnsense.addr4} . 48425,
|
||||||
# Amnezia VPN server
|
|
||||||
udp . 37138 : ${vars.extra.amnezia.addr4} . 37138,
|
|
||||||
# Minecruft server
|
|
||||||
tcp . 25565 : ${vars.extra.minecruft.addr4} . 25565,
|
|
||||||
udp . 25565 : ${vars.extra.minecruft.addr4} . 25565,
|
|
||||||
udp . 24454 : ${vars.extra.minecruft.addr4} . 24454,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -58,7 +58,7 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.caddy.withPlugins {
|
package = pkgs.caddy.withPlugins {
|
||||||
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
|
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
|
||||||
hash = "sha256-XwZ0Hkeh2FpQL/fInaSq+/3rCLmQRVvwBM0Y1G1FZNU=";
|
hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A=";
|
||||||
};
|
};
|
||||||
virtualHosts."*.${domain}".extraConfig = ''
|
virtualHosts."*.${domain}".extraConfig = ''
|
||||||
encode
|
encode
|
||||||
|
|||||||
@@ -135,7 +135,5 @@ rec {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
amnezia.addr4 = "${ifs.lan10.p4}.31";
|
|
||||||
minecruft.addr4 = "${ifs.lan.p4}.11";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user