rebuild

home/TODOS.md

@@ -1,111 +0,0 @@
-# Neues
-
-## Kalender
-
-- inplemantieren
-- in Thunderbird übernehmen
-
-## GHCI
-
-- Installieren
-
-## Ktouch
-
-- Installieren?
-
-## Discord
-
-- Installieren
-
-## Steam
-
-- Installieren
-- Spiele
-
-## Spotify
-
-- Installieren?
-
-## Minecraft
-
-- FTB
-- ATL
-- Maby nur am standpc
-
-## Bitwarden
-
-- Installieren
-- COe hinzufügen
-- Aufräumen
-
-## Audacity
-
-- Maby nur PC
-
-## Zoom
-
-- Installieren
-
-## Catppuccin Theme
-
-- Ecosia
-- Anki
-- Zathura
-
-# Optimierung
-
-## Neovim
-
-- Sidebar
-
-## Firefox
-
-- Addons strukturieren
-
-## XMonad
-
-- Workspaces
-
-## Nautilus
-
-- Thumbnailer
-
-## Dropbox
-
-- aufräumen
-
-## Sddm
-
-- Profilbild?
-- Wann sperren -> XMonad?
-
-## Dateien
-
-- Sortieren
-- Backup
-- Uni Zeug Drucken
-
-## NixOS - Trash
-
-- Garbage collect einrichten
-
-## Images
-
-- Hintergrund, Lockscreen
-- Webhook
-
-## xmobar
-
-- pulseaudioctl only gives correct answer after one change
-- change bash scripts to Haskell Functions
-
-## Betterbird
-
-- Theme declarativ setzen
-- zweites Profil fixen
-- uni mail
-- privat mail key fixen
-
-## Lockscreen
-
-- Optisch anpassen -> ist nur proviorisch bis jetzt

home/default-desktop.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [ ./programs/default-desktop.nix ./services ./default.nix ];
+}

home/default-laptop.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [ ./programs/default-laptop.nix ./services ./default.nix ];
+}

home/default.nix

@@ -1,7 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./programs ./services ];
   home = {
     username = "elias";
     homeDirectory = "/home/elias";
@@ -18,33 +17,22 @@
       lm_sensors
       arandr
       pavucontrol
+      sshf
+      sshfss
 
       obsidian
       lean4
 
       firefox
+      bitwarden
     ];
 
-    # environment.shells = [ pkgs.zsh ];
-    # environment.variables.EDITOR = "nvim";
-    # environment.pathsToLink = [ "/share/zsh" ];
-
     stateVersion = "23.11";
   };
-  programs = {
-    home-manager.enable = true;
-    # thunar.enable = true;
-    # xfconf.enable = true;
-    # thunar.plugins = with pkgs.xfce; [
-    #   thunar-archive-plugin
-    #   thunar-volman
-    # ];
-  };
+  programs = { home-manager.enable = true; };
 
   nixpkgs.config = {
     allowUnfree = true;
     permittedInsecurePackages = [ "electron-25.9.0" ];
   };
-  # services.gvfs.enable = true;
-  # services.tumbler.enable = true;
 }

home/programs/alacritty/default.nix

@@ -3,7 +3,7 @@
 let
   theme = builtins.fetchurl {
     url =
-      "https://github.com/catppuccin/alacritty/ raw/main/catppuccin-mocha.toml";
+      "https://github.com/catppuccin/alacritty/raw/main/catppuccin-mocha.toml";
     sha256 = "061yalrzpqivr67k2f8hsqixr77srgd8y47xvhp5vg0sjmh5lrcy";
   };
 in {

home/programs/audacity/default.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ audacity ];
+}

home/programs/default-desktop.nix

@@ -0,0 +1 @@
+{ imports = [ ./default.nix ./audacity ]; }

home/programs/default-laptop.nix

@@ -0,0 +1 @@
+{ imports = [ ./default.nix ]; }

home/programs/default.nix

@@ -1,21 +1,25 @@
 {
   imports = [
     ./alacritty
-    ./anki.nix
-    ./discord.nix
-    ./element.nix
-    ./git.nix
-    ./ktouch.nix
+    ./anki
+    ./discord
+    ./element
+    ./git
+    ./ktouch
+    ./libreoffice
+    ./nemo
     ./neovim
     ./obs
-    ./planify.nix
+    ./planify
     ./rofi
-    ./signal.nix
-    ./telegram.nix
+    ./signal
+    ./spotify
+    ./telegram
     ./thunderbird
-    ./wallpaper.nix
+    ./wallpaper
     ./xmonad
-    ./zathura.nix
+    ./zathura
+    ./zoom
     ./zsh
   ];
 }

