Added inkscape and gnucash

flake.lock

@@ -96,12 +96,29 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1758690382,
+        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "musnix": "musnix",
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "treefmt-nix": "treefmt-nix"
       }
     },

flake.nix

@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     home-manager.url = "github:nix-community/home-manager/release-25.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
@@ -36,7 +37,10 @@
               nixpkgs.overlays = [ inputs.nix-vscode-extensions.overlays.default ];
             }
           ];
-          specialArgs = { inherit inputs; };
+          specialArgs = {
+            inherit inputs;
+            pkgs-unstable = import inputs.nixpkgs-unstable { system = "x86_64-linux"; };
+          };
         }
       );
     in

profiles/basic/email.nix

@@ -92,6 +92,21 @@
       };
       userName = "samsouleavr@gmail.com";
     };
+    inria = {
+      address = "samy.avrillon@inria.fr";
+      realName = "Samy Avrillon";
+      imap = {
+        host = "imap.inria.fr";
+        port = 993;
+        tls.enable = true;
+      };
+      smtp = {
+        host = "smtp.inria.fr";
+        port = 587;
+        tls.enable = true;
+      };
+      userName = "samy.avrillon@inria.fr";
+    };
     bernard = {
       address = "bernard.lafayette63@gmail.com";
       realName = "Bernard Lafayette";

profiles/basic/secrets.nix

@@ -6,6 +6,9 @@
 }:
 {
 
+  home-manager.users.mysaa.home.sessionVariables = {
+    GNUPGHOME = "/run/secrets/gpg/";
+  };
   fileSystems."/run/secrets" = {
     device = "/dev/disk/by-uuid/545bfd15-0973-4395-9d05-6c4c78a9e45c";
     fsType = "ext4";

profiles/basic/ssh.nix

@@ -6,47 +6,82 @@
 }:
 {
 
+  home-manager.users.mysaa = { lib, ... }: {
   programs.ssh = {
-    extraConfig = ''
+    enable = true;
-      Host git-ssh.hadoly.fr
+    matchBlocks = {
-        Hostname git-ssh.hadoly.fr
+      git-hadoly = {
-        IdentityFile /run/secrets/ssh/mysaa@git.hadoly.fr
+        host = "git-ssh.hadoly.fr";
-        Port 6900
+        hostname = "git-ssh.hadoly.fr";
+        identityFile = "/run/secrets/ssh/mysaa@git.hadoly.fr";
+        identitiesOnly = true;
+        port = 6900;
+      };
+      gitlab-aliens = {
+        host = "gitlab.aliens-lyon.fr";
+        hostname = "gitlab.aliens-lyon.fr";
+        identityFile = "/run/secrets/ssh/savrillo@gitlab.aliens-lyon.fr";
+        identitiesOnly = true;
+      };
+      github = {
+        host = "github.com";
+        hostname = "github.com";
+        identityFile = "/run/secrets/ssh/MysaaJava@github.com";
+        identitiesOnly = true;
+      };
+      gitlab = {
+        host = "gitlab.inria.fr";
+        hostname = "gitlab.inria.fr";
+        identityFile = "/run/secrets/ssh/savrillo@gitlab.inria.fr";
+        identitiesOnly = true;
+        user = "savrillo";
+      };
+      ens = {
+        host = "ens";
+        hostname = "ssh.ens-lyon.fr";
+        identityFile = "/run/secrets/ssh/savrillo@ssh.ens-lyon.fr";
+        identitiesOnly = true;
+        user = "savrillo";
+      };
+      protomolecule = {
+        host = "protomolecule";
+        hostname = "aliens-lyon.fr";
+        identityFile = "/run/secrets/ssh/mysaa@protomolecule.aliens-lyon.fr";
+        identitiesOnly = true;
+        user = "mysaa";
+        port = 2222;
+        proxyJump = "ens";
+      };
+      teapot = {
+        host = "teapot";
+        hostname = "teapot.ens-lyon.fr";
+        identityFile = "/run/secrets/ssh/enverts@teapot.ens-lyon.fr";
+        identitiesOnly = true;
+        user = "enverts";
+      };
+      midori = {
+        host = "midori";
+        hostname = "midori.bernard.com.de";
+        identityFile = "/run/secrets/ssh/mysaa@midori.bernard.com.de";
+        identitiesOnly = true;
+        user = "mysaa";
+      };
 
-      Host github.com
+      nasvrillon-local = lib.hm.dag.entryBefore ["nasvrillon-remote"] {
-        HostName github.com
+        match = ''host nasvrillon exec "nc -w 1 -z 192.168.1.39 5001"'';
-        IdentityFile /run/secrets/ssh/MysaaJava@github.com
+        hostname = "192.168.1.39";
+        port = 22;
+      };
+      nasvrillon-remote = {
+        host = "nasvrillon";
+        hostname = "nasvrillon.myqnapcloud.com";
+        user = "samy";
+        port = 6962;
+        extraOptions."ConnectTimeout" = "10";
+        addressFamily = "inet";
+      };
 
-      Host midori
+    };
-        HostName midori.bernard.com.de
+  };
-        User mysaa
-        IdentityFile /run/secrets/ssh/mysaa@midori.bernard.com.de
-
-      Match host nasvrillon exec "nc -w 1 -z 192.168.1.39 5001"
-        HostName 192.168.1.39
-        Port 22
-      Host nasvrillon
-        HostName nasvrillon.myqnapcloud.com
-        User samy
-        Port 6962
-        ConnectTimeout 10
-        AddressFamily inet
-
-      Host gitlab.aliens-lyon.fr
-        HostName gitlab.aliens-lyon.fr
-        User savrillo
-        IdentityFile /run/secrets/ssh/savrillo@gitlab.ens-lyon.fr
-
-      Host teapot
-        HostName teapot.ens-lyon.fr
-        User enverts
-        IdentityFile /run/secrets/ssh/enverts@teapot.ens-lyon.fr
-
-      Host gitlab.inria.fr
-        HostName gitlab.inria.fr
-        User savrillo
-        IdentityFile /run/secrets/ssh/savrillo@gitlab.inria.fr
-    '';
   };
-
 }

profiles/graphical/kde.nix

@@ -2,10 +2,18 @@
   config,
   lib,
   pkgs,
+  pkgs-unstable,
   ...
 }:
 {
 
+  nixpkgs.overlays = [
+    (final: prev: {
+        kdePackages = prev.kdePackages // { inherit (pkgs-unstable.kdePackages) kwin; };
+      }
+    )
+  ];
+
   environment.plasma6.excludePackages = with pkgs.kdePackages; [
     elisa
   ];

profiles/graphical/packages.nix

@@ -44,9 +44,12 @@ in
     kdiff3
     pdfarranger
     anki-bin # Register addons here (and login to anki-server)
+    gnucash
+    inkscape
   ];
 
   programs.steam.enable = true;
+  programs.gamemode.enable = true;
 
   home-manager.users.mysaa.programs.keepassxc.enable = true;
   home-manager.users.mysaa.programs.keepassxc.settings = {

profiles/graphical/thunderbird.nix

@@ -16,6 +16,7 @@ in
     "hadoly".thunderbird.enable = true;
     "personal".thunderbird.enable = true;
     "ens".thunderbird.enable = true;
+    "inria".thunderbird.enable = true;
     "junk".thunderbird.enable = true;
     "google".thunderbird.enable = true;
     "bernard".thunderbird.enable = true;
@@ -39,6 +40,7 @@ in
         "dmesures"
         "bernard"
         "ens"
+        "inria"
         "account_${globox-id}"
         "personal"
         "junk"