Adds, clearing...

modules/default.nix

@@ -2,14 +2,7 @@
   imports = [
     ./applications/packages.nix
     ./applications/rofi.nix
-    # ./applications/kate.nix
+    # ./applications/vivaldi
-    # ./applications/emacs
-    # ./applications/xst.nix
-    # ./applications/trojita.nix
-    # ./applications/firefox.nix
-    # ./applications/okular.nix
-    # ./applications/weechat.nix
-    # ./applications/spectral.nix
     ./workspace/i3blocks
     ./workspace/i3
     ./workspace/zsh.nix
@@ -20,7 +13,6 @@
     ./workspace/cursor.nix
     ./workspace/mpv.nix
     ./workspace/kde
-    # ./workspace/synergy.nix
     # ./workspace/ssh.nix
     ./workspace/locale.nix
     ./workspace/fonts.nix

modules/filesystems.nix

@@ -1,12 +1,16 @@
-{ pkgs, lib, config, ... }: {
+{ pkgs, lib, config, ... }:
+with rec {
+  inherit (config) deviceSpecific secrets;
+};
+with deviceSpecific; {
   fileSystems = {
     "/" = {
-      options = if config.deviceSpecific.isSSD then
+      options = if isSSD then
         [ "ssd" "noatime" "compress=zstd" ]
       else
         [ "noatime" "compress=zstd" ];
     };
-    "/shared/nixos" = lib.mkIf config.deviceSpecific.isVM {
+    "/shared/nixos" = lib.mkIf isVM {
       fsType = "vboxsf";
       device = "shared";
       options = [
@@ -21,6 +25,29 @@
         "gid=${toString config.users.groups.smbgrp.gid}"
       ];
     };
+    "/media/windows/files" = lib.mkIf (!isHost) {
+      fsType = "cifs";
+      device = "//192.168.0.100/Files";
+      options = [
+        "user=${secrets.windows-samba.user}"
+        "password=${secrets.windows-samba.password}"
+        "nofail"
+        "uid=${toString config.users.users.alukard.uid}"
+        "gid=${toString config.users.groups.users.gid}"
+      ];
+    };
+    "/media/windows/data" = lib.mkIf (!isHost) {
+      fsType = "cifs";
+      device = "//192.168.0.100/Data";
+      options = [
+        "ro"
+        "user=${secrets.windows-samba.user}"
+        "password=${secrets.windows-samba.password}"
+        "nofail"
+        "uid=${toString config.users.users.alukard.uid}"
+        "gid=${toString config.users.groups.users.gid}"
+      ];
+    };
   };
 
   # mount swap

modules/power.nix

@@ -16,6 +16,9 @@ with deviceSpecific; {
       CPU_HWP_ON_BAT=balance_power
       CPU_BOOST_ON_AC=1
       CPU_BOOST_ON_BAT=0
+      DISK_DEVICES="nvme0n1 sda"
+      DISK_APM_LEVEL_ON_AC="255 254"
+      DISK_APM_LEVEL_ON_BAT="128 128"
     '';
   };
   services.undervolt = {

modules/samba.nix

@@ -1,8 +1,12 @@
-{ config, lib, pkgs, ... }: {
+{ config, lib, pkgs, ... }:
+with rec {
+  inherit (config) deviceSpecific;
+};
+with deviceSpecific; {
   users.groups.smbgrp.gid = 2001;
   # TODO: add nologin shell to this user
   users.users.smbuser =
-  lib.mkIf (config.device == "AMD-Workstation" || config.device == "NixOS-VM") {
+  lib.mkIf (isHost || config.device == "NixOS-VM") {
     isNormalUser = false;
     extraGroups = [
       "smbgrp"
@@ -10,7 +14,7 @@
     description = "User for samba sharing";
   };
   services.samba =
-  lib.mkIf (config.device == "AMD-Workstation" || config.device == "NixOS-VM") {
+  lib.mkIf (isHost || config.device == "NixOS-VM") {
     enable = true;
     enableNmbd = false;
     enableWinbindd = false;
@@ -47,7 +51,7 @@
     '';
   };
   environment.systemPackages =
-  if (config.device == "AMD-Workstation" || config.device == "NixOS-VM") then
+  if (isHost || config.device == "NixOS-VM") then
     [ config.services.samba.package ]
   else
     [ ];

modules/workspace/zsh.nix

@@ -42,7 +42,6 @@
       }
     ];
     shellAliases = {
-      "mpv" = "mpv --hwdec=vaapi";
       "clr" = "clear";
       "weather" = "curl wttr.in/Volzhskiy";
       "l" = "ls -lah --group-directories-first";

todo.md

@@ -0,0 +1,4 @@
+# TODO
+
+* Экран по умолчанию в i3 - 1, а не 0.
+* youtube-mpv в фоне без видео, для прослушивания музыки с ютуба