fw/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unstable added

Browse source
This commit is contained in:
FredzyW 2024-04-08 10:31:12 +02:00
parent 8ba1f17124
commit 23dceaa5ba
4 changed files with 82 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

102
config/server.nix
View file

@ -1,15 +1,17 @@
# This is your home-manager configuration file # This is your home-manager configuration fileserver
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{ {
inputs, inputs,
lib, lib,
config, config,
pkgs, pkgs,
unstable,
myhostname, myhostname,
... ...
}: { }: {
imports = [ imports = [
../moduler/common/git.nix ../moduler/common/git.nix
../moduler/common/tmux.nix
../moduler/common/nixpkgs.nix ../moduler/common/nixpkgs.nix
../moduler/common/lazygit.nix ../moduler/common/lazygit.nix
../moduler/common/zsh-server.nix ../moduler/common/zsh-server.nix
@ -26,66 +28,66 @@
}; };
}; };
home.packages = [
home.packages = with pkgs; [
# System # System
arion pkgs.arion
wget pkgs.wget
killall pkgs.killall
gcc pkgs.gcc
gnumake pkgs.gnumake
htop pkgs.htop
openssh pkgs.openssh
xsel pkgs.xsel
unzip pkgs.unzip
nixops_unstable pkgs.nixops_unstable
cmake pkgs.cmake
networkmanager pkgs.networkmanager
fd pkgs.fd
bat pkgs.bat
unstable.lego
#Terminal #Terminal
git pkgs.git
yt-dlp pkgs.yt-dlp
fzf pkgs.fzf
ripgrep pkgs.ripgrep
#Desktop #Desktop
neovim pkgs.neovim
lazygit pkgs.lazygit
#Dev #Dev
python3 pkgs.python3
python311Packages.pip pkgs.python311Packages.pip
ranger pkgs.ranger
python311Packages.pynvim pkgs.python311Packages.pynvim
ueberzugpp pkgs.ueberzugpp
#LSP #LSP
nil pkgs.nil
python311Packages.python-lsp-server pkgs.python311Packages.python-lsp-server
marksman pkgs.marksman
clojure-lsp pkgs.clojure-lsp
omnisharp-roslyn pkgs.omnisharp-roslyn
haskell-language-server pkgs.haskell-language-server
java-language-server pkgs.java-language-server
nodePackages_latest.bash-language-server pkgs.nodePackages_latest.bash-language-server
dockerfile-language-server-nodejs pkgs.dockerfile-language-server-nodejs
yaml-language-server pkgs.yaml-language-server
ansible-language-server pkgs.ansible-language-server
lua-language-server pkgs.lua-language-server
tree-sitter pkgs.tree-sitter
nodejs_21 pkgs.nodejs_21
nodePackages_latest.vls pkgs.nodePackages_latest.vls
nodePackages_latest.volar pkgs.nodePackages_latest.volar
vscode-langservers-extracted pkgs.vscode-langservers-extracted
#VPN #VPN
openvpn pkgs.openvpn
networkmanagerapplet pkgs.networkmanagerapplet
networkmanager-l2tp pkgs.networkmanager-l2tp
strongswan pkgs.strongswan
ansible pkgs.ansible
]; ];
programs.home-manager.enable = true; programs.home-manager.enable = true;

19
flake.lock generated
View file

@ -112,7 +112,24 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2",
"unstable": "unstable"
}
},
"unstable": {
"locked": {
"lastModified": 1712439257,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
} }
}, },

2
flake.nix
View file

@ -4,6 +4,7 @@
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Home manager # Home manager
home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.url = "github:nix-community/home-manager/release-23.11";
@ -17,6 +18,7 @@
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
unstable,
home-manager, home-manager,
... ...
} @ inputs: let } @ inputs: let

17
moduler/common/nginx.nix
View file

@ -4,13 +4,7 @@
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
email = "fredrik@wastring.com"; email = "fredrik@wastring.com";
certs."git.wastring.com" = {
dnsProvider = "gandi";
# Supplying password files like this will make your credentials world-readable
# in the Nix store. This is for demonstration purpose only, do not use this in production.
credentialsFile = /home/fw/credentials.sh;
}; };
};
services.nginx = { services.nginx = {
enable = true; enable = true;
@ -18,6 +12,15 @@
recommendedOptimisation = true; recommendedOptimisation = true;
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;
virtualHosts."git.wastring.com" = { default = true; enableACME = true; addSSL = true; locations."/".proxyPass = "http://172.17.0.1:3030/"; }; virtualHosts."wastring.com" = { default = true; useACMEHost = "wastring.com"; addSSL = true; locations."/".proxyPass = "http://172.17.0.1:3030/"; };
}; };
# security.acme.certs."wastring.com" = {
# group = "nginx";
# domain = "wastring.com";
# dnsProvider = "gandiv5";
# dnsResolver = "1.1.1.1:53";
# dnsPropagationCheck = true;
# credentialsFile = "/home/fw/credentials";
# };
} }