From 278b49fe661affced623fd9dc2c9607259f828b3 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 12 Aug 2024 10:06:12 +0200 Subject: [PATCH 1/4] cleanup common GUI config --- systems/PC-Fixe/configuration.nix | 6 +++-- systems/common-cli.nix | 3 ++- systems/common-gui.nix | 38 +++++++++++++++---------------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/systems/PC-Fixe/configuration.nix b/systems/PC-Fixe/configuration.nix index 6caccbf..eac4b97 100644 --- a/systems/PC-Fixe/configuration.nix +++ b/systems/PC-Fixe/configuration.nix @@ -82,8 +82,10 @@ esphome ]; - programs.wireshark.enable = true; - programs.wireshark.package = pkgs.wireshark; + programs = { + wireshark.enable = true; + alvr.enable = true; + }; networking.firewall.enable = false; diff --git a/systems/common-cli.nix b/systems/common-cli.nix index 031f53e..3b5e1af 100644 --- a/systems/common-cli.nix +++ b/systems/common-cli.nix @@ -30,7 +30,6 @@ }) # Gestionnaires de version - gitMinimal tig gitAndTools.hub quilt @@ -104,6 +103,8 @@ 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 99b065c..5de6654 100644 --- a/systems/common-gui.nix +++ b/systems/common-gui.nix @@ -61,7 +61,6 @@ glxinfo i7z - appimage-run pavucontrol ]; @@ -71,31 +70,26 @@ 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"; - }]; + + security = { + pam.loginLimits = [{ + domain = "*"; + type = "hard"; + item = "nofile"; + value = "1048576"; + }]; + rtkit.enable = true; + }; programs = { gnupg.agent = { enable = true; enableSSHSupport = true; }; browserpass.enable = true; + steam.enable = true; + firefox.enable = true; + appimage.enable = true; }; services = { @@ -113,6 +107,12 @@ 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; }; From e4c8c2acfa870b544446cfe7fec509280a643a9f Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 12 Aug 2024 10:07:17 +0200 Subject: [PATCH 2/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8c50662509100d53229d4be607f1a3a31157fa12' (2024-07-27) → 'github:NixOS/nixpkgs/a781ff33ae258bbcfd4ed6e673860c3e923bf2cc' (2024-08-10) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/b73c2221a46c13557b1b3be9c2070cc42cf01eb3' (2024-07-27) → 'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b' (2024-08-09) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e3e0b15..d4115c8 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722087241, - "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", + "lastModified": 1723282977, + "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c50662509100d53229d4be607f1a3a31157fa12", + "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { From c5e29217973b3d7ed5fa83ffb1b6930de961ca7d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 6 Sep 2024 01:15:42 +0200 Subject: [PATCH 3/4] install switch emulator --- systems/common-gui.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/common-gui.nix b/systems/common-gui.nix index 5de6654..6d8365d 100644 --- a/systems/common-gui.nix +++ b/systems/common-gui.nix @@ -11,6 +11,7 @@ prismlauncher lutris teamspeak_client + ryujinx betaflight-configurator From 06d9956291cfaa979ceac335f1239ab77f9099da Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 6 Sep 2024 01:17:01 +0200 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a781ff33ae258bbcfd4ed6e673860c3e923bf2cc' (2024-08-10) → 'github:NixOS/nixpkgs/6f6c45b5134a8ee2e465164811e451dcb5ad86e3' (2024-09-03) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b' (2024-08-09) → 'github:NixOS/nixpkgs/ad416d066ca1222956472ab7d0555a6946746a80' (2024-09-04) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d4115c8..7942c7f 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723282977, - "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", + "lastModified": 1725407940, + "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", + "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": {