diff --git a/flake.nix b/flake.nix index 47bad06..3b7cdcb 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; # hyprland - hyprland.url = "github:hyprwm/Hyprland"; + hyprland.url = "github:hyprwm/Hyprland"; nixos-hardware.url = "github:NixOS/nixos-hardware"; # zen browser (communautaire) — follows pour partager les libs système zen-browser = { @@ -18,15 +18,14 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; - noctalia = { - url = "github:noctalia-dev/noctalia/legacy-v4"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - lavi = { - url = "github:b0o/lavi"; - inputs.nixpkgs.follows = "lavi"; - }; + #noctalia = { + # url = "github:noctalia-dev/noctalia/legacy-v4"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; + #lavi = { + # url = "github:b0o/lavi"; + # inputs.nixpkgs.follows = "lavi"; + #}; stylix = { url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -37,7 +36,7 @@ # "specialArgs" et "extraSpecialArgs. inputs.hyprland pourra être utilisé dans n'importe # quel fichier importé sans avoir à redéclarer dans flake.nix # - ajouter dans la ligne d'outputs les nouveaux packages ajoutés en input ! - outputs = inputs@{ self, nixpkgs, home-manager, hyprland, nixos-hardware, zen-browser, noctalia, lavi, stylix, ... }: { + outputs = inputs@{ self, nixpkgs, home-manager, hyprland, nixos-hardware, zen-browser, stylix, ... }: { nixosConfigurations.nixos-home = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; diff --git a/home/afoucaultc/home-laptop.nix b/home/afoucaultc/home-laptop.nix index 7ee4632..5f2be0e 100644 --- a/home/afoucaultc/home-laptop.nix +++ b/home/afoucaultc/home-laptop.nix @@ -6,21 +6,23 @@ imports = [ - # modules partagés + ./packages/btop.nix ./packages/firefox.nix - ./packages/thunderbird.nix ./packages/git.nix ./packages/hyprland.nix ./packages/kitty.nix + ./packages/mpv.nix ./packages/neovim.nix ./packages/other_apps_light.nix + ./packages/pass.nix ./packages/texlive.nix + ./packages/thunderbird.nix + ./packages/tmux.nix ./packages/zathura.nix ./packages/zen.nix ./packages/zsh.nix - # liens dotfiles + # dotfiles links ./dotfiles_apps.nix - ]; + ]; stylix.targets.gtksourceview.enable = false; - #stylix.targets.inkscape.enable = false; } diff --git a/home/afoucaultc/home.nix b/home/afoucaultc/home.nix index 903a9b5..b8f5357 100644 --- a/home/afoucaultc/home.nix +++ b/home/afoucaultc/home.nix @@ -6,13 +6,18 @@ imports = [ + ./packages/btop.nix ./packages/firefox.nix ./packages/git.nix ./packages/hyprland.nix - ./packages/lavi.nix + ./packages/kitty.nix + ./packages/mpv.nix ./packages/neovim.nix ./packages/other_apps.nix + ./packages/pass.nix ./packages/texlive.nix + ./packages/thunderbird.nix + ./packages/tmux.nix ./packages/zathura.nix ./packages/zen.nix ./packages/zsh.nix diff --git a/home/afoucaultc/packages/btop.nix b/home/afoucaultc/packages/btop.nix new file mode 100644 index 0000000..7f264d3 --- /dev/null +++ b/home/afoucaultc/packages/btop.nix @@ -0,0 +1,6 @@ +{ pkgs, inputs, ... }: +{ + programs.btop = { + enable = true; + }; +} diff --git a/home/afoucaultc/packages/mpv.nix b/home/afoucaultc/packages/mpv.nix new file mode 100644 index 0000000..9f9e886 --- /dev/null +++ b/home/afoucaultc/packages/mpv.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: +{ + programs.mpv = { + enable = true; + }; +} diff --git a/home/afoucaultc/packages/other_apps.nix b/home/afoucaultc/packages/other_apps.nix index 7c0f328..7d24c3f 100644 --- a/home/afoucaultc/packages/other_apps.nix +++ b/home/afoucaultc/packages/other_apps.nix @@ -4,7 +4,6 @@ # --- Others hyfetch fastfetch - htop pkg-config # --- Bureautique --- @@ -13,7 +12,6 @@ zotero # --- Communication --- - thunderbird signal-desktop vesktop mattermost-desktop @@ -21,17 +19,21 @@ # --- Multimédia --- gimp inkscape - mpv + nomacs + imagemagick + librsvg streamlink kdePackages.gwenview audacity # --- Maths --- - octave - gnuplot - - # --- Réseau / streaming --- - + (octave.withPackages (ps: with ps; [ + image # octave-image + statistics # octave-statistics + symbolic # octave-symbolic + # dataframe # (octave-dataframe : indispo dans nixpkgs, à compiler via pkg si besoin) + ])) + gnuplot # gnuplot # --- Gestion de fichiers KDE --- kdePackages.dolphin @@ -41,7 +43,18 @@ kdePackages.ark kdePackages.kdegraphics-thumbnailers kdePackages.ffmpegthumbs - ]; + nwg-look + papirus-icon-theme + mako + cliphist + grim slurp + mullvad-vpn + ]; + + services.gpg-agent = { + enable = true; + pinentry.package = pkgs.pinentry-gnome3; + }; services.protonmail-bridge.enable = true; } diff --git a/home/afoucaultc/packages/other_apps_light.nix b/home/afoucaultc/packages/other_apps_light.nix index dc0d2d2..2361ee6 100644 --- a/home/afoucaultc/packages/other_apps_light.nix +++ b/home/afoucaultc/packages/other_apps_light.nix @@ -4,7 +4,6 @@ # --- Infos système / divers --- hyfetch # hyfetch fastfetch # fastfetch - btop # btop pkg-config # --- Bureautique --- @@ -18,13 +17,9 @@ mattermost-desktop # mattermost-desktop protonmail-bridge # protonmail-bridge (CLI/bridge) - # --- Gestionnaire de mots de passe --- - pass # pass - # --- Multimédia (léger) --- gimp # gimp inkscape # inkscape - mpv # mpv nomacs # nomacs (AUR) — visionneuse d'images légère imagemagick # imagemagick librsvg # librsvg diff --git a/home/afoucaultc/packages/pass.nix b/home/afoucaultc/packages/pass.nix new file mode 100644 index 0000000..eb0fde7 --- /dev/null +++ b/home/afoucaultc/packages/pass.nix @@ -0,0 +1,6 @@ +{ pkgs, inputs, ... }: +{ + programs.pass = { + enable = true; + }; +} diff --git a/home/afoucaultc/packages/tmux.nix b/home/afoucaultc/packages/tmux.nix new file mode 100644 index 0000000..6e2da92 --- /dev/null +++ b/home/afoucaultc/packages/tmux.nix @@ -0,0 +1,6 @@ +{ pkgs, inputs, ... }: +{ + programs.tmux = { + enable = true; + }; +} diff --git a/hosts/nixos-home/config/boot.nix b/hosts/nixos-home/config/boot.nix index 48d7390..ad526cf 100644 --- a/hosts/nixos-home/config/boot.nix +++ b/hosts/nixos-home/config/boot.nix @@ -9,5 +9,4 @@ configurationLimit = 10; }; boot.loader.efi.canTouchEfiVariables = true; - boot.initrd.luks.devices."luks-5f5524e7-c2c0-4cbd-91f2-37b8fe69a62c".device = "/dev/disk/by-uuid/5f5524e7-c2c0-4cbd-91f2-37b8fe69a62c"; } diff --git a/hosts/nixos-home/config/extra-services.nix b/hosts/nixos-home/config/extra-services.nix index 8ee5738..610f7b6 100644 --- a/hosts/nixos-home/config/extra-services.nix +++ b/hosts/nixos-home/config/extra-services.nix @@ -5,7 +5,6 @@ enable = true; package = pkgs.mullvad-vpn; }; - # ── Steam ── programs.steam = { enable = true; @@ -17,21 +16,12 @@ enable = true; capSysNice = true; }; - zramSwap = { enable = true; algorithm = "zstd"; memoryPercent = 50; }; - - # ── VirtualBox (Oracle) ── - # virtualisation.virtualbox.host = { - # enable = true; - # enableExtensionPack = true; - # }; - # users.extraGroups.vboxusers.members = [ "afoucaultc" ]; - - # ── Intégration KDE/Dolphin ── + # ── Intégration KDE/Dolphin ── services.gvfs.enable = true; services.tumbler.enable = true; environment.sessionVariables = { diff --git a/hosts/nixos-home/config/fonts.nix b/hosts/nixos-home/config/fonts.nix index 3a83718..c9dd6e2 100644 --- a/hosts/nixos-home/config/fonts.nix +++ b/hosts/nixos-home/config/fonts.nix @@ -1,25 +1,37 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { fonts.packages = with pkgs; [ + # Sans / Source (adobe-source-*-fonts, source-han-sans) source-sans + source-serif + source-han-sans # adobe-source-han-sans-otc-fonts + source-han-serif + + # Noto + emoji + CJK (noto-fonts-cjk, noto-fonts-emoji) noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-color-emoji + + # Microsoft / Windows (ttf-ms-fonts + corefonts) corefonts - b612 + vista-fonts # tahoma, etc. (unfree) + # Latin Modern / TeX Gyre (otf-latin-modern, tex-gyre-math) + lmodern + gyre-fonts + + # Accessibilité (ttf-luciole) + texlivePackages.luciole + + # Nerd fonts / symboles (ttf-nerd-fonts-symbols, font-awesome, woff2-font-awesome) nerd-fonts.symbols-only - nerd-fonts.adwaita-mono - nerd-fonts.cousine + font-awesome + # Fontes de code utiles fira-code jetbrains-mono dejavu_fonts liberation_ttf - font-awesome - - texlivePackages.luciole ]; } diff --git a/hosts/nixos-home/config/hyprland.nix b/hosts/nixos-home/config/hyprland.nix index 709c35c..a2dadc6 100644 --- a/hosts/nixos-home/config/hyprland.nix +++ b/hosts/nixos-home/config/hyprland.nix @@ -5,19 +5,11 @@ package = inputs.hyprland.packages.${pkgs.system}.hyprland; }; - # Portails XDG (captures d'écran, partage d'écran, file pickers sous Wayland) + # Portails XDG (captures d'écran, partage d'écran, file pickers Wayland) xdg.portal = { enable = true; extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; }; security.polkit.enable = true; - - nix.settings = { - experimental-features = [ "nix-command" "flakes" ]; - substituters = [ "https://hyprland.cachix.org" ]; - trusted-substituters = [ "https://hyprland.cachix.org" ]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; - trusted-users = [ "root" "@wheel" ]; - }; } diff --git a/hosts/nixos-home/config/stylix.nix b/hosts/nixos-home/config/stylix.nix new file mode 100644 index 0000000..7eb89fc --- /dev/null +++ b/hosts/nixos-home/config/stylix.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: +{ + stylix = { + enable = true; + targets.gtksourceview.enable = false; + base16Scheme = "${pkgs.base16-schemes}/share/themes/solarized-dark.yaml"; + + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Ice"; + size = 24; + }; + + fonts = { + monospace = { + package = pkgs.nerd-fonts.jetbrains-mono; + name = "Noto Sans Mono"; + }; + sansSerif = { + package = pkgs.texlivePackages.luciole; + name = "Luciole"; + }; + sizes = { + applications = 11; + terminal = 12; + }; + }; + polarity = "dark"; + }; +} diff --git a/hosts/nixos-home/config/system_packages.nix b/hosts/nixos-home/config/system_packages.nix index a2a8417..0a7e8f6 100644 --- a/hosts/nixos-home/config/system_packages.nix +++ b/hosts/nixos-home/config/system_packages.nix @@ -6,6 +6,18 @@ gnumake gcc wget + curl + unzip + tree + ripgrep + translate-shell + xclip + powertop + brightnessctl + ntfs3g + pciutls + usbutils + inxi ]; } diff --git a/hosts/nixos-home/config/system_services.nix b/hosts/nixos-home/config/system_services.nix index 7a32c4a..9e68e7c 100644 --- a/hosts/nixos-home/config/system_services.nix +++ b/hosts/nixos-home/config/system_services.nix @@ -13,5 +13,6 @@ }; printing.enable = true; openssh.enable = false; + flatpak.enable = true; }; } diff --git a/hosts/nixos-home/configuration.nix b/hosts/nixos-home/configuration.nix index 80f941b..6621c2f 100644 --- a/hosts/nixos-home/configuration.nix +++ b/hosts/nixos-home/configuration.nix @@ -10,9 +10,10 @@ ./config/fonts.nix ./config/hyprland.nix ./config/language.nix - ./config/noctalia.nix + #./config/noctalia.nix ./config/power_management.nix ./config/sound.nix + ./config/stylix.nix ./config/system_packages.nix ./config/system_saves.nix ./config/system_services.nix diff --git a/hosts/nixos-home/hardware-configuration.nix b/hosts/nixos-home/hardware-configuration.nix index 6582c3f..81ba249 100644 --- a/hosts/nixos-home/hardware-configuration.nix +++ b/hosts/nixos-home/hardware-configuration.nix @@ -19,6 +19,7 @@ }; boot.initrd.luks.devices."luks-eddcceff-290e-478d-baef-3fdc0f47a220".device = "/dev/disk/by-uuid/eddcceff-290e-478d-baef-3fdc0f47a220"; + boot.initrd.luks.devices."luks-5f5524e7-c2c0-4cbd-91f2-37b8fe69a62c".device = "/dev/disk/by-uuid/5f5524e7-c2c0-4cbd-91f2-37b8fe69a62c"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/2A23-C86E"; diff --git a/hosts/nixos-laptop/config/extra-services.nix b/hosts/nixos-laptop/config/extra-services.nix index ed2147b..3df3c93 100644 --- a/hosts/nixos-laptop/config/extra-services.nix +++ b/hosts/nixos-laptop/config/extra-services.nix @@ -5,11 +5,9 @@ enable = true; package = pkgs.mullvad-vpn; }; - # ── Intégration gestionnaire de fichiers (miniatures, montage…) ── services.gvfs.enable = true; services.tumbler.enable = true; - environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; diff --git a/hosts/nixos-laptop/config/system_packages.nix b/hosts/nixos-laptop/config/system_packages.nix index adf4e20..a4d6072 100644 --- a/hosts/nixos-laptop/config/system_packages.nix +++ b/hosts/nixos-laptop/config/system_packages.nix @@ -1,26 +1,23 @@ { config, pkgs, ... }: { - # Outils système / build essentiels (équiv. base-devel, git, etc.). - # Les applis graphiques utilisateur sont dans home-manager (home/). environment.systemPackages = with pkgs; [ - # base / build - git vim gnumake gcc wget curl unzip tree - - # CLI utiles présents dans ta liste pacman - btop # btop - fastfetch # fastfetch - ripgrep # ripgrep - tmux # tmux - translate-shell # translate-shell - xclip # xclip - wl-clipboard # wl-clipboard - pass # pass - bitwarden-cli # (bitwarden : GUI côté user, CLI ici) - powertop # powertop - brightnessctl # brightnessctl - ntfs3g # ntfs-3g - pciutils usbutils inxi # inxi + diagnostics - gnupg - pinentry-curses + git + vim + gnumake + gcc + wget + curl + unzip + tree + ripgrep + translate-shell + xclip + powertop + brightnessctl + ntfs3g + pciutils + usbutils + inxi ]; } +