From f3e74cc8ef6fb944cd6e203ca25ea2cea65b778c Mon Sep 17 00:00:00 2001
From: spl3g <spleefer6@yandex.ru>
Date: Tue, 23 Jan 2024 23:43:25 +0300
Subject: clean up

---
 nixos/general.nix              | 55 ++++++++++++++++++++++++++++++++++++------
 nixos/laptop/configuration.nix | 10 ++++----
 2 files changed, 52 insertions(+), 13 deletions(-)

(limited to 'nixos')

diff --git a/nixos/general.nix b/nixos/general.nix
index 6eb11ff..73d884f 100644
--- a/nixos/general.nix
+++ b/nixos/general.nix
@@ -1,18 +1,18 @@
-{ inputs, outputs, lib, config, pkgs, ... }: {
+{ inputs, outputs, lib, config, pkgs, ... }:
+
+{
   nixpkgs = {
     overlays = [
       outputs.overlays.additions
       outputs.overlays.modifications
       outputs.overlays.unstable-packages
       outputs.overlays.emacs-overlay
-
-      # You can also add overlays exported from other flakes:
-      # neovim-nightly-overlay.overlays.default
     ];
     config = {
       allowUnfree = true;
     };
   };
+  
   nix = {
     # This will add each flake input as a registry
     # To make nix3 commands consistent with your flake
@@ -34,9 +34,11 @@
       auto-optimise-store = true;
     };
   };
+  
   networking.networkmanager = {
     enable = true;
   };
+  
   networking.nftables.enable = true;
   
   boot.loader = {
@@ -45,6 +47,7 @@
   };
   
   security.rtkit.enable = true;
+  security.polkit.enable = true;
   
   services.pipewire = {
       enable = true;
@@ -54,14 +57,50 @@
       pulse.enable = true;
       jack.enable = true;
   };
+  
   environment.systemPackages = with pkgs; [
-    vim
+    neovim
     git 
   ];
-  services.udisks2 = {
-    enable = true;
-    mountOnMedia = true;
+
+  services = {
+    devmon.enable = true;
+    gvfs.enable = true;
+    udisks2 = {
+      enable = true;
+      mountOnMedia = true;
+    };
   };
+
+  fonts = {
+    packages = with pkgs; [
+      # icon fonts
+      material-design-icons
+
+      # normal fonts
+      noto-fonts
+      noto-fonts-cjk
+      noto-fonts-emoji
+      rubik
+
+      # code font
+      source-code-pro
+    ];
+
+    enableDefaultPackages = false;
+
+    # user defined fonts
+    # the reason there's Noto Color Emoji everywhere is to override DejaVu's
+    # B&W emojis that would sometimes show instead of some Color emojis
+    fontconfig.defaultFonts = {
+      serif = ["Noto Serif" "Noto Color Emoji"];
+      sansSerif = ["Noto Sans" "Noto Color Emoji"];
+      monospace = ["Source Code Pro" "Noto Color Emoji"];
+      emoji = ["Noto Color Emoji"];
+    };
+  };
+
+  
   programs.dconf.enable = true;
   i18n.defaultLocale = "ru_RU.UTF-8";
   programs.fish.enable = true;
diff --git a/nixos/laptop/configuration.nix b/nixos/laptop/configuration.nix
index 7d38479..ceed24e 100644
--- a/nixos/laptop/configuration.nix
+++ b/nixos/laptop/configuration.nix
@@ -17,8 +17,8 @@
   time.timeZone = "Europe/Moscow";
   networking.hostName = "ltrr-mini";
 
-  virtualisation.libvirtd.enable = true;
-  programs.virt-manager.enable = true;
+  # virtualisation.libvirtd.enable = true;
+  # programs.virt-manager.enable = true;
   
   services.xserver = {
     enable = false;
@@ -26,9 +26,9 @@
   };
 
 
-  environment.systemPackages = with pkgs; [
-    qemu
-  ];
+  # environment.systemPackages = with pkgs; [
+  #   qemu
+  # ];
   
   programs.adb.enable = true;
   services.udev.packages = [
-- 
cgit v1.2.3