diff options
| author | Jakub Stachurski <j.stachurski@student.utwente.nl> | 2026-02-11 15:03:20 +0100 |
|---|---|---|
| committer | Jakub Stachurski <j.stachurski@student.utwente.nl> | 2026-02-11 15:03:20 +0100 |
| commit | 52e8a6819240c59c8a84b141f9a10a6c7dc7304d (patch) | |
| tree | ec3e684581d31f8233423d9aa104c5048625a540 | |
| parent | 41df7d18185c689811e9758ddab4673a30dee405 (diff) | |
nix fmt
| -rw-r--r-- | home-modules/desktop/hyprland.nix | 16 | ||||
| -rw-r--r-- | home-modules/theming.nix | 2 | ||||
| -rw-r--r-- | modules/desktop/akonadi.nix | 2 | ||||
| -rw-r--r-- | modules/motd.nix | 70 |
4 files changed, 45 insertions, 45 deletions
diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix index f1ff86d..164282e 100644 --- a/home-modules/desktop/hyprland.nix +++ b/home-modules/desktop/hyprland.nix @@ -257,12 +257,12 @@ with lib; Install.WantedBy = lib.mkForce [ "hyprland-session.target" ]; }; - # TODO: Put the default wallpaper somewhere else. + # TODO: Put the default wallpaper somewhere else. home.file.defaultWallpaper = { source = ./wallpaper.png; - target = "Pictures/Wallpapers/wallpaper.png"; - enable = true; - }; + target = "Pictures/Wallpapers/wallpaper.png"; + enable = true; + }; services.hyprpaper = { enable = true; @@ -272,12 +272,12 @@ with lib; splash_offset = 2; # preload = [ "${./wallpaper.png}" ]; - wallpaper = [ - { + wallpaper = [ + { monitor = ""; - path = "${config.home.homeDirectory}/${config.home.file.defaultWallpaper.target}"; + path = "${config.home.homeDirectory}/${config.home.file.defaultWallpaper.target}"; fit_mode = "cover"; - } + } ]; }; }; diff --git a/home-modules/theming.nix b/home-modules/theming.nix index 94af4ac..15b596b 100644 --- a/home-modules/theming.nix +++ b/home-modules/theming.nix @@ -38,7 +38,7 @@ in enable = true; kde.settings = { - }; + }; style.package = pkgs.catppuccin-qt5ct; # style.name = "kvantum"; diff --git a/modules/desktop/akonadi.nix b/modules/desktop/akonadi.nix index fb93913..abdb5a2 100644 --- a/modules/desktop/akonadi.nix +++ b/modules/desktop/akonadi.nix @@ -2,7 +2,7 @@ { programs.kde-pim = { enable = true; - kmail = true; + kmail = true; merkuro = true; kontact = true; }; diff --git a/modules/motd.nix b/modules/motd.nix index 7f7e229..f9f572c 100644 --- a/modules/motd.nix +++ b/modules/motd.nix @@ -1,13 +1,13 @@ -{pkgs, config, lib, ...}: - let - banner_script = pkgs.writeShellScript "motd_banner.sh" '' - echo "This is a nice banner, property of wilkuu (wilkuu.xyz)" - echo -e "\n\tTODO: Put a banner here\t\n" - echo "Current hostname: ${config.networking.hostName}" - ''; - - # Code stolen from the nix store so I can finish motd_shell - motdConf = +{ pkgs, config, ... }: +let + banner_script = pkgs.writeShellScript "motd_banner.sh" '' + echo "This is a nice banner, property of wilkuu (wilkuu.xyz)" + echo -e "\n\tTODO: Put a banner here\t\n" + echo "Current hostname: ${config.networking.hostName}" + ''; + + # Code stolen from the nix store so I can finish motd_shell + motdConf = pkgs.runCommand "motd.toml" { __structuredAttrs = true; @@ -25,20 +25,22 @@ | from_entries' -r \ | json2toml /dev/stdin "$out" ''; - - motd_shell = pkgs.writeShellScriptBin "motd_shell" '' - if [[ -n "$SHOW_MOTD" && -x /run/current-system/sw/bin/rust-motd ]]; then - unset SHOW_MOTD - ${pkgs.rust-motd}/bin/rust-motd ${motdConf} - fi - $1 - ''; - in { + + motd_shell = pkgs.writeShellScriptBin "motd_shell" '' + if [[ -n "$SHOW_MOTD" && -x /run/current-system/sw/bin/rust-motd ]]; then + unset SHOW_MOTD + ${pkgs.rust-motd}/bin/rust-motd ${motdConf} + fi + $1 + ''; +in +{ environment.systemPackages = with pkgs; [ - rust-motd motd_shell + rust-motd + motd_shell ]; programs.rust-motd = { - enable = true; + enable = true; order = [ "banner" "uptime" @@ -47,31 +49,31 @@ "memory" "last_run" "global" - ]; + ]; settings = { banner = { - color = "light_magenta"; + color = "light_magenta"; # TODO: Make this nice command = "bash ${banner_script}"; }; uptime = { prefix = "Uptime: "; - }; + }; load_avg = { format = '' - Load: [1m] [5m] [15m] - {one:.02} , {five:.02} , {fifteen:.02} -''; + Load: [1m] [5m] [15m] + {one:.02} , {five:.02} , {fifteen:.02} + ''; }; filesystems = { - root = "/"; + root = "/"; store = "/store2"; - ntfs = "/win_games"; - }; + ntfs = "/win_games"; + }; memory = { - swap_pos = "beside"; - }; - last_run = {}; + swap_pos = "beside"; + }; + last_run = { }; }; }; security.pam.services.kitty = { @@ -84,6 +86,4 @@ showMotd = true; }; - - } |
