Compare commits

...

3 Commits

Author SHA1 Message Date
Alexandre
3352d73b3f Added git
All checks were successful
Check config / build (push) Successful in 9m49s
2026-06-23 17:03:44 +00:00
Alexandre
ecc1d9e4e9 Added home-manager, re-doing configs 2026-06-23 16:54:03 +00:00
Alexandre
8c48d4ed8b Trying to add HomeManager 2026-06-23 15:37:50 +00:00
8 changed files with 112 additions and 12 deletions

View File

@ -0,0 +1,19 @@
{ self, inputs, ... }:
{
flake.homeModules.env = { pkgs, lib, ... }: {
home = {
shellAliases = {
drs = "time sudo darwin-rebuild switch --flake ~/Developer/nix/NixOSDots#macOS";
nrs = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#nixos";
frs = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#framework";
lrs = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#light";
lars = "time sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#laptop";
cdd = "cd ~/Developer/nix/NixOSDots";
ncg = "time nix-collect-garbage -d";
nso = "time nix store optimise";
nfc = "time nix flake check ~/Developer/nix/NixOSDots";
nfu = "time nix flake update --flake ~/Developer/nix/NixOSDots";
};
};
};
}

View File

@ -0,0 +1,33 @@
{ self, inputs, ... }: {
flake = {
homeModules.git = { pkgs, lib, ... }: {
programs.git = {
enable = true;
settings = {
user = {
email = "mateialex@outlook.fr";
name = "Alexandre";
};
};
};
};
nixosModules.git = { pkgs, lib, ... }: {
environment.systemPackages = with pkgs; [
git
];
programs.ssh = {
startAgent = true;
extraConfig = ''
Host github.com
IdentityFile ~/.ssh/git
Host git.alexdelcamp.fr
IdentityFile ~/.ssh/git
Port 2222
User git
'';
};
services.gnome.gcr-ssh-agent.enable = false;
};
};
}

View File

@ -0,0 +1,15 @@
{ self, inputs, ... }:
{
flake.homeModules.zed = { pkgs, lib, ... }: {
programs.zed-editor = {
enable = true;
extensions = [
"nix"
];
userSettings = {
tab_size = 2;
};
};
};
}

View File

@ -1,6 +1,10 @@
{ self, inputs, ... }: { self, inputs, ... }:
{ {
flake.nixosModules.sysFetch = { pkgs, lib, ... }: { flake.nixosModules.sysFetch = { pkgs, lib, ... }: {
environment.systemPackages = with pkgs; [ fastfetch ];
};
flake.homeModules.sysFetch = { pkgs, lib, ... }: {
programs.fastfetch = { programs.fastfetch = {
enable = true; enable = true;
package = self.packages.${pkgs.stdenv.hostPlatform.system}.myFastfetch; package = self.packages.${pkgs.stdenv.hostPlatform.system}.myFastfetch;

View File

@ -21,6 +21,7 @@
binds = { binds = {
"Mod+Return".spawn-sh = lib.getExe pkgs.kitty; "Mod+Return".spawn-sh = lib.getExe pkgs.kitty;
"Mod+R".spawn-sh = lib.getExe pkgs.hyprlauncher;
"Mod+Q".close-window = {}; "Mod+Q".close-window = {};
}; };
}; };

View File

@ -1,9 +1,28 @@
{ self, inputs, ... }: { self, inputs, ... }:
{ {
flake.homeModules.commonHomeConfig = { config, pkgs, inputs, ... }: {
imports = [
self.homeModules.sysFetch
self.homeModules.zed
self.homeModules.env
self.homeModules.git
];
home = {
packages = [ pkgs.hello ];
stateVersion = "25.11"; # Upgrade maybe ?
};
};
flake.nixosModules.commonConfig = { config, pkgs, inputs, ...}: { flake.nixosModules.commonConfig = { config, pkgs, inputs, ...}: {
imports = [ imports = [
self.nixosModules.nixConfig self.nixosModules.nixConfig
self.nixosModules.kernelConfig self.nixosModules.kernelConfig
self.nixosModules.utils
self.nixosModules.sysFetch
self.nixosModules.git
]; ];
}; };
} }

View File

@ -4,12 +4,11 @@
modules = [ modules = [
self.nixosModules.FW16Config self.nixosModules.FW16Config
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
inputs.home-manager.nixosModules.default
]; ];
}; };
flake.nixosModules.FW16Config = { config, pkgs, inputs, ...}: flake.nixosModules.FW16Config = { config, pkgs, inputs, ...}: {
{
imports = [ imports = [
self.nixosModules.FW16Hardware self.nixosModules.FW16Hardware
self.nixosModules.amd self.nixosModules.amd
@ -53,12 +52,19 @@
alex = { alex = {
isNormalUser = true; isNormalUser = true;
description = "Alexandre Delcamp--Enache"; description = "Alexandre Delcamp--Enache";
shell= pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ "networkmanager" "wheel" "video" "render" ]; extraGroups = [ "networkmanager" "wheel" "video" "render" ];
}; };
}; };
}; };
home-manager = {
useGlobalPkgs = true;
users = {
"alex" = self.homeModules.commonHomeConfig;
};
};
programs = { programs = {
hyprland = { hyprland = {
enable = true; enable = true;

View File

@ -1,10 +1,13 @@
{ inputs, ... }:
{ {
config = { imports = [
inputs.home-manager.flakeModules.home-manager
];
systems = [ systems = [
"x86_64-linux" "x86_64-linux"
"x86_64-darwin" "x86_64-darwin"
"aarch64-linux" "aarch64-linux"
"aarch64-darwin" "aarch64-darwin"
]; ];
};
} }