diff --git a/flake-modules/colors.json b/flake-modules/colors.json index f85aba1..642be90 100644 --- a/flake-modules/colors.json +++ b/flake-modules/colors.json @@ -1,13 +1,13 @@ { "base": { - "foreground": "#d6d5f5", - "background": "#050414" + "foreground": "#eddbef", + "background": "#100711" }, "to_alter": { - "accent": "#5d5ad7", - "secondary": "#ff3238", - "tertiary": "#8288af", - "special": "#d3d759", - "weird": "#d759aa" + "accent": "#ba71c0", + "secondary": "#3266ff", + "tertiary": "#4bb6e6", + "special": "#76c071", + "weird": "#c08571" } } \ No newline at end of file diff --git a/home-modules/calendar.nix b/home-modules/calendar.nix index 596d326..35cc933 100644 --- a/home-modules/calendar.nix +++ b/home-modules/calendar.nix @@ -61,13 +61,6 @@ read-only = true; type = "ics"; } - # { - # name = "Handball Männer"; - # url = "http://i.cal.to/ical/108/dhb/handball-nationalmannschaft/c687e97f.bc7c3eb6-11a0e356.ics"; - # color = "#880023"; - # read-only = true; - # type = "ics"; - # } ]; default_set = { # name = diff --git a/home-modules/color-pallete.nix b/home-modules/color-pallete.nix index 4bf0c59..30616cc 100644 --- a/home-modules/color-pallete.nix +++ b/home-modules/color-pallete.nix @@ -25,6 +25,8 @@ ''; + rgb = rice.lib.hex-to-rgb-comma-string; + s = builtins.toString; in /* html */ '' @@ -38,27 +40,26 @@ padding: 0px; } html { - background: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}); - padding: auto; + background: transparent; } body { font-family: ${rice.font.base.name}; color: ${foreground}; width: fit-content; margin: 10px auto 10px auto; - background: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}); - border: ${builtins.toString rice.border-width}px solid ${border}; - border-radius: ${builtins.toString rice.rounding}px; - padding: ${builtins.toString rice.gap-size}px; + background: rgba(${rgb background},${s rice.transparency}); + border: ${s rice.border-width}px solid ${border}; + border-radius: ${s rice.rounding}px; + padding: ${s rice.gap-size}px; } h1 { - margin: ${builtins.toString rice.gap-size}px; + margin: ${s rice.gap-size}px; } .color-container { font-family: ${rice.font.code.name}; display: flex; - gap: ${builtins.toString rice.gap-size}px; - margin: ${builtins.toString rice.gap-size}px; + gap: ${s rice.gap-size}px; + margin: ${s rice.gap-size}px; } .color-box { width: 200px; @@ -66,7 +67,7 @@ flex-direction: column; justify-content: center; align-items: center; - border-radius: ${builtins.toString rice.rounding}px; + border-radius: ${s rice.rounding}px; } diff --git a/home-modules/helix.nix b/home-modules/helix.nix index cabe503..6287875 100644 --- a/home-modules/helix.nix +++ b/home-modules/helix.nix @@ -435,8 +435,8 @@ fg = black.bright; }; "ui.virtual.inlay-hint" = { - fg = background; - bg = tertiary.dark; + fg = subtle.base; + bg = subtle.dark; }; "ui.virtual.ruler" = { bg = background; diff --git a/home-modules/programming.nix b/home-modules/programming.nix new file mode 100644 index 0000000..886de76 --- /dev/null +++ b/home-modules/programming.nix @@ -0,0 +1,12 @@ +{ ... }: { + imports = [ + ./programming/c.nix + ./programming/gleam.nix + ./programming/glsl.nix + ./programming/go.nix + ./programming/java.nix + ./programming/js.nix + ./programming/python.nix + ./programming/rust.nix + ]; +} diff --git a/home-modules/programming/rust.nix b/home-modules/programming/rust.nix new file mode 100644 index 0000000..d00e5dd --- /dev/null +++ b/home-modules/programming/rust.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }@all: with all; { + home = { + packages = with pkgs; [ + cargo + clippy + rustc + rustfmt + rust-analyzer + ]; + }; +} diff --git a/home-modules/ssh.nix b/home-modules/ssh.nix index 425819a..ee9535f 100644 --- a/home-modules/ssh.nix +++ b/home-modules/ssh.nix @@ -16,6 +16,7 @@ "*".identityFile = [ "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}" "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" + "${hyper.home}/vault/ssh/tg-dm-informatik-tuda" ]; "github.com".identityFile = [ "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" ]; "nxace" = nxace "nxace"; diff --git a/home.nix b/home.nix index c965d32..a35891f 100644 --- a/home.nix +++ b/home.nix @@ -42,13 +42,7 @@ ./home-modules/pkgs-list/programs.nix ./home-modules/pkgs-list/shell.nix ./home-modules/pnx.nix - ./home-modules/programming/c.nix - ./home-modules/programming/gleam.nix - ./home-modules/programming/glsl.nix - ./home-modules/programming/go.nix - ./home-modules/programming/java.nix - ./home-modules/programming/js.nix - ./home-modules/programming/python.nix + ./home-modules/programming.nix ./home-modules/qt.nix ./home-modules/rclone.nix ./home-modules/rofi.nix