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

Changed prompt and updated desktop

Browse source
This commit is contained in:
FredzyW 2024-05-02 21:03:58 +02:00
parent 0c40e0f66d
commit 4b77350f91
7 changed files with 110 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/base.nix
View file

@ -17,6 +17,7 @@
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs); nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
nix.nixPath = ["/etc/nix/path"]; nix.nixPath = ["/etc/nix/path"];
users.defaultUserShell = pkgs.bash;
programs.fish.enable = true; programs.fish.enable = true;
programs.bash = { programs.bash = {
interactiveShellInit = '' interactiveShellInit = ''
@ -27,7 +28,6 @@
fi fi
''; '';
}; };
users.defaultUserShell = pkgs.bash;
environment.etc = environment.etc =
lib.mapAttrs' lib.mapAttrs'
(name: value: { (name: value: {
@ -88,7 +88,6 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
console.keyMap = "sv-latin1"; console.keyMap = "sv-latin1";
# programs.zsh.enable = true;
services = { services = {
openssh = { openssh = {

2
config/home.nix
View file

@ -15,7 +15,7 @@
../moduler/common/tmux.nix ../moduler/common/tmux.nix
# ../moduler/common/zsh.nix # ../moduler/common/zsh.nix
../moduler/common/fish.nix ../moduler/common/fish.nix
../moduler/common/starship.nix # ../moduler/common/starship.nix
../moduler/common/git.nix ../moduler/common/git.nix
../moduler/common/nixpkgs.nix ../moduler/common/nixpkgs.nix
../moduler/common/firefox.nix ../moduler/common/firefox.nix

5
flake.nix
View file

@ -51,7 +51,10 @@
inherit inputs outputs; inherit inputs outputs;
myhostname = "desktop"; myhostname = "desktop";
}; };
modules = [./maskiner/desktop/configuration.nix]; modules = [
({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./maskiner/desktop/configuration.nix
];
}; };
jobb = nixpkgs.lib.nixosSystem { jobb = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {

14
maskiner/desktop/configuration.nix
View file

@ -13,8 +13,22 @@
./hardware-configuration.nix ./hardware-configuration.nix
../../config/base.nix ../../config/base.nix
../../config/users.nix ../../config/users.nix
../../moduler/common/nginx.nix
]; ];
environment.systemPackages = with pkgs; [
unstable.lego
];
networking.firewall = {
enable = true;
allowedTCPPorts = [ 80 443 ];
allowedUDPPortRanges = [
{ from = 4000; to = 4007; }
{ from = 8000; to = 8010; }
];
};
security.rtkit.enable = true; security.rtkit.enable = true;
networking.hostName = myhostname; networking.hostName = myhostname;

2
maskiner/server/configuration.nix
View file

@ -109,7 +109,7 @@
PermitRootLogin = "no"; PermitRootLogin = "no";
PasswordAuthentication = false; PasswordAuthentication = false;
X11Forwarding = true; X11Forwarding = true;
}; };
extraConfig = '' extraConfig = ''
AllowUsers fw AllowUsers fw
''; '';

27
moduler/common/fish.nix
View file

@ -12,10 +12,30 @@
sha256 = "0dbnir6jbwjpjalz14snzd3cgdysgcs3raznsijd6savad3qhijc"; sha256 = "0dbnir6jbwjpjalz14snzd3cgdysgcs3raznsijd6savad3qhijc";
}; };
} }
{
name = "autopair";
src = pkgs.fishPlugins.autopair.src;
}
{
name = "tide";
src = pkgs.fishPlugins.tide.src;
}
{
name = "fzf";
src = pkgs.fishPlugins.fzf.src;
}
{
name = "done";
src = pkgs.fishPlugins.done.src;
}
{
name = "sponge";
src = pkgs.fishPlugins.sponge.src;
}
{ {
name = "grc"; name = "grc";
src = pkgs.fishPlugins.grc.src; src = pkgs.fishPlugins.grc.src;
} }
]; ];
shellAbbrs = { shellAbbrs = {
homec="nvim ~/nix/config/home.nix"; homec="nvim ~/nix/config/home.nix";
@ -23,6 +43,7 @@
}; };
interactiveShellInit = '' interactiveShellInit = ''
${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
set fish_greeting # Disable greeting
''; '';
}; };
} }

