Merge pull request #40 from tomasriveral/desktop

Weekly sync: desktop → main

README.md

@@ -430,6 +430,7 @@ The macros in the layout generate combinations involving `CTRL`, `ALT`, `SUPER`,
 | Row 2, Col 2 | Change audio output (`CTRL + ALT + SHIFT + 0`)    |
 | Row 2, Col 3 | Special characters (`CTRL + SUPER + 5`)           |
 | Row 2, Col 4 | Color picker (`CTRL + ALT + 8`)                   |
+| Row 3, Col 1 | Pomodoro timer (`CTRL + ALT + 0`)                 |
 | Row 4, Col 1 | Launch Anki (`CTRL + ALT + 9`)                    |
 
 The physical layout file contains additional transparent/unused positions, but the bindings above are the active shortcuts documented for the macropad.

flake.nix

@@ -64,15 +64,12 @@
         flake = let
           system = "x86_64-linux";
           unfreePkgs = [
-            "code"
             "hplip"
             "nvidia-x11"
             "nvidia-settings"
             "steam"
             "steam-unwrapped"
             "cheatsheet.nvim"
-            "vscode"
-            "vscode-fhs"
             "zoom-us"
             "zoom"
           ];

modules/applications/browser.nix

@@ -402,24 +402,6 @@
               keyword = "nix function search";
               url = "https://noogle.dev";
             }
