diff --git a/config/server.nix b/config/server.nix index 2f9ebc1..1880182 100644 --- a/config/server.nix +++ b/config/server.nix @@ -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) { inputs, lib, config, pkgs, + unstable, myhostname, ... }: { imports = [ ../moduler/common/git.nix + ../moduler/common/tmux.nix ../moduler/common/nixpkgs.nix ../moduler/common/lazygit.nix ../moduler/common/zsh-server.nix @@ -26,66 +28,66 @@ }; }; - - home.packages = with pkgs; [ + home.packages = [ # System - arion - wget - killall - gcc - gnumake - htop - openssh - xsel - unzip - nixops_unstable - cmake - networkmanager - fd - bat + pkgs.arion + pkgs.wget + pkgs.killall + pkgs.gcc + pkgs.gnumake + pkgs.htop + pkgs.openssh + pkgs.xsel + pkgs.unzip + pkgs.nixops_unstable + pkgs.cmake + pkgs.networkmanager + pkgs.fd + pkgs.bat + unstable.lego #Terminal - git - yt-dlp - fzf - ripgrep + pkgs.git + pkgs.yt-dlp + pkgs.fzf + pkgs.ripgrep #Desktop - neovim - lazygit + pkgs.neovim + pkgs.lazygit #Dev - python3 - python311Packages.pip - ranger - python311Packages.pynvim - ueberzugpp + pkgs.python3 + pkgs.python311Packages.pip + pkgs.ranger + pkgs.python311Packages.pynvim + pkgs.ueberzugpp #LSP - nil - python311Packages.python-lsp-server - marksman - clojure-lsp - omnisharp-roslyn - haskell-language-server - java-language-server - nodePackages_latest.bash-language-server - dockerfile-language-server-nodejs - yaml-language-server - ansible-language-server - lua-language-server - tree-sitter - nodejs_21 - nodePackages_latest.vls - nodePackages_latest.volar - vscode-langservers-extracted + pkgs.nil + pkgs.python311Packages.python-lsp-server + pkgs.marksman + pkgs.clojure-lsp + pkgs.omnisharp-roslyn + pkgs.haskell-language-server + pkgs.java-language-server + pkgs.nodePackages_latest.bash-language-server + pkgs.dockerfile-language-server-nodejs + pkgs.yaml-language-server + pkgs.ansible-language-server + pkgs.lua-language-server + pkgs.tree-sitter + pkgs.nodejs_21 + pkgs.nodePackages_latest.vls + pkgs.nodePackages_latest.volar + pkgs.vscode-langservers-extracted #VPN - openvpn - networkmanagerapplet - networkmanager-l2tp - strongswan - ansible + pkgs.openvpn + pkgs.networkmanagerapplet + pkgs.networkmanager-l2tp + pkgs.strongswan + pkgs.ansible ]; programs.home-manager.enable = true; diff --git a/flake.lock b/flake.lock index 98d2245..1822f66 100644 --- a/flake.lock +++ b/flake.lock @@ -112,7 +112,24 @@ "inputs": { "home-manager": "home-manager", "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" } } }, diff --git a/flake.nix b/flake.nix index 821d151..5597a45 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Home manager home-manager.url = "github:nix-community/home-manager/release-23.11"; @@ -17,6 +18,7 @@ outputs = { self, nixpkgs, + unstable, home-manager, ... } @ inputs: let diff --git a/moduler/common/nginx.nix b/moduler/common/nginx.nix index 04ba786..aab57a6 100644 --- a/moduler/common/nginx.nix +++ b/moduler/common/nginx.nix @@ -4,13 +4,7 @@ security.acme = { acceptTerms = true; 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 = { enable = true; @@ -18,6 +12,15 @@ recommendedOptimisation = true; recommendedProxySettings = 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"; + # }; }