restore secrets repo

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752718651,
-        "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=",
+        "lastModified": 1758287904,
+        "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88",
+        "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
         "type": "github"
       },
       "original": {
@@ -23,10 +23,10 @@
     "mysecrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1753141577,
-        "narHash": "sha256-MNbm7KCEqML5l72GppVoxXX03UtVGIzUsgaW+A+FBDQ=",
+        "lastModified": 1758645420,
+        "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": 1752364307,
-        "narHash": "sha256-o0Cm4fhz/ukV/excbnwkRB2sqknenkb/0T4pcgXjrp0=",
-        "owner": "NixOS",
+        "lastModified": 1758427187,
+        "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b6071be3c0d9404113988e5e253eb6d71d1ddbef",
+        "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752544651,
-        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
+        "lastModified": 1758425756,
+        "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
+        "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

@@ -68,6 +68,9 @@
     pkgs.cifs-utils
     pkgs.neovim
     pkgs.unzip
+    pkgs.openssl
+    pkgs.adoptopenjdk-icedtea-web
+    pkgs.pwgen
     # Nvim with dependencies
     pkgs.nodejs
     pkgs.gcc

modules/desktop/X11/default.nix

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

modules/desktop/common/default.nix

@@ -8,6 +8,7 @@
     pkgs.mpv
     pkgs.chromium
     pkgs.firefox
+    pkgs.tor-browser
     pkgs.keepassxc
     pkgs.nwg-look
     pkgs.gimp
@@ -22,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 {
-    workspace_swipe = false
-}
+gesture = 3, horizontal, workspace
 
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more

modules/desktop/wayland/config/scripts/update.sh

@@ -17,7 +17,7 @@ if [ "$current_hash" != "$latest_hash" ]; then
   maj_count=$(curl -s "https://api.github.com/repos/NixOS/nixpkgs/compare/${current_hash}...${latest_hash}" | jq -r '.ahead_by // 0' 2>/dev/null || echo "?")
 
   # Date du commit distant
-  remote_commit_date=$(curl -s https://api.github.com/repos/NixOS/nixpkgs/commits/c87b95e25065c028d31a94f06a62927d18763fdf | jq -r '.commit.author.date')
+  remote_commit_date=$(curl -s https://api.github.com/repos/NixOS/nixpkgs/commits/"${latest_hash}" | jq -r '.commit.author.date')
   remote_commit_date=$(date -d "${remote_commit_date}" "+%d/%m/%Y à %H:%M")
   printf '{"text": "%s ", "tooltip": "Commit distant : %s\\nCommit local : %s"}' "${maj_count}" "${remote_commit_date}" "${local_commit_date}"
     # Compter les commits entre les deux

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/libvirt/default.nix

@@ -7,7 +7,9 @@
     libvirtd = {
       enable = true;
       qemu = {
-        package = pkgs.qemu_full;
+        package = pkgs.qemu_full.override {
+          cephSupport = false;
+        };
         runAsRoot = true;
         swtpm.enable = true;
         ovmf = {

modules/networking/home-nix.nix

@@ -17,21 +17,25 @@
       interface = "enp5s0";
     };
     nameservers = [
-      "10.0.0.1"
       "2001:41d0:303:20da::1"
       "217.182.138.218"
     ];
     networkmanager.enable = true;
     extraHosts = ''
-      172.18.23.4   dozzle.grandbesancon.fr
-      172.18.21.67  toto.grandbesancon.fr
+      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
+      #172.18.20.37   sso.grandbesancon.fr
+      #172.18.20.229  auth.grandbesancon.fr
+      #172.18.20.181  traefikauth.grandbesancon.fr
     '';
     wireguard = {
       interfaces = {
         wg0 = {
           ips = [
-            "fc00::2/128"
-            "10.0.0.2/32"
+            "fc00::2/56"
+            "10.0.0.2/16"
           ];
           listenPort = 51820;
           privateKeyFile = "/etc/wireguard/privatekey";
@@ -42,6 +46,7 @@
               allowedIPs = [
                 "fc00::0/56"
                 "10.0.0.0/16"
+                "10.1.0.0/16"
               ];
               endpoint = "[2001:41d0:303:20da::1]:51820";
               persistentKeepalive = 15;

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";
     };
   };