summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsinanmohd <sinan@firemail.cc>2023-08-08 07:45:37 +0530
committersinanmohd <sinan@firemail.cc>2023-08-10 05:36:17 +0530
commit0bed62a620eeb49ccbe03ac4acf6f437e53939ab (patch)
tree65874635a2848bb4a9f676fe296ee6e3a3d6b495
parent5a641e216e7799b024261cc2b77f272fe6473782 (diff)
clean up: inconsistent list style
-rw-r--r--configuration.nix21
-rw-r--r--features/development.nix5
-rw-r--r--features/kaysshfs.nix9
-rw-r--r--features/wayland.nix17
-rw-r--r--features/xdp.nix6
-rw-r--r--hardware/cez.nix6
-rw-r--r--hardware/kay.nix4
7 files changed, 45 insertions, 23 deletions
diff --git a/configuration.nix b/configuration.nix
index 50668d6..f043e33 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -5,8 +5,8 @@ let
in
{
imports = [
- ./hardware-configuration.nix # hw scan
- ./hardware/cez.nix
+ ./hardware-configuration.nix # hw scan
+ ./hardware/cez.nix
];
# boot
@@ -24,7 +24,10 @@ in
# users
users.users.${user} = {
isNormalUser = true;
- extraGroups = [ "wheel" "adbusers" ];
+ extraGroups = [
+ "wheel"
+ "adbusers"
+ ];
packages = with pkgs; [
yt-dlp
geoipWithDatabase
@@ -72,11 +75,13 @@ in
# nix
nix = {
- settings.experimental-features = [ "nix-command" "flakes" ];
- nixPath =
- options.nix.nixPath.default ++
- [ "nixpkgs-overlays=/etc/nixos/overlays/" ]
- ;
+ settings.experimental-features = [
+ "nix-command"
+ "flakes"
+ ];
+ nixPath = options.nix.nixPath.default ++ [
+ "nixpkgs-overlays=/etc/nixos/overlays/"
+ ];
};
nixpkgs.overlays = with builtins;
if pathExists ./overlays then
diff --git a/features/development.nix b/features/development.nix
index 9ca0446..aa26c9b 100644
--- a/features/development.nix
+++ b/features/development.nix
@@ -1,6 +1,9 @@
{ config, pkgs, ... }:
{
- environment.systemPackages = [ pkgs.man-pages pkgs.man-pages-posix ];
+ environment.systemPackages = with pkgs; [
+ man-pages
+ man-pages-posix
+ ];
documentation.dev.enable = true;
}
diff --git a/features/kaysshfs.nix b/features/kaysshfs.nix
index ec6a118..83cb68e 100644
--- a/features/kaysshfs.nix
+++ b/features/kaysshfs.nix
@@ -1,13 +1,14 @@
{ config, pkgs, ... }:
{
- system.fsPackages = [ pkgs.sshfs ];
+ system.fsPackages = with pkgs; [
+ sshfs
+ ];
fileSystems."/mnt/kay" = {
device = "sinansftp@sinanmohd.com:";
fsType = "sshfs";
- options =
- [ # Filesystem options
+ options = [
"allow_other" # for non-root access
"_netdev" # this is a network fs
"x-systemd.automount" # mount on demand
@@ -16,6 +17,6 @@
"reconnect" # handle connection drops
"ServerAliveInterval=15" # keep connections alive
"IdentityFile=/var/secrets/kaysftp-key"
- ];
+ ];
};
}
diff --git a/features/wayland.nix b/features/wayland.nix
index acdde1e..44523cc 100644
--- a/features/wayland.nix
+++ b/features/wayland.nix
@@ -31,14 +31,23 @@
# font
fonts = {
- fonts = [ pkgs.terminus-nerdfont pkgs.dm-sans ];
+ fonts = with pkgs; [
+ terminus-nerdfont
+ dm-sans
+ ];
enableDefaultFonts = true;
fontconfig = {
hinting.style = "hintfull";
defaultFonts = {
- monospace = [ "Terminess Nerd Font" ];
- serif = [ "DeepMind Sans" ];
- sansSerif = [ "DeepMind Sans" ];
+ monospace = [
+ "Terminess Nerd Font"
+ ];
+ serif = [
+ "DeepMind Sans"
+ ];
+ sansSerif = [
+ "DeepMind Sans"
+ ];
};
};
};
diff --git a/features/xdp.nix b/features/xdp.nix
index 78ee5f8..eed561b 100644
--- a/features/xdp.nix
+++ b/features/xdp.nix
@@ -11,12 +11,14 @@ let
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=wlroots
systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
systemctl --user start pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
- '';
+ '';
};
in
{
# pkgs
- environment.systemPackages = [ dbus-xdp-environment ];
+ environment.systemPackages = [
+ dbus-xdp-environment
+ ];
# xdg desktop portal
xdg.portal = {
diff --git a/hardware/cez.nix b/hardware/cez.nix
index fbfbde0..cc20331 100644
--- a/hardware/cez.nix
+++ b/hardware/cez.nix
@@ -2,9 +2,9 @@
{
imports = [
- ../features/wayland.nix
- ../features/kaysshfs.nix
- ../features/development.nix
+ ../features/wayland.nix
+ ../features/kaysshfs.nix
+ ../features/development.nix
];
boot = {
diff --git a/hardware/kay.nix b/hardware/kay.nix
index 57b6d2e..7eb7290 100644
--- a/hardware/kay.nix
+++ b/hardware/kay.nix
@@ -1,5 +1,7 @@
{ config, pkgs, ... }:
{
- environment.systemPackages = [ pkgs.tmux ];
+ environment.systemPackages = with pkgs; [
+ tmux
+ ];
}