Browse Source

huh whuh

canon
Hazel Levine 3 months ago
parent
commit
f582d799a5
Signed by: hazel GPG Key ID: 1884029A28789A62
  1. 23
      config/doom/config.org
  2. 10
      config/ncmpcpp/config
  3. 2
      flake.nix
  4. 2
      modules/desktop/settings/fonts.nix
  5. 2
      modules/services/bitwarden.nix
  6. 8
      modules/services/gitea.nix
  7. 3
      modules/services/lemniscation.nix
  8. 4
      modules/services/nextcloud.nix
  9. 40
      modules/services/nginx.nix
  10. 4
      modules/services/perihelion.nix

23
config/doom/config.org

@ -1,4 +1,4 @@
+TITLE: Hazel's DOOM Emacs configuration
#+TITLE: Hazel's DOOM Emacs configuration
#+AUTHOR: Hazel Levine
#+EMAIL: rose.hazel@protonmail.ch
#+STARTUP: nofold
@ -52,7 +52,7 @@ I've also disabled bold fonts because I cannot get them to render properly in
Emacs.
#+BEGIN_SRC emacs-lisp
(defvar hzl/monospace-font
(hzl/xft-font-string "Julia Mono" 10
(hzl/xft-font-string "Source Code Pro" 10
'((hintstyle . 3)
(hinting . true)
(lcdfilter . 3)
@ -63,6 +63,12 @@ Emacs.
(autohint . true)
(lcdfilter . 3)
(antialias . true))))
(defvar hzl/unicode-font
(hzl/xft-font-string "DejaVu Sans Mono" 10
'((hintstyle . 3)
(autohint . true)
(lcdfilter . 3)
(antialias . true))))
(setq doom-font hzl/monospace-font)
(setq doom-variable-pitch-font hzl/variable-pitch-font)
@ -485,4 +491,17 @@ Then enable it. It takes care of the file extensions itself.
** What
#+BEGIN_SRC emacs-lisp
(map! "C-;" nil)
(defvar hzl/modeline-green "#c0e8c3")
(defvar hzl/modeline-red "#ffc8c8")
(custom-set-faces!
`(doom-modeline-info :foreground ,hzl/modeline-green)
`(doom-modeline-debug :foreground ,hzl/modeline-green)
`(doom-modeline-urgent :foreground ,hzl/modeline-red)
`(doom-modeline-buffer-minor-mode :foreground ,hzl/modeline-green)
`(doom-modeline-evil-motion-state :foreground ,hzl/modeline-green)
`(doom-modeline-evil-normal-state :foreground ,hzl/modeline-green)
`(doom-modeline-buffer-modified :foreground ,hzl/modeline-red)
`(doom-modeline-project-dir :foreground ,hzl/modeline-green))
#+END_SRC

10
config/ncmpcpp/config

@ -47,7 +47,7 @@ display_bitrate = "no"
external_editor = "vim"
progressbar_elapsed_color = "white"
progressbar_elapsed_color = "blue"
progressbar_color = "black"
#progressbar_look = "▃▃▃"
@ -58,11 +58,11 @@ header_visibility = "no"
statusbar_visibility = "yes"
titles_visibility = "no"
statusbar_color = "white"
statusbar_color = "black"
enable_window_title = "yes"
now_playing_prefix = "$b$1"
now_playing_prefix = "$1$b$1"
now_playing_suffix = "$1$/b"
#now_playing_prefix = "$u$2"
@ -71,9 +71,9 @@ now_playing_suffix = "$1$/b"
song_columns_list_format = "(6)[]{} (23)[red]{a} (26)[yellow]{t|f} (40)[green]{b} (4)[blue]{l}"
#song_list_format = " $7%l $2%t $R$5%a "
song_list_format = "$1> $2%a$1 - $3%b - $8%t $R $3%l "
song_list_format = "$1> $2%a$1 - $3%b - $1%t $R $3%l "
song_status_format = "$b$7♫ $2%a $1- $3%b $8- $8%t "
song_status_format = "$1$b$2♫ $2%a $1- $3%b $1- $1%t "
song_window_title_format = " {%a} - {%t}"

2
flake.nix

