diff --git a/flake.lock b/flake.lock index d4115c8..e3e0b15 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723282977, - "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", + "lastModified": 1722087241, + "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", + "rev": "8c50662509100d53229d4be607f1a3a31157fa12", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", "type": "github" }, "original": { diff --git a/systems/PC-Fixe/configuration.nix b/systems/PC-Fixe/configuration.nix index eac4b97..6caccbf 100644 --- a/systems/PC-Fixe/configuration.nix +++ b/systems/PC-Fixe/configuration.nix @@ -82,10 +82,8 @@ esphome ]; - programs = { - wireshark.enable = true; - alvr.enable = true; - }; + programs.wireshark.enable = true; + programs.wireshark.package = pkgs.wireshark; networking.firewall.enable = false; diff --git a/systems/common-cli.nix b/systems/common-cli.nix index 3b5e1af..031f53e 100644 --- a/systems/common-cli.nix +++ b/systems/common-cli.nix @@ -30,6 +30,7 @@ }) # Gestionnaires de version + gitMinimal tig gitAndTools.hub quilt @@ -103,8 +104,6 @@ bash.interactiveShellInit = '' eval "$(starship init bash)" ''; - - git.enable = true; }; environment.variables = let diff --git a/systems/common-gui.nix b/systems/common-gui.nix index 5de6654..99b065c 100644 --- a/systems/common-gui.nix +++ b/systems/common-gui.nix @@ -61,6 +61,7 @@ glxinfo i7z + appimage-run pavucontrol ]; @@ -70,26 +71,31 @@ console.keyMap = "fr"; + programs.steam.enable = true; + programs.firefox.enable = true; + + security.rtkit.enable = true; + + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + networking.networkmanager.enable = true; systemd.extraConfig = "DefaultLimitNOFILE=1048576"; - - security = { - pam.loginLimits = [{ - domain = "*"; - type = "hard"; - item = "nofile"; - value = "1048576"; - }]; - rtkit.enable = true; - }; + security.pam.loginLimits = [{ + domain = "*"; + type = "hard"; + item = "nofile"; + value = "1048576"; + }]; programs = { gnupg.agent = { enable = true; enableSSHSupport = true; }; browserpass.enable = true; - steam.enable = true; - firefox.enable = true; - appimage.enable = true; }; services = { @@ -107,12 +113,6 @@ exportConfiguration = true; desktopManager.plasma5.enable = true; }; - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; udev.packages = with pkgs; [ ledger-udev-rules ]; pcscd.enable = true; };