From 84073038e22d3201ac0176a94527c040bb153e9e Mon Sep 17 00:00:00 2001 From: sinanmohd Date: Tue, 4 Jun 2024 14:08:26 +0530 Subject: home, os: move user pkgs to home --- home/common/home.nix | 16 ++++++++++++++-- home/wayland/home.nix | 13 ++++++++++++- home/wayland/modules/sway/home.nix | 1 + home/wayland/modules/sway/mako.nix | 4 +++- os/cez/configuration.nix | 8 ++------ os/cez/modules/wayland.nix | 37 ++----------------------------------- os/common/configuration.nix | 18 ++++-------------- 7 files changed, 38 insertions(+), 59 deletions(-) diff --git a/home/common/home.nix b/home/common/home.nix index b2ca191..c103a3f 100644 --- a/home/common/home.nix +++ b/home/common/home.nix @@ -1,4 +1,4 @@ -{ config, ... }: let +{ config, pkgs, ... }: let username = config.global.userdata.name; in { imports = [ @@ -7,10 +7,22 @@ in { ]; programs.home-manager.enable = true; - home = { inherit username; stateVersion = "24.11"; homeDirectory = "/home/${config.home.username}"; + + packages = with pkgs; [ + unzip + htop + curl + file + dig + tcpdump + mtr + nnn + ps_mem + geoipWithDatabase + ]; }; } diff --git a/home/wayland/home.nix b/home/wayland/home.nix index 98053c7..a7d2186 100644 --- a/home/wayland/home.nix +++ b/home/wayland/home.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ pkgs, ... }: { imports = [ ../common/home.nix ./modules/foot.nix @@ -7,4 +7,15 @@ ./modules/mimeapps.nix ./modules/sway/home.nix ]; + + home.packages = with pkgs; [ + mpv + imv + wtype + qemu + grim + slurp + xdg-utils + element-desktop-wayland + ]; } diff --git a/home/wayland/modules/sway/home.nix b/home/wayland/modules/sway/home.nix index 38e2cb3..3565cf8 100644 --- a/home/wayland/modules/sway/home.nix +++ b/home/wayland/modules/sway/home.nix @@ -24,6 +24,7 @@ in { ]; home.packages = [ + pkgs.wl-clipboard pkgs.nnn pkgs.bemenu pkgs.swayidle diff --git a/home/wayland/modules/sway/mako.nix b/home/wayland/modules/sway/mako.nix index 028ae66..fdc939e 100644 --- a/home/wayland/modules/sway/mako.nix +++ b/home/wayland/modules/sway/mako.nix @@ -1,9 +1,11 @@ -{ config, lib, ... }: let +{ config, pkgs, lib, ... }: let font = config.global.font.sans.name + " " + lib.optionalString (config.global.font.sans.size != null) (builtins.toString config.global.font.sans.size); in { + home.packages = with pkgs; [ libnotify ]; + services.mako = { enable = true; defaultTimeout = 3000; diff --git a/os/cez/configuration.nix b/os/cez/configuration.nix index c7f865d..f8c9dfe 100644 --- a/os/cez/configuration.nix +++ b/os/cez/configuration.nix @@ -1,9 +1,6 @@ -{ config, pkgs, ... }: - -let +{ config, pkgs, ... }: let user = config.global.userdata.name; -in -{ +in { imports = [ ../common/configuration.nix ./hardware-configuration.nix @@ -38,7 +35,6 @@ in users.users.${user} = { extraGroups = [ "adbusers" ]; packages = with pkgs; [ - geoipWithDatabase ffmpeg (pass.withExtensions (exts: [ exts.pass-otp ])) ]; diff --git a/os/cez/modules/wayland.nix b/os/cez/modules/wayland.nix index 338c585..872c7fb 100644 --- a/os/cez/modules/wayland.nix +++ b/os/cez/modules/wayland.nix @@ -6,39 +6,6 @@ fontPackages = config.global.font.monospace.packages ++ config.global.font.sans.packages; in { - # pkgs - environment.systemPackages = with pkgs; [ - bemenu - sway - i3status - swaylock - swayidle - swaybg - foot - wl-clipboard - mako - xdg-utils - libnotify - ]; - - users.users.${user} = { - extraGroups = [ "seat" ]; - packages = with pkgs; [ - zathura - mpv - imv - wtype - qemu - OVMFFull - grim - slurp - tor-browser-bundle-bin - element-desktop-wayland - pinentry-bemenu - ]; - }; - - # font fonts = { packages = fontPackages; enableDefaultPackages = true; @@ -53,7 +20,7 @@ in { }; }; - # misc + users.users.${user}.extraGroups = [ "seat" ]; services = { seatd.enable = true; dbus = { @@ -69,6 +36,6 @@ in { }; }; - security.pam.services.swaylock.text = "auth include login"; + security.pam.services.swaylock = {}; hardware.opengl.enable = true; } diff --git a/os/common/configuration.nix b/os/common/configuration.nix index a3dd494..4d2ac87 100644 --- a/os/common/configuration.nix +++ b/os/common/configuration.nix @@ -23,6 +23,7 @@ in defaultSopsFile = ../${host}/secrets.yaml; age.keyFile = "/var/secrets/${host}.sops"; }; + system.stateVersion = "24.11"; nix.settings.experimental-features = [ "flakes" "nix-command" ]; @@ -35,21 +36,7 @@ in uid = 1000; isNormalUser = true; description = email; - extraGroups = [ "wheel" ]; - packages = with pkgs; [ - bc - unzip - htop - curl - file - dig - tcpdump - mtr - nnn - ps_mem - brightnessctl - ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAcCendbKbeoc7hYEEcBt9wwtSXrJUgJ2SuYARO0zPAX sinan@veu" @@ -59,6 +46,7 @@ in time.timeZone = "Asia/Kolkata"; networking.useDHCP = false; + environment = { binsh = "${lib.getExe pkgs.dash}"; systemPackages = with pkgs; [ @@ -76,10 +64,12 @@ in grep = "grep --color=auto"; }; }; + services.openssh = { enable = true; settings.PasswordAuthentication = false; }; + programs.bash.promptInit = '' if [ "$UID" -ne 0 ]; then PROMPT_COLOR="1;32m" -- cgit v1.2.3