From 2f94e9b5ff18beb9b77c360a2c13037850adda8c Mon Sep 17 00:00:00 2001 From: FredzyW Date: Mon, 17 Jun 2024 09:46:44 +0200 Subject: [PATCH] SDDM added, prompt changed, and cal sync fixed --- config/base.nix | 37 ++++++++++++++++++++++++++++++++--- config/home.nix | 6 +++++- moduler/common/oh-my-posh.nix | 11 ++++++++++- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/config/base.nix b/config/base.nix index 73e9482..aea7616 100644 --- a/config/base.nix +++ b/config/base.nix @@ -90,6 +90,35 @@ boot.loader.efi.canTouchEfiVariables = true; console.keyMap = "sv-latin1"; + systemd.services.vdirsyncer = { + serviceConfig.Type = "oneshot"; + serviceConfig.User = "fw"; + path = with pkgs; [ vdirsyncer ]; + script = '' + vdirsyncer -c "/home/fw/.config/vdirsyncer/config" sync + ''; + }; + systemd.timers.vdirsyncer = { + wantedBy = [ "timers.target" ]; + partOf = [ "vdirsyncer.service" ]; + timerConfig = { + OnBootSec = "5m"; + OnUnitActiveSec = "5m"; + Unit = "vdirsyncer.service"; + }; + }; + + environment.systemPackages = [( + pkgs.catppuccin-sddm.override { + flavor = "mocha"; + font = "FiraCode Nerd Font Bold"; + fontSize = "17"; + background = "${../wallpapers/inverted.png}"; + loginBackground = true; + } + )]; + + services = { openssh = { enable = true; @@ -107,9 +136,11 @@ variant = ""; }; displayManager = { - startx = { - enable = true; - }; + sddm = { + enable = true; + theme = "catppuccin-mocha"; + package = pkgs.kdePackages.sddm; + }; }; windowManager = { dwm = { diff --git a/config/home.nix b/config/home.nix index 3b3a7f2..1fed9db 100644 --- a/config/home.nix +++ b/config/home.nix @@ -79,6 +79,10 @@ libsecret #Terminal + sc-im + gnuplot + bison + vdirsyncer todoman calcure @@ -179,7 +183,7 @@ programs.fish.enable = true; xsession.enable = true; - xsession.windowManager.command = "exec dwm"; + xsession.windowManager.command = "/home/fw/nix/.xinitrc"; home.username = "fw"; home.homeDirectory = "/home/fw"; diff --git a/moduler/common/oh-my-posh.nix b/moduler/common/oh-my-posh.nix index 05d09d3..9f5ddbd 100644 --- a/moduler/common/oh-my-posh.nix +++ b/moduler/common/oh-my-posh.nix @@ -10,7 +10,7 @@ "closer"= "p:os"; "pink"= "#F5BDE6"; "lavender"= "#B7BDF8"; - "blue"= "#8AADF4"; + "blue"= "#8aadf4"; "peach" = "#f5a97f"; "red" = "#ed8796"; "green" = "#a6da95"; @@ -22,6 +22,15 @@ "newline" = true; "type"= "prompt"; "segments" = [ + { + "background"= "transparent"; + "foreground"= "p:blue"; + # "powerline_symbol"= "\ue0b4"; + # "leading_diamond"= "\ue0b6"; + "style"= "diamond"; + "template"= "{{.Icon}} "; + "type"= "os"; + } { "foreground"= "p:peach"; "properties"= {