restore secrets repo

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756115622,
+        "lastModified": 1758287904,
-        "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=",
+        "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "bafad29f89e83b2d861b493aa23034ea16595560",
+        "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
         "type": "github"
       },
       "original": {
@@ -23,10 +23,10 @@
     "mysecrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1753141577,
+        "lastModified": 1758645420,
-        "narHash": "sha256-MNbm7KCEqML5l72GppVoxXX03UtVGIzUsgaW+A+FBDQ=",
+        "narHash": "sha256-lH9KLcUFv9yM0wZMPSc3CHAjwYK1ndUN7vOMKOkQ+fc=",
         "ref": "main",
-        "rev": "c1edf4983cba959f93daa9c7ef0c1acbd958c755",
+        "rev": "9f2720cb96da0f02ce709000b498e7418e155a25",
         "shallow": true,
         "type": "git",
         "url": "ssh://gitea@git.unixyourbrain.org/beastie/nixos-secrets.git"
@@ -40,11 +40,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1756386758,
+        "lastModified": 1758427187,
-        "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
+        "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
+        "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754988908,
+        "lastModified": 1758425756,
-        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
+        "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
+        "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
         "type": "github"
       },
       "original": {

flake.nix

@@ -16,6 +16,7 @@
 
     mysecrets = {
       url = "git+ssh://gitea@git.unixyourbrain.org/beastie/nixos-secrets.git?ref=main&shallow=1";
+      # url = "path:/home/beastie/nixos-secrets";
       flake = false;
     };
   };

modules/common/default.nix

@@ -70,6 +70,7 @@
     pkgs.unzip
     pkgs.openssl
     pkgs.adoptopenjdk-icedtea-web
+    pkgs.pwgen
     # Nvim with dependencies
     pkgs.nodejs
     pkgs.gcc

modules/desktop/X11/default.nix

@@ -16,17 +16,16 @@
       };
     };
   };
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = [
-    numlockx
+    pkgs.numlockx
-    adwaita-icon-theme
+    pkgs.adwaita-icon-theme
-    xclip
+    pkgs.xclip
-    flameshot
+    pkgs.flameshot
   ];
   environment.etc = {
     "X11/xinit/xinitrc".source = ./config/xinitrc;
   };
-  imports =
+  imports = [
-    [
     ./i3
     ./polybar
   ]

modules/desktop/common/default.nix

@@ -23,6 +23,8 @@
     pkgs.papirus-icon-theme
     pkgs.catppuccin-cursors
     pkgs.catppuccin-gtk
+    pkgs.vscodium
+    pkgs.vscode
   ];
   fonts.packages = [
     pkgs.nerd-fonts.dejavu-sans-mono

modules/desktop/rofi/default.nix

@@ -15,7 +15,7 @@
           Shutdown\0icon\x1fsystem-shutdown
           Reboot\0icon\x1fsystem-reboot
           Exit hyprland\0icon\x1fsystem-log-out
-          Reload hyprland\0icon\x1fsystem-log-out" | ${pkgs.rofi-wayland}/bin/rofi -dmenu -show-icons -i -theme /etc/xdg/rofi/disconnect.rasi -p System)
+          Reload hyprland\0icon\x1fsystem-log-out" | ${pkgs.rofi}/bin/rofi -dmenu -show-icons -i -theme /etc/xdg/rofi/disconnect.rasi -p System)
 
           echo "$selected"
 
@@ -56,7 +56,7 @@
              _LINES="$(curl "http://10.0.0.1:2013/$1" 2>/dev/null | sed -e "s|.*<a href=\"\([^\"]*\).*|$1\1|" -e "s/.*<.*\|.*C=D.*\|.*\/\/$\|.*.nfo//" -e "/^$/d")"
           fi
 
-          _RESULT=$(${pkgs.rofi-wayland}/bin/rofi -dmenu -config /etc/xdg/rofi/config.rasi -i <<< "$_LINES")
+          _RESULT=$(${pkgs.rofi}/bin/rofi -dmenu -config /etc/xdg/rofi/config.rasi -i <<< "$_LINES")
 
           # If no output
           echo "$_RESULT"

modules/desktop/wayland/config/hypr/hyprland.conf

@@ -199,9 +199,7 @@ input {
 }
 
 # https://wiki.hyprland.org/Configuring/Variables/#gestures
-gestures {
+gesture = 3, horizontal, workspace
-    workspace_swipe = false
-}
 
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more

modules/desktop/wayland/default.nix

@@ -8,7 +8,6 @@
 
   environment.systemPackages = [
     pkgs.wl-clipboard
-    pkgs.rofi-wayland
     pkgs.waybar
     pkgs.font-awesome
     pkgs.hyprlock
@@ -27,7 +26,7 @@
       "xdg/hypr/hyprpaper.conf".source = ./config/hypr/hyprpaper.conf;
       "xdg/hypr/rofi.conf" = {
         text = ''
-          $rofi = ${pkgs.rofi-wayland}/bin/rofi -show drun -show-icons -config /etc/xdg/rofi/config.rasi
+          $rofi = ${pkgs.rofi}/bin/rofi -show drun -show-icons -config /etc/xdg/rofi/config.rasi
         '';
       };
       "xdg/waybar".source = ./config/waybar;

modules/networking/home-nix.nix

@@ -22,6 +22,7 @@
     ];
     networkmanager.enable = true;
     extraHosts = ''
+      172.18.21.172   errorpages.grandbesancon.fr
       #172.18.23.4    dozzle.grandbesancon.fr
       #172.18.22.206  toto.grandbesancon.fr
       #172.18.229.3   sso.grandbesancon.fr

modules/networking/openfortivpn.nix

@@ -63,7 +63,7 @@ in
       ExecStart = "${pkgs.openfortivpn}/bin/openfortivpn --no-dns";
       ExecStartPost = "${openfortivpn-addroute}";
       ExecStopPost = "${openfortivpn-delroute}";
-      #Restart = "on-failure";
+      Restart = "on-failure";
       #OOMScoreAdjust = "-100";
     };
   };