From 84073038e22d3201ac0176a94527c040bb153e9e Mon Sep 17 00:00:00 2001
From: sinanmohd <sinan@sinanmohd.com>
Date: Tue, 4 Jun 2024 14:08:26 +0530
Subject: home, os: move user pkgs to home
---
os/cez/configuration.nix | 8 ++------
os/cez/modules/wayland.nix | 37 ++-----------------------------------
os/common/configuration.nix | 18 ++++--------------
3 files changed, 8 insertions(+), 55 deletions(-)
(limited to 'os')
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