home/programs/element/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 
 {
   home.packages = with pkgs; [ element-desktop ];

home/programs/ktouch.nix

@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.programs = with pkgs.libsForQt5; [ ktouch ];
-}

home/programs/ktouch/default.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs.libsForQt5; [ ktouch ];
+}

home/programs/libreoffice/default.nix

@@ -0,0 +1,5 @@
+{ pkgs, lib, ... }:
+
+{
+  home.packages = with pkgs; [ libreoffice-qt hunspell hunspellDicts.de_DE ];
+}

home/programs/nemo/default.nix

@@ -0,0 +1,30 @@
+{ pkgs, config, ... }:
+
+{
+  home.packages = with pkgs; [
+    cinnamon.nemo-with-extensions
+    gnome.gnome-themes-extra
+    dconf
+  ];
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Catppuccin-Mocha-Compact-Flamingo-Dark";
+      package = pkgs.catppuccin-gtk.override {
+        accents = [ "flamingo" ];
+        size = "compact";
+        tweaks = [ "rimless" "black" ];
+        variant = "mocha";
+      };
+    };
+  };
+
+  xdg.configFile = {
+    "gtk-4.0/assets".source =
+      "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets";
+    "gtk-4.0/gtk.css".source =
+      "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css";
+    "gtk-4.0/gtk-dark.css".source =
+      "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css";
+  };
+}

home/programs/neovim/default.nix

@@ -15,7 +15,7 @@ let
 in {
   home.sessionVariables = { EDITOR = "nvim"; };
 
-  home.packages = with pkgs; [ nerdfonts ];
+  home.packages = with pkgs; [ nerdfonts texliveFull ];
 
   programs.neovim = {
     enable = true;
@@ -90,7 +90,6 @@ in {
       isort
       python311Packages.autopep8
       # LaTeX
-      texliveFull
       texlab
       xdotool
       pplatex

home/programs/spotify/app.toml

@@ -0,0 +1 @@
+theme = "Catppuccin-mocha"

home/programs/spotify/default.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ spotify ];
+}

home/programs/spotify/theme-catppuccin.toml

@@ -0,0 +1,98 @@
+# Catppuccin themes for Spotify-player
+
+[[themes]]
+name = "Catppuccin-mocha"
+[themes.palette]
+background = "#1E1E2E"
+foreground = "#CDD6F4"
+black = "#1E1E2E"
+blue = "#89B4FA"
+cyan = "#89DCEB"
+green = "#A6E3A1"
+magenta = "#CBA6F7"
+red = "#F38BA8"
+white = "#CDD6F4"
+yellow = "#F9E2AF"
+bright_black = "#1E1E2E"
+bright_blue = "#89B4FA"
+bright_cyan = "#89DCEB"
+bright_green = "#A6E3A1"
+bright_magenta = "#CBA6F7"
+bright_red = "#F38BA8"
+bright_white = "#CDD6F4"
+bright_yellow = "#F9E2AF"
+
+[themes.component_style]
+selection = { bg = "#313244", modifiers = ["Bold"] }
+
+[[themes]]
+name = "Catppuccin-latte"
+[themes.palette]
+background = "#EFF1F5"
+foreground = "#4C4F69"
+black = "#EFF1F5"
+blue = "#1E66F5"
+cyan = "#04A5E5"
+green = "#40A02B"
+magenta = "#8839EF"
+red = "#D20F39"
+white = "#4C4F69"
+yellow = "#DF8E1D"
+bright_black = "#EFF1F5"
+bright_blue = "#1E66F5"
+bright_cyan = "#04A5E5"
+bright_green = "#40A02B"
+bright_magenta = "#8839EF"
+bright_red = "#D20F39"
+bright_white = "#4C4F69"
+bright_yellow = "#DF8E1D"
+[themes.component_style]
+selection = { bg = "#CCD0DA", modifiers = ["Bold"] }
+
+[[themes]]
+name = "Catppuccin-frappe"
+[themes.palette]
+background = "#303446"
+foreground = "#C6D0F5"
+black = "#303446"
+blue = "#8CAAEE"
+cyan = "#89DCEB"
+green = "#A6D189"
+magenta = "#CA9EE6"
+red = "#E78284"
+white = "#C6D0F5"
+yellow = "#E5C890"
+bright_black = "#303446"
+bright_blue = "#8CAAEE"
+bright_cyan = "#89DCEB"
+bright_green = "#A6D189"
+bright_magenta = "#CA9EE6"
+bright_red = "#E78284"
+bright_white = "#C6D0F5"
+bright_yellow = "#E5C890"
+[themes.component_style]
+selection = { bg = "#414559", modifiers = ["Bold"] }
+
+[[themes]]
+name = "Catppuccin-macchiato"
+[themes.palette]
+background = "#24273A"
+foreground = "#CAD3F5"
+black = "#24273A"
+blue = "#8AADF4"
+cyan = "#91D7E3"
+green = "#A6DA95"
+magenta = "#C6A0F6"
+red = "#ED8796"
+white = "#CAD3F5"
+yellow = "#EED49F"
+bright_black = "#24273A"
+bright_blue = "#8AADF4"
+bright_cyan = "#91D7E3"
+bright_green = "#A6DA95"
+bright_magenta = "#C6A0F6"
+bright_red = "#ED8796"
+bright_white = "#CAD3F5"
+bright_yellow = "#EED49F"
+[themes.component_style]
+selection = { bg = "#363A4F", modifiers = ["Bold"] }

home/programs/thunderbird/default.nix

@@ -6,6 +6,7 @@
     profiles = {
       privat.isDefault = true;
       kjr.isDefault = false;
+      uni.isDefault = false;
     };
     settings = { };
   };
