Merge remote-tracking branch 'origin/nixos' into nixos-work

modules/profiles/base.nix

@@ -9,7 +9,7 @@ with lib;
   users.users.moritz = {
     isNormalUser = true;
     home = "/home/moritz";
-    extraGroups = [ "wheel" ]; # "networkmanager" "video" "dialout"
+    extraGroups = [ "wheel" "networkmanager" "video" ];
     initialPassword = "password"; # CHANGE ME PLEASE
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGoAqa2m7hIzZ2LS96Z+RCIlRvhBM/j7h27tMBCwMT+a" # Moritz
@@ -22,10 +22,15 @@ with lib;
   time.timeZone = "Europe/Berlin";
 
   my = {
+    nix = {
+      gc.enable = true;
+      optimise.enable = true;
+    };
+    bin.enable = true;
     shell = {
       abbreviations = {
         us = "systemctl --user";
-        rs = "doas systemctl";
+        rs = "sudo systemctl";
       };
       aliases = {
         ls = "exa -lh --icons --git";
@@ -34,8 +39,8 @@ with lib;
         rm = "rm -i";
         mv = "mv -i";
 
-        nix-switch = "doas nixos-rebuild switch --flake ~/.dotfiles";
-        nix-boot = "doas nixos-rebuild boot --flake ~/.dotfiles";
+        nix-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles";
+        nix-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles";
         nix-lock = "pushd ~/.dotfiles && nix flake update && popd";
 
         latexwatch = ''find -type f -name "*.tex" | entr -c latexmk -pdf -silent'';
@@ -43,9 +48,13 @@ with lib;
       variables = { EDITOR = "vim"; };
     };
     programs = {
-      vim.enable = true;
+      direnv.enable = true;
+      fish.enable = true;
+      git.enable = true;
+      gpg.enable = true;
       helix.enable = true;
       kakoune.enable = true;
+      vim.enable = true;
     };
   };
 
@@ -81,14 +90,14 @@ with lib;
     entr
     exa
     gparted
-    hub
+    hut
+    lazygit
     neofetch
     tmux
     ttyper
     up
     viu
     wget
-    hut
   ];
 
   fonts.fonts = with pkgs; [
@@ -110,6 +119,12 @@ with lib;
           (builtins.attrValues config.fileSystems));
   };
 
+  i18n.extraLocaleSettings = {
+    LC_NUMERIC = "de_DE.UTF-8";
+    LC_PAPER = "de_DE.UTF-8";
+    LC_TIME = "de_DE.UTF-8";
+  };
+
   home-manager.users.moritz = {
     programs = {
       # Let Home Manager install and manage itself.
@@ -120,12 +135,6 @@ with lib;
     home = {
       username = "moritz";
       homeDirectory = "/home/moritz";
-      language = {
-        base = "en_US.UTF-8";
-        time = "de_DE.UTF-8";
-        numeric = "de_DE.UTF-8";
-        paper = "de_DE.UTF-8";
-      };
       stateVersion = "21.05";
     };
     xdg.userDirs.enable = true;

modules/profiles/desktop.nix

@@ -78,16 +78,17 @@ with lib; {
       hub.enable = true;
       kitty.enable = true;
       ledger.enable = true;
+      logseq.enable = true;
       python.enable = true;
       rofi.enable = true;
       spotify.enable = true;
       thunar.enable = true;
       zathura.enable = true;
     };
-
     services = {
       dunst.enable = true;
       kdeconnect.enable = true;
+      mullvad.enable = true;
       openconnect.enable = true;
       openvpn.enable = true;
       picom.enable = true;
@@ -96,6 +97,8 @@ with lib; {
     };
   };
 
+  programs.xss-lock.enable = true;
+
   environment.systemPackages = with pkgs; [
     # nix
     nixpkgs-review
@@ -111,11 +114,11 @@ with lib; {
     jellyfin-media-player
     keepassxc
     libreoffice
-    logseq
     pavucontrol
     signal-desktop
     tlaplusToolbox
     vlc
+    thunderbird
   ];
 
   home-manager.users.moritz = {