-            {
-              name = "EPFL Moodle";
-              tags = ["epfl" "moodle"];
-              keyword = "epfl moodle";
-              url = "https://moodle.epfl.ch/my/courses.php";
-            }
-            {
-              name = "EPFL ICC Courseware";
-              tags = ["icc" "epfl" "courseware"];
-              keyword = "icc epfl courseware";
-              url = "https://courseware.epfl.ch/learner-dashboard/";
-            }
-            {
-              name = "Detexify";
-              tags = ["draw" "Latex" "symbols"];
-              keyword = "draw latex symbols";
-              url = "https://detexify.kirelabs.org/";
-            }
           ];
         };
         search = {

modules/applications/caelestia.nix

@@ -24,16 +24,16 @@
       inhibitWhenAudio = true;
       timeouts = [
         {
-          timeout = 1000;
+          timeout = 180;
           idleAction = "lock";
         }
         {
-          timeout = 1010;
+          timeout = 300;
           idleAction = "dpms off"; # what's that?
           returnAction = "dpms on";
         }
         {
-          timeout = 12200;
+          timeout = 600;
           idleAction = ["systemctl" "suspend-then-hibernate"];
         }
       ];

modules/applications/hyprland.nix

@@ -39,6 +39,7 @@ _: {
     text = ''
         hl.on("hyprland.start", function()
           hl.exec_cmd("qtbatticon")
+        hl.exec_cmd("source /run/agenix/ntfy && nixpkgs-notifier listen")
       end)
   
       hl.monitor({

modules/applications/zsh.nix

@@ -43,11 +43,6 @@ _: {
       enable = true;
       autosuggestion.enable = false; # zsh-autocomplete is replaced by deja
       initContent = ''
-        # those aliases can't be written in nix, because of ö
-        # l and ö are very close
-        alias -- ös=ls
-        alias -- öös=ls
-
         # Safe cat that uses colorize plugin ccat
         custom-cat() {
           if [[ -t 1 ]]; then
@@ -66,11 +61,7 @@ _: {
         }
         eval "$(direnv hook zsh)"
         eval "$(deja init zsh)"
-        if [[ "$TERM_PROGRAM" != "vscode" ]]; then
+              fastfetch''\n'';
-          fastfetch
-        fi
-
-        '';
       shellAliases = {
         ".." = "z ..";
         grep = "rg";

modules/hardware/hardwareUtils.nix

@@ -11,7 +11,6 @@ _: {
       })
       syswatch
     ];
-    services.fwupd.enable = true; # update device firmware
   };
   flake.nixosModules.hardwareUtils-desktop = {pkgs-unstable, ...}: {
     environment.systemPackages = with pkgs-unstable; [
@@ -21,6 +20,5 @@ _: {
       })
       syswatch
     ];
-    services.fwupd.enable = true; # update device firmware
   };
 }

modules/hosts/laptop.nix

@@ -23,7 +23,6 @@
       bootloader
       browsers
       caelestia
-      cs-119l # I'm obliged to use vscode. RIP neovim
       development
       documentation
       disk

modules/utilities/communicationAndNotification.nix

@@ -9,7 +9,6 @@
       self.packages.${pkgs.system}.custom-gitnotify # checks if git is set up
       self.packages.${pkgs.system}.custom-checkKdrive # check if kdrive is set up with rclone
       zoom-us
-      telegram-desktop
     ];
   };
   perSystem = {pkgs, ...}: {

modules/utilities/epfl.nix

@@ -1,65 +1,7 @@
-{self, ...}: {
+_: {
   flake.nixosModules.epfl = {pkgs, ...}: {
     environment.systemPackages = with pkgs; [
       openconnect
-      self.packages.${pkgs.system}.custom-mountEpflDrive
     ];
   };
-
-  flake.nixosModules.cs-119l = {pkgs, ...}: let
-    user = "tomasr";
-    home = "/home/${user}";
-    src = "${home}/epfl/cs-119l-ICC/";
-    dst = "${home}/kdrive/Travail/2 - Bachelor/BA1/Information, calcul, communication CS-119l/code/";
-  in {
-    environment.systemPackages = with pkgs; [
-      vscode-fhs
-    ];
-    systemd.services.sync-cs119l-to-kdrive = {
-      description = "Sync CS-119l ICC to kDrive";
-
-      serviceConfig = {
-        Type = "oneshot";
-        User = user;
-
-        ExecStart = "${pkgs.rsync}/bin/rsync -a '${src}' '${dst}'";
-      };
-    };
-
-    systemd.timers.sync-cs119l-to-kdrive = {
-      description = "Sync CS-119l ICC to kDrive every Thursday and Friday evening";
-
-      wantedBy = ["timers.target"];
-
-      timerConfig = {
-        OnCalendar = [
-          "Thu *-*-* 20:00:00"
-          "Fri *-*-* 20:00:00"
-        ];
-        Persistent = true;
-      };
-    };
-  };
-  perSystem = {pkgs, ...}: {
-    packages.custom-mountEpflDrive = pkgs.writeShellApplication {
-      name = "custom-mountEpflDrive";
-      runtimeInputs = with pkgs; [
-        rclone
-        libnotify
-      ];
-      text = ''
-        REMOTE_NAME="epfl"
-        MOUNT_POINT="$HOME/epfl/drive"
-
-        if rclone listremotes | rg "^''${REMOTE_NAME}:"; then
-            echo "Mounting ''${REMOTE_NAME}..."
-            rclone mount "''${REMOTE_NAME}:" "$MOUNT_POINT" --vfs-cache-mode writes --allow-non-empty &
-        else
-            notify-send "rclone mount failed" \
-                "Remote ''${REMOTE_NAME} not found.\nConfigure rclone and create the dir ~/epfl/drive/ or comment out the exec line in hyprland.lua."
-        echo        "Remote ''${REMOTE_NAME} not found. Configure rclone or comment out the exec line in hyprland.lua."
-        fi
-      '';
-    };
-  };
 }

other/hyprland/hyprland.lua

@@ -322,7 +322,7 @@ hl.bind(mod .. " + CTRL + 3", hl.dsp.exec_cmd("pavucontrol"))
 hl.bind("CTRL + SHIFT + ALT + 0", hl.dsp.exec_cmd("kitty --hold --class \"custom-changeAudioOutput\" --name \"Select audio output\" zsh -c \"custom-changeAudioOutput\""))
 hl.bind(mod .. " + CTRL + 5", hl.dsp.exec_cmd("gnome-characters"))
 hl.bind("CTRL + ALT + 8", hl.dsp.exec_cmd("hyprpicker | tee >(wl-copy) | cliphist store"))
--- hl.bind("CTRL + ALT + 0", hl.dsp.exec_cmd("custom-tomato"))
+hl.bind("CTRL + ALT + 0", hl.dsp.exec_cmd("custom-tomato"))
 hl.bind("CTRL + ALT + 2", hl.dsp.exec_cmd("custom-bottom"))
 hl.bind("CTRL + ALT + 9", hl.dsp.exec_cmd("anki"))
 
@@ -940,7 +940,6 @@ hl.on("hyprland.start", function()
     hl.exec_cmd("awww img WALLPAPER/PATH/PLACEHOLDER")
     hl.exec_cmd("awww-daemon")
     hl.exec_cmd("custom-checkKdrive && custom-mountkdrive")
-    hl.exec_cmd("custom-mountEpflDrive")
     hl.exec_cmd("custom-gitnotify")
     hl.exec_cmd("sleep 4 & caelestia-shell")
     hl.exec_cmd("sleep 20 && ngcp pull --automatic")