@@ -26,7 +27,7 @@
           '';
           showSignature = "append";
         };
-        passwordCommand = "mail-password";
+        passwordCommand = "OAuth2";
         smtp = {
           host = "smtp.office365.com";
           port = 587;
@@ -44,7 +45,7 @@
           key = "0x99D2EF975FE523CC";
           signByDefault = true;
         };
-        aliases = [ "eliasschrei@gmail.com" "elias.schroeter1601@gmail.com" ];
+        aliases = [ "elias.schroeter@murena.io" "xacufe67.cadome83@murena.io" ];
         imap = {
           host = "mail.ecloud.global";
           port = 993;
@@ -71,6 +72,34 @@
         primary = true;
         thunderbird = { enable = true; };
       };
+      uni = {
+        address = "elias.schroeter@campus.lmu.de";
+        imap = {
+          host = "studlmu.lrz.de";
+          port = 993;
+          tls.enable = true;
+        };
+        realName = "Elias Schröter";
+        signature = {
+          text = ''
+            Mit freundlichen Grüßen,
+            Elias Schröter.
+          '';
+          showSignature = "append";
+        };
+        passwordCommand = "mail-password";
+        smtp = {
+          host = "postout.lrz.de";
+          port = 587;
+          tls = {
+            enable = true;
+            useStartTls = true;
+          };
+        };
+        userName = "elias.schroeter@campus.lmu.de";
+        primary = false;
+        thunderbird = { enable = true; };
+      };
     };
   };
 }

home/programs/wallpaper/default.nix

@@ -1,11 +1,9 @@
 { pkgs, ... }:
 
 {
-  programs.feh = {
-    enable = true;
-  };
+  programs.feh = { enable = true; };
 
   xsession.initExtra = ''
-    ${pkgs.feh}/bin/feh --bg-fill --no-fehbg "/etc/nixos/home/programs/background_temp.jpeg"
-    '';
+    ${pkgs.feh}/bin/feh --bg-fill --no-fehbg "/etc/nixos/home/programs/wallpaper/background_temp.jpeg"
+  '';
 }

home/programs/xmonad/src/xmobar/xmobar.hs

@@ -18,7 +18,7 @@ config =
     , commands =
       [
         --Run $ Audio 10
-        Run $ Com "/bin/sh" ["-c", "Status=$(pulseaudio-ctl full-status); Volume=$(cut -d ' ' -f 1 <<<$Status); Mute=$(cut -d ' ' -f 2 <<<$Status); Microphone=$(cut -d ' ' -f 3 <<<$Status); SpeakerColor=\"#a6e3a1\"; MicColor=\"#a6e3a1\"; if [[ $Mute == \"yes\" ]]; then Symbol=\"\xf466\"; SpeakerColor=\"#f38ba8\"; elif [[ $Volume -le 50 ]]; then Symbol=\"\xf027\"; elseSymbol=\"\xf028\"; fi; if [[ $Microphone == \"yes\" ]]; then MicOut=\"\xf036d\"; MicColor=\"#f38ba8\"; else MicOut=\"\xf036c\"; fi; echo \"<fc=$SpeakerColor><fn=1>$Symbol</fn></fc> $Volume% <fc=$MicColor><fn=1>$MicOut</fn></fc>\""] "audio" 60
+        Run $ Com "/bin/sh" ["-c", "Status=$(pulseaudio-ctl full-status); Volume=$(cut -d ' ' -f 1 <<<$Status); Mute=$(cut -d ' ' -f 2 <<<$Status); Microphone=$(cut -d ' ' -f 3 <<<$Status); SpeakerColor=\"#a6e3a1\"; MicColor=\"#a6e3a1\"; if [[ $Mute == \"yes\" ]]; then Symbol=\"\xf466\"; SpeakerColor=\"#f38ba8\"; elif [[ $Volume -le 50 ]]; then Symbol=\"\xf027\"; elseSymbol=\"\xf028\"; fi; if [[ $Microphone == \"yes\" ]]; then MicOut=\"\xf036d\"; MicColor=\"#f38ba8\"; else MicOut=\"\xf036c\"; fi; echo \"<fc=$SpeakerColor><fn=1>$Symbol</fn></fc> $Volume% <fc=$MicColor><fn=1>$MicOut</fn></fc>\""] "audio" 10
         --Run $ Com "/bin/sh" ["-c", "Status=$(pulseaudio-ctl full-status);
         --  Volume=$(cut -d ' ' -f 1 <<<$Status);
         --  Mute=$(cut -d ' ' -f 2 <<<$Status);

home/programs/zoom/default.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ zoom-us ];
+}

