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

modules/profiles/base.nix

@@ -39,9 +39,9 @@ with lib;
         rm = "rm -i";
         mv = "mv -i";
 
-        nix-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles";
-        nix-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles";
-        nix-lock = "pushd ~/.dotfiles && nix flake update && popd";
+        nixos-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles";
+        nixos-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles";
+        nixos-update = "pushd ~/.dotfiles && nix flake update && popd";
 
         latexwatch = ''find -type f -name "*.tex" | entr -c latexmk -pdf -silent'';
       };
@@ -93,6 +93,7 @@ with lib;
     hut
     lazygit
     neofetch
+    ripgrep
     tmux
     ttyper
     up
@@ -102,13 +103,14 @@ with lib;
 
   fonts.fonts = with pkgs; [
     (nerdfonts.override {
-      fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono" ];
+      fonts = [ "FiraCode" ];
     })
   ];
 
   programs = {
     mtr.enable = true;
     command-not-found.enable = true;
+    starship.enable = true;
   };
 
   services = {
@@ -130,7 +132,6 @@ with lib;
       # Let Home Manager install and manage itself.
       home-manager.enable = true;
       fzf.enable = true;
-      starship.enable = true;
     };
     home = {
       username = "moritz";

modules/profiles/desktop.nix

@@ -20,7 +20,7 @@ with lib; {
 
     programs = {
       adb.enable = true;
-      bspwm.enable = true;
+      hyprland.enable = true;
       code.enable = true;
       emacs.enable = true;
       firefox = {
@@ -95,17 +95,11 @@ with lib; {
       mullvad.enable = true;
       openconnect.enable = true;
       openvpn.enable = true;
-      picom.enable = true;
       printing.enable = true;
       redshift.enable = true;
     };
   };
 
-  programs.xss-lock = {
-    enable = true;
-    lockerCommand = "${pkgs.i3lock-fancy-rapid}/bin/i3lock-fancy-rapid 10 5";
-  };
-
   environment.systemPackages = with pkgs; [
     # nix
     nixpkgs-review
@@ -113,7 +107,7 @@ with lib; {
     # ripping
     abcde
     handbrake
-    stable.picard # HACK to fix broken picard 2.8.3
+    picard
 
     # other
     anki
@@ -127,10 +121,15 @@ with lib; {
     vlc
     thunderbird
     plantuml
+
+    jetbrains.pycharm-professional
+
+    synology-drive-client
   ];
 
+  programs.chromium.enable = true;
+
   home-manager.users.moritz = {
-    services.unclutter.enable = true;
     services.nextcloud-client = {
       enable = true;
       startInBackground = true;

modules/profiles/gaming.nix

@@ -8,5 +8,6 @@
     lutris
     legendary-gl
     heroic
+    mangohud
   ];
 }