Compare commits

..

No commits in common. "b84689359d8b8378ddbd513c761aaa1b44ba07fc" and "fee05b840ebe3ba49e0287fa51ec1643fe613461" have entirely different histories.

8 changed files with 40 additions and 127 deletions

17
flake.lock generated
View File

@ -96,29 +96,12 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"musnix": "musnix", "musnix": "musnix",
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
} }
}, },

View File

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

View File

@ -92,21 +92,6 @@
}; };
userName = "samsouleavr@gmail.com"; 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 = { bernard = {
address = "bernard.lafayette63@gmail.com"; address = "bernard.lafayette63@gmail.com";
realName = "Bernard Lafayette"; realName = "Bernard Lafayette";

View File

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

View File

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

View File

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

View File

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

View File

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