home/programs/zsh/default.nix

@@ -1,7 +1,13 @@
 { pkgs, config, ... }:
 
 {
-  home.packages = with pkgs; [ fzf python3 zsh-nix-shell nix-zsh-completions ];
+  home.packages = with pkgs; [
+    fzf
+    python3
+    zsh-nix-shell
+    nix-zsh-completions
+    neofetch
+  ];
 
   programs.zsh = {
     enable = true;
@@ -9,7 +15,8 @@
     shellAliases = {
       update = "sudo nixos-rebuild switch";
       addTV =
-        "xrandr --output eDP-1 --auto --output HDMI-1 --mode 1920x1080 --right-of eDP-1";
+        "xrandr --output eDP-1 --auto --output HDMI-1 --mode 1920x1080 --left-of eDP-1";
+      conWG = "ssh elias@logout.nonagon.dev -p 6969";
     };
     enableAutosuggestions = true;
     enableCompletion = true;
@@ -21,6 +28,8 @@
     };
     syntaxHighlighting = { enable = true; };
     initExtra = ''
+      neofetch
+
       PROMPT='%F{green}%n%f@%F{magenta}%m%f %F{blue}%B%~%b%f %# '
       RPROMPT='[%F{yellow}%?%f]'
       bindkey "^[[A" history-beginning-search-backward

home/services/betterlockscreen/default.nix

@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  services.betterlockscreen = {
+    enable = true;
+    arguments = [ "blur" ];
+  };
+}

home/services/default.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }:
 
 {
-  imports = [ ./ssh-agent.nix ./gpg-agent.nix ./xscreenlocker.nix ];
+  imports = [ ./ssh-agent ./gpg-agent ./betterlockscreen ];
 }

home/services/gpg-agent/default.nix

@@ -0,0 +1,28 @@
+{ pkgs, ... }:
+
+# See https://github.com/nix-community/home-manager/issues/3095
+let
+  pinentryRofi = pkgs.writeShellApplication {
+    name = "pinentry-rofi-with-env";
+    text = ''
+      PATH="$PATH:${pkgs.coreutils}/bin:${pkgs.rofi}/bin"
+      "${pkgs.pinentry-rofi}/bin/pinentry-rofi" "$@"
+    '';
+  };
+in {
+  home.packages = with pkgs; [ pinentry-rofi ];
+
+  programs.gpg.enable = true;
+
+  services.gpg-agent = {
+    enable = true;
+    enableZshIntegration = true;
+    pinentryFlavor = null;
+    defaultCacheTtl = 7200; # 2h
+    maxCacheTtl = 28800; # 8h
+    extraConfig = ''
+      pinentry-program ${pinentryRofi}/bin/pinentry-rofi-with-env
+    '';
+  };
+}
+

home/services/xscreenlocker.nix

@@ -1,19 +0,0 @@
-{ pkgs, ... }:
-
-let images = pkgs.callPackage ../extras/images.nix { };
-in {
-  home.packages = with pkgs; [ xsecurelock ];
-
-  home.sessionVariables = rec {
-    XSECURELOCK_COMPOSITE_OBSCURER = 0;
-    XSECURELOCK_PASSWORD_PROMPT = "asterisks";
-  };
-
-  services.screen-locker = {
-    enable = true;
-    inactiveInterval = 1;
-    lockCmd = "${pkgs.xsecurelock}/bin/xsecurelock";
-    xautolock.extraOptions = [ "Xautolock.killer: systemctl suspend" ];
-  };
-}
-