From 40cdf89ab997dc69fcb50ff93dda854147f11262 Mon Sep 17 00:00:00 2001 From: niftion Date: Fri, 3 May 2024 02:39:11 -0700 Subject: [PATCH 1/6] Update users/cirno/default.nix --- users/cirno/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/users/cirno/default.nix b/users/cirno/default.nix index 4870a94..1a25a2a 100644 --- a/users/cirno/default.nix +++ b/users/cirno/default.nix @@ -13,6 +13,13 @@ displayManager.sddm = { enable = true; wayland.enable = true; + pipewire = { + enable = true; + pulse.enable = true; + alsa.enable = true; + }; + blueman.enable = true; + }; desktopManager.plasma6.enable = true; }; @@ -22,7 +29,7 @@ shell = pkgs.zsh; home = "/home/cirno"; description = "user for guests/cirno people"; - extraGroups = [ "" ]; + extraGroups = [ "wheel" "networkmanager" "kvm" "libvirtd" "audio" "dialout" ]; initialHashedPassword = "$6$2f8vjQbdKyEBqPRT$FrZBZfzpJGqNqLlCyb7CzRNm0wuZwfRI7Qj/dUQlbtLixyJK5Im9AJT7GXmP5StfhZxSbH/wW8nDGPQm98NXV0"; }; }; From 463228502cd8255512d0e7c1952661db323d0c42 Mon Sep 17 00:00:00 2001 From: niftion Date: Fri, 3 May 2024 02:44:57 -0700 Subject: [PATCH 2/6] Update users/cirno/default.nix --- users/cirno/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/users/cirno/default.nix b/users/cirno/default.nix index 1a25a2a..d9d2b3e 100644 --- a/users/cirno/default.nix +++ b/users/cirno/default.nix @@ -18,7 +18,6 @@ pulse.enable = true; alsa.enable = true; }; - blueman.enable = true; }; desktopManager.plasma6.enable = true; From 57fe0459f025c0e7072736cb511dc367fda82e12 Mon Sep 17 00:00:00 2001 From: niftion Date: Fri, 3 May 2024 02:51:58 -0700 Subject: [PATCH 3/6] Update users/cirno/default.nix --- users/cirno/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/cirno/default.nix b/users/cirno/default.nix index d9d2b3e..55ba979 100644 --- a/users/cirno/default.nix +++ b/users/cirno/default.nix @@ -28,7 +28,7 @@ shell = pkgs.zsh; home = "/home/cirno"; description = "user for guests/cirno people"; - extraGroups = [ "wheel" "networkmanager" "kvm" "libvirtd" "audio" "dialout" ]; + extraGroups = [ "audio" ]; initialHashedPassword = "$6$2f8vjQbdKyEBqPRT$FrZBZfzpJGqNqLlCyb7CzRNm0wuZwfRI7Qj/dUQlbtLixyJK5Im9AJT7GXmP5StfhZxSbH/wW8nDGPQm98NXV0"; }; }; From 905b5f9e030c349dece4350399271189c4694fe8 Mon Sep 17 00:00:00 2001 From: niftion Date: Fri, 3 May 2024 02:59:44 -0700 Subject: [PATCH 4/6] Update users/cirno/default.nix --- users/cirno/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/users/cirno/default.nix b/users/cirno/default.nix index 55ba979..1044584 100644 --- a/users/cirno/default.nix +++ b/users/cirno/default.nix @@ -13,13 +13,12 @@ displayManager.sddm = { enable = true; wayland.enable = true; + }; pipewire = { enable = true; pulse.enable = true; alsa.enable = true; }; - - }; desktopManager.plasma6.enable = true; }; From a0103e3ddfa3da8a9a433d05cea873ab59534275 Mon Sep 17 00:00:00 2001 From: niftion Date: Sat, 4 May 2024 04:24:09 -0700 Subject: [PATCH 5/6] Update users/cirno/default.nix alphabetized!? --- users/cirno/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/users/cirno/default.nix b/users/cirno/default.nix index 1044584..856b707 100644 --- a/users/cirno/default.nix +++ b/users/cirno/default.nix @@ -10,25 +10,25 @@ }; services = { + desktopManager.plasma6.enable = true; displayManager.sddm = { enable = true; wayland.enable = true; - }; + } pipewire = { + alsa.enable = true; enable = true; pulse.enable = true; - alsa.enable = true; }; - desktopManager.plasma6.enable = true; }; users.users.cirno = { - isNormalUser = true; - shell = pkgs.zsh; - home = "/home/cirno"; description = "user for guests/cirno people"; extraGroups = [ "audio" ]; + home = "/home/cirno"; initialHashedPassword = "$6$2f8vjQbdKyEBqPRT$FrZBZfzpJGqNqLlCyb7CzRNm0wuZwfRI7Qj/dUQlbtLixyJK5Im9AJT7GXmP5StfhZxSbH/wW8nDGPQm98NXV0"; + isNormalUser = true; + shell = pkgs.zsh; }; }; } From 9f429185d6cbaa0ff573fd995d80787d3e1ca03f Mon Sep 17 00:00:00 2001 From: niftion Date: Sat, 4 May 2024 04:33:30 -0700 Subject: [PATCH 6/6] Update users/stitchynyan/default.nix --- users/stitchynyan/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/users/stitchynyan/default.nix b/users/stitchynyan/default.nix index f85557b..c91b878 100644 --- a/users/stitchynyan/default.nix +++ b/users/stitchynyan/default.nix @@ -4,13 +4,13 @@ imports = [ ../default.nix ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem ( lib.getName pkg) [ + "cudatoolkit" + "nvidia-settings" + "nvidia-x11" "osu-lazer" "steam" "steam-original" "steam-run" - "nvidia-x11" - "nvidia-settings" - "cudatoolkit" ]; programs = { @@ -23,6 +23,8 @@ }; }; + security.pam.services.swaylock = {}; + services = { avahi = { enable = config.stitchyconf.form == "pc"; @@ -32,23 +34,21 @@ blueman.enable = true; gnome.gnome-keyring.enable = true; pipewire = { + alsa.enable = true; enable = true; pulse.enable = true; - alsa.enable = true; }; printing.enable = true; usbmuxd.enable = true; xserver.enable = true; }; - security.pam.services.swaylock = {}; - users.users.stitchynyan = { - isNormalUser = true; - shell = pkgs.zsh; - home = "/home/stitchynyan"; description = "Personal user"; extraGroups = [ "wheel" "networkmanager" "kvm" "libvirtd" "audio" "dialout" ]; + home = "/home/stitchynyan"; initialHashedPassword = "$y$j9T$rvySCWHYE4AO4A9J0Vf20.$x5hpBNsOWovQFtNfFUIt17OAH5MJFwFBGjxbaEIagJ3"; + isNormalUser = true; + shell = pkgs.zsh; }; }