@ -57,7 +57,7 @@
channels: [
(final: prev: {
inherit (channels.unstable)
element-desktop sage rust-analyzer julia-mono;
thunderbird;
hazel = {
perihelion = prev.callPackage (import inputs.perihelion) {};

2
modules/desktop/settings/fonts.nix

@ -44,7 +44,7 @@ with lib; {
fontconfig = {
enable = true;
defaultFonts = {
monospace = [ "IBM Plex Mono 10" ];
monospace = [ "Source Code Pro 10" ];
sansSerif = [ "IBM Plex Sans 10" ];
serif = [ "IBM Plex Serif 10" ];
};

2
modules/services/bitwarden.nix

@ -23,7 +23,7 @@ with lib; {
environmentFile = config.age.secrets.bitwardenEnv.path;
};
services.nginx.virtualHosts."vault.knightsofthelambdacalcul.us" =
services.nginx.virtualHosts."vault.bicompact.space" =
if nginxCfg.enable then {
forceSSL = nginxCfg.ssl;
enableACME = nginxCfg.ssl;

8
modules/services/gitea.nix

@ -23,8 +23,8 @@ with lib; {
repositoryRoot = "/var/lib/gitea/git"; # hold-over from alpine
appName = "very good git repositories";
domain = "git.knightsofthelambdacalcul.us";
rootUrl = "https://git.knightsofthelambdacalcul.us";
domain = "git.bicompact.space";
rootUrl = "https://git.bicompact.space";
database = {
type = "sqlite3";
@ -39,7 +39,7 @@ with lib; {
settings = {
server = {
SSH_DOMAIN = "knightsofthelambdacalcul.us";
SSH_DOMAIN = "bicompact.space";
START_SSH_SERVER = true;
};
openid = {
@ -56,7 +56,7 @@ with lib; {
};
};
services.nginx.virtualHosts."git.knightsofthelambdacalcul.us" =
services.nginx.virtualHosts."git.bicompact.space" =
if nginxCfg.enable then {
enableACME = nginxCfg.ssl;
forceSSL = nginxCfg.ssl;

3
modules/services/lemniscation.nix

@ -26,8 +26,7 @@ with lib; {
extraConfig = "disable_symlinks off;";
};
"lemniscation.qtp2t.club" = redirect;
"lemniscation.knightsofthelambdacalcul.us" = redirect;
"lemniscation.knightsofthelambdacalcul.us" = redirect;
} else {};
};
}

4
modules/services/nextcloud.nix

@ -17,7 +17,7 @@ with lib; {
services.nextcloud = {
enable = true;
package = pkgs.nextcloud21;
hostName = "cloud.knightsofthelambdacalcul.us";
hostName = "cloud.bicompact.space";
# nginx.enable = nginxCfg.enable;
https = nginxCfg.ssl;
@ -50,7 +50,7 @@ with lib; {
after = [ "postgresql.service" ];
};
services.nginx.virtualHosts."cloud.knightsofthelambdacalcul.us" =
services.nginx.virtualHosts."cloud.bicompact.space" =
if nginxCfg.enable then {
forceSSL = nginxCfg.ssl;
enableACME = nginxCfg.ssl;

40
modules/services/nginx.nix

@ -35,10 +35,10 @@ with lib; {
config = mkIf cfg.enable {
networking.firewall.allowedTCPPorts = [ 80 443 ];
environment.systemPackages = with pkgs; [ hazel.ziodyne-blog ];
# environment.systemPackages = with pkgs; [ hazel.ziodyne-blog ];
security.acme = {
email = "me@qtp2t.club";
email = "hazel@bicompact.space";
acceptTerms = true;
};
@ -87,12 +87,12 @@ with lib; {
forceSSL = cfg.ssl;
enableACME = cfg.ssl;
locations."/" = {
return = "301 http://${subdomain}.knightsofthelambdacalcul.us$request_uri";
return = "301 http://${subdomain}.bicompact.space$request_uri";
};
};
in {
"knightsofthelambdacalcul.us" =
(mkVHost [ "www.knightsofthelambdacalcul.us" ] "/var/www/html"
"bicompact.space" =
(mkVHost [ "www.bicompact.space" ] "/var/www/html"
(let
subText = "IF_YOURE_READING_THIS_EMAIL_ME_I_MESSED_UP_THIS_IS_NOT_A_JOKE";
in {
@ -118,31 +118,35 @@ with lib; {
'';
};
"/.well-known/openpgpkey/" = mkIf cfg.wkd.enable {
alias = "${cfg.wkd.directory + "/knightsofthelambdacalcul.us"}/";
alias = "${cfg.wkd.directory + "/bicompact.space"}/";
extraConfig = ''
add_header 'Access-Control-Allow-Origin' '*';
'';
};
}));
"blog.knightsofthelambdacalcul.us" =
(mkVHost [] "${pkgs.hazel.ziodyne-blog}" {});
"mail.knightsofthelambdacalcul.us" =
"blog.bicompact.space" = {
forceSSL = cfg.ssl;
enableACME = cfg.ssl;
locations."/" = {
return = "301 http://bicompact.space$request_uri";
};
}
"mail.bicompact.space" =
(mkVHost [] "/var/www/notawebsite" {});
"qtp2t.club" = {
"knightsofthelambdacalcul.us" = {
forceSSL = cfg.ssl;
enableACME = cfg.ssl;
locations."/" = {
return = "301 http://knightsofthelambdacalcul.us$request_uri";
return = "301 http://bicompact.space$request_uri";
};
serverAliases = [ "www.qtp2t.club" ];
serverAliases = [ "www.knightsofthelambdacalcul.us" ];
};
"blog.qtp2t.club" = (mkRedirect "blog");
"cloud.qtp2t.club" = (mkRedirect "cloud");
"git.qtp2t.club" = (mkRedirect "git");
"p.qtp2t.club" = (mkRedirect "p");
"ring.qtp2t.club" = (mkRedirect "ring");
"vault.qtp2t.club" = (mkRedirect "vault");
"blog.knightsofthelambdacalcul.us" = (mkRedirect "blog");
"cloud.knightsofthelambdacalcul.us" = (mkRedirect "cloud");
"git.knightsofthelambdacalcul.us" = (mkRedirect "git");
"ring.knightsofthelambdacalcul.us" = (mkRedirect "ring");
"vault.knightsofthelambdacalcul.us" = (mkRedirect "vault");
};
};
};

4
modules/services/perihelion.nix

@ -19,7 +19,7 @@ with lib; {
];
environment.etc."perihelion/users.txt".text = ''
hazel|https://knightsofthelambdacalcul.us/
hazel|https://bicompact.space/
haskal|https://tilde.town/~haskal/
not-haskal|https://awoo.systems/
5225225|https://5snb.club/
@ -41,7 +41,7 @@ with lib; {
wantedBy = [ "network.target" ];
};
services.nginx.virtualHosts."ring.knightsofthelambdacalcul.us" =
services.nginx.virtualHosts."ring.bicompact.space" =
if nginxCfg.enable then {
forceSSL = nginxCfg.ssl;
enableACME = nginxCfg.ssl;

Loading…
Cancel
Save