From 654fa9e430be421df30ee79e7ea5f4e40b39dddc Mon Sep 17 00:00:00 2001 From: sinanmohd Date: Tue, 4 Jun 2024 14:38:25 +0530 Subject: home, os: refactor --- os/common/configuration.nix | 13 ++++--------- os/common/modules/dev.nix | 29 ----------------------------- 2 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 os/common/modules/dev.nix (limited to 'os/common') diff --git a/os/common/configuration.nix b/os/common/configuration.nix index 4d2ac87..e075ac3 100644 --- a/os/common/configuration.nix +++ b/os/common/configuration.nix @@ -12,21 +12,17 @@ in ]; imports = [ ./modules/tmux.nix - ./modules/dev.nix ./modules/nix.nix ./modules/pppd.nix ./modules/stalwart-mail.nix ]; + system.stateVersion = "24.11"; sops = { defaultSopsFile = ../${host}/secrets.yaml; age.keyFile = "/var/secrets/${host}.sops"; }; - - system.stateVersion = "24.11"; - nix.settings.experimental-features = [ "flakes" "nix-command" ]; - boot = { tmp.useTmpfs = true; loader.timeout = 1; @@ -43,22 +39,21 @@ in "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8LnyOuPmtKRqAZeHueNN4kfYvpRQVwCivSTq+SZvDU sinan@cez" ]; }; - time.timeZone = "Asia/Kolkata"; networking.useDHCP = false; environment = { - binsh = "${lib.getExe pkgs.dash}"; + binsh = lib.getExe pkgs.dash; systemPackages = with pkgs; [ dash - luajit neovim - sops ]; + variables = { EDITOR = "nvim"; VISUAL = "nvim"; }; + shellAliases = { ls = "ls --color=auto --group-directories-first"; grep = "grep --color=auto"; diff --git a/os/common/modules/dev.nix b/os/common/modules/dev.nix deleted file mode 100644 index eb00619..0000000 --- a/os/common/modules/dev.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, pkgs, ... }: - -let - user = config.global.userdata.name; -in -{ - users.users.${user}.packages = with pkgs; [ - gcc - git - lua - - (python3.withPackages (p: with p; [ - pip - build - ])) - - man-pages - man-pages-posix - - ccls - lua-language-server - nil - nodePackages.bash-language-server - nodePackages.pyright - shellcheck - ]; - - documentation.dev.enable = true; -} -- cgit v1.2.3