128
moduler/common/nginx.nix
View file

@ -5,6 +5,8 @@ networking.firewall = {
}; };
services.nginx = { services.nginx = {
enable = true; enable = true;
user = "nginx";
group = "nginx";
# Use recommended settings # Use recommended settings
recommendedGzipSettings = true; recommendedGzipSettings = true;
@ -13,60 +15,6 @@ networking.firewall = {
recommendedTlsSettings = true; recommendedTlsSettings = true;
virtualHosts = { virtualHosts = {
"git.wastring.com" = {
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
forceSSL = true;
locations."/" = {
proxyPass = "http://172.17.0.1:3009";
proxyWebsockets = true;
};
};
"cal.wastring.com" = {
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
forceSSL = true;
locations."/" = {
proxyPass = "http://172.17.0.1:5232";
proxyWebsockets = true;
};
};
"warden.wastring.com" = {
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
forceSSL = true;
locations."/" = {
proxyPass = "http://172.17.0.1:8083";
proxyWebsockets = true;
};
};
"home.wastring.com" = {
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
forceSSL = true;
locations."/" = {
proxyPass = "http://172.17.0.1:8085";
proxyWebsockets = true;
};
};
"search.wastring.com" = {
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
forceSSL = true;
locations."/" = {
proxyPass = "http://172.17.0.1:8060";
proxyWebsockets = true;
};
};
"docs.wastring.com" = {
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
forceSSL = true;
locations."/" = {
proxyPass = "http://172.17.0.1:8003";
proxyWebsockets = true;
};
};
"bilder.wastring.com" = { "bilder.wastring.com" = {
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key"; sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
sslCertificate = "/certs/.lego/certificates/wastring.com.crt"; sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
@ -76,15 +24,69 @@ networking.firewall = {
proxyWebsockets = true; proxyWebsockets = true;
}; };
}; };
"wastring.com" = { # "git.wastring.com" = {
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key"; # sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
sslCertificate = "/certs/.lego/certificates/wastring.com.crt"; # sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
forceSSL = true; # forceSSL = true;
locations."/" = { # locations."/" = {
proxyPass = "http://172.17.0.1:8085"; # proxyPass = "http://172.17.0.1:3009";
proxyWebsockets = true; # proxyWebsockets = true;
}; # };
}; # };
# "cal.wastring.com" = {
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
# forceSSL = true;
# locations."/" = {
# proxyPass = "http://172.17.0.1:5232";
# proxyWebsockets = true;
# };
# };
# "warden.wastring.com" = {
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
# forceSSL = true;
# locations."/" = {
# proxyPass = "http://172.17.0.1:8083";
# proxyWebsockets = true;
# };
# };
# "home.wastring.com" = {
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
# forceSSL = true;
# locations."/" = {
# proxyPass = "http://172.17.0.1:8085";
# proxyWebsockets = true;
# };
# };
# "search.wastring.com" = {
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
# forceSSL = true;
# locations."/" = {
# proxyPass = "http://172.17.0.1:8060";
# proxyWebsockets = true;
# };
# };
# "docs.wastring.com" = {
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
# forceSSL = true;
# locations."/" = {
# proxyPass = "http://172.17.0.1:8003";
# proxyWebsockets = true;
# };
# };
# "wastring.com" = {
# sslCertificateKey = "/home/fw/.lego/certificates/wastring.com.key";
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
# forceSSL = true;
# locations."/" = {
# proxyPass = "http://172.17.0.1:2283";
# proxyWebsockets = true;
# };
# };
}; };
}; };
} }