move common and desktop to modules dir
This commit is contained in:
parent
fea72f4ffe
commit
7c0a075a8d
GPG key ID:
7D01D7B105E77166
3 changed files with 3 additions and 3 deletions
|
|
@ -1,84 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
nixpkgs,
|
||||
ragenix,
|
||||
...
|
||||
}: {
|
||||
environment = {
|
||||
systemPackages = with pkgs; let
|
||||
inherit (pkgs.stdenv.hostPlatform) system;
|
||||
in [
|
||||
ragenix.packages.${system}.default
|
||||
neovim
|
||||
git
|
||||
curl
|
||||
];
|
||||
|
||||
variables = {
|
||||
EDITOR = lib.getExe pkgs.neovim;
|
||||
};
|
||||
};
|
||||
|
||||
age.secrets = {
|
||||
tailscaleKey.file = ../secrets/tailscaleKey.age;
|
||||
};
|
||||
|
||||
programs = {
|
||||
ssh.startAgent = true;
|
||||
|
||||
direnv.enable = true;
|
||||
|
||||
command-not-found.enable = false;
|
||||
nix-index = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
openssh = {
|
||||
enable = true;
|
||||
openFirewall = lib.mkDefault false;
|
||||
};
|
||||
|
||||
tailscale = {
|
||||
enable = true;
|
||||
useRoutingFeatures = "both";
|
||||
extraUpFlags = ["--ssh"];
|
||||
authKeyFile = config.age.secrets.tailscaleKey.path;
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
nix = {
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "-d";
|
||||
};
|
||||
|
||||
settings = {
|
||||
auto-optimise-store = true;
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
trusted-users = ["root" "@wheel"];
|
||||
};
|
||||
};
|
||||
|
||||
nix.registry = let
|
||||
nixpkgsRegistry.flake = nixpkgs;
|
||||
in {
|
||||
nixpkgs = nixpkgsRegistry;
|
||||
n = nixpkgsRegistry;
|
||||
};
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = lib.mkDefault "23.11"; # Did you read the comment?
|
||||
}
|
||||
|
|
@ -23,15 +23,15 @@
|
|||
mapNixOS = lib.mapAttrs (toSystem inputs.nixpkgs.lib.nixosSystem);
|
||||
|
||||
nixos = with inputs; [
|
||||
./common.nix
|
||||
../modules/common.nix
|
||||
ragenix.nixosModules.default
|
||||
home-manager.nixosModules.home-manager
|
||||
];
|
||||
|
||||
desktop = with inputs;
|
||||
[
|
||||
./desktop.nix
|
||||
../modules/desktop.nix
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
home-manager.nixosModules.home-manager
|
||||
catppuccin.nixosModules.catppuccin
|
||||
]
|
||||
++ nixos;
|
||||
|
|
|
|||
|
|
@ -1,222 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
catppuccin,
|
||||
...
|
||||
}: let
|
||||
username = "leo";
|
||||
in {
|
||||
imports = [
|
||||
../programs
|
||||
(lib.mkAliasOptionModule ["hm"] ["home-manager" "users" username])
|
||||
];
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = ["quiet" "loglevel=3"];
|
||||
|
||||
extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
|
||||
kernelModules = ["v4l2loopback"];
|
||||
|
||||
loader = {
|
||||
systemd-boot.enable = lib.mkForce false;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
|
||||
lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/etc/secureboot";
|
||||
};
|
||||
};
|
||||
|
||||
hardware = {
|
||||
opengl.enable = true;
|
||||
pulseaudio.enable = false;
|
||||
|
||||
xone.enable = true;
|
||||
xpadneo.enable = true;
|
||||
};
|
||||
|
||||
sound.enable = true;
|
||||
|
||||
services = {
|
||||
# apparently needed for mesa
|
||||
xserver = {
|
||||
enable = true;
|
||||
xkb.layout = "fr";
|
||||
displayManager = {
|
||||
lightdm.enable = false;
|
||||
gdm = {
|
||||
enable = true;
|
||||
wayland = true;
|
||||
};
|
||||
defaultSession = "hyprland";
|
||||
};
|
||||
};
|
||||
|
||||
printing.enable = true;
|
||||
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
wireplumber.enable = true;
|
||||
};
|
||||
|
||||
ratbagd.enable = true;
|
||||
udisks2.enable = true;
|
||||
gvfs.enable = true;
|
||||
tumbler.enable = true;
|
||||
gnome.gnome-keyring.enable = true;
|
||||
};
|
||||
|
||||
xdg = {
|
||||
portal = {
|
||||
enable = true;
|
||||
extraPortals = with pkgs; [xdg-desktop-portal-gtk];
|
||||
};
|
||||
|
||||
mime.enable = true;
|
||||
icons.enable = true;
|
||||
};
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
time.timeZone = "Europe/Paris";
|
||||
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_ADDRESS = "fr_FR.UTF-8";
|
||||
LC_IDENTIFICATION = "fr_FR.UTF-8";
|
||||
LC_MEASUREMENT = "fr_FR.UTF-8";
|
||||
LC_MONETARY = "fr_FR.UTF-8";
|
||||
LC_NAME = "fr_FR.UTF-8";
|
||||
LC_NUMERIC = "fr_FR.UTF-8";
|
||||
LC_PAPER = "fr_FR.UTF-8";
|
||||
LC_TELEPHONE = "fr_FR.UTF-8";
|
||||
LC_TIME = "fr_FR.UTF-8";
|
||||
};
|
||||
|
||||
console.keyMap = "fr";
|
||||
|
||||
security = {
|
||||
rtkit.enable = true;
|
||||
polkit.enable = true;
|
||||
pam.services.login.enableGnomeKeyring = true;
|
||||
};
|
||||
|
||||
age = {
|
||||
identityPaths = ["/etc/ssh/ssh_host_ed25519_key"];
|
||||
|
||||
secrets = let
|
||||
base = ../secrets/desktop;
|
||||
in {
|
||||
rootPassword.file = "${base}/rootPassword.age";
|
||||
userPassword.file = "${base}/userPassword.age";
|
||||
};
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
};
|
||||
|
||||
hm = {
|
||||
imports = [
|
||||
catppuccin.homeManagerModules.catppuccin
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
font-manager
|
||||
gimp
|
||||
gnome.gnome-calculator
|
||||
jetbrains.idea-ultimate
|
||||
libreoffice-fresh
|
||||
mate.eom
|
||||
mold
|
||||
mpv
|
||||
nwg-look
|
||||
obs-studio
|
||||
obsidian
|
||||
osu-lazer-bin
|
||||
pavucontrol
|
||||
polkit_gnome
|
||||
prismlauncher
|
||||
sccache
|
||||
shotcut
|
||||
vesktop
|
||||
];
|
||||
|
||||
services = {
|
||||
gpg-agent = {
|
||||
enable = true;
|
||||
pinentryFlavor = "gnome3";
|
||||
};
|
||||
};
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
flavour = "macchiato";
|
||||
accent = "sky";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs = {
|
||||
overlays = [(import ../exprs/overlay.nix)];
|
||||
};
|
||||
|
||||
programs = {
|
||||
gnupg.agent = {
|
||||
enable = true;
|
||||
pinentryFlavor = "gnome3";
|
||||
};
|
||||
|
||||
firefox.enable = true;
|
||||
|
||||
seahorse.enable = true;
|
||||
file-roller.enable = true;
|
||||
|
||||
steam.enable = true;
|
||||
|
||||
thunar = {
|
||||
enable = true;
|
||||
plugins = with pkgs.xfce; [thunar-volman thunar-archive-plugin];
|
||||
};
|
||||
|
||||
virt-manager.enable = true;
|
||||
};
|
||||
|
||||
virtualisation.libvirtd.enable = true;
|
||||
|
||||
users.users."${username}" = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.fish;
|
||||
extraGroups = ["networkmanager" "wheel" "video" "libvirtd"];
|
||||
hashedPasswordFile = config.age.secrets.userPassword.path;
|
||||
};
|
||||
|
||||
users.users.root.hashedPasswordFile = config.age.secrets.rootPassword.path;
|
||||
|
||||
fonts = {
|
||||
packages = with pkgs; [
|
||||
iosevka
|
||||
jetbrains-mono
|
||||
cantarell-fonts
|
||||
twitter-color-emoji
|
||||
(nerdfonts.override {fonts = ["Iosevka" "JetBrainsMono"];})
|
||||
];
|
||||
|
||||
fontconfig.defaultFonts = {
|
||||
emoji = ["Twitter Color Emoji"];
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [sbctl];
|
||||
|
||||
hm.home.stateVersion = "23.11";
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue