Changes, refactoring, todo...

modules/applications/i3lock-fancy-ffmpeg.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, coreutils, scrot, ffmpeg, gawk
+, i3lock-color, getopt, fontconfig
+}:
+
+stdenv.mkDerivation rec {
+  rev = "c8f648c5e35178dd39ecc83094bf921752b7878b";
+  name = "i3lock-fancy-ffmpeg_rev${builtins.substring 0 7 rev}";
+  src = fetchFromGitHub {
+    owner = "rinfiyks";
+    repo = "i3lock-fancy";
+    inherit rev;
+    sha256 = "1pdvzi5d9p2r5md2g289j95333nkpb3ah3si91c5f6350swd8jmz";
+  };
+  patchPhase = ''
+    rm Makefile
+  '';
+  installPhase = ''
+    mkdir -p $out/bin $out/share/i3lock-fancy-ffmpeg/icons
+    cp i3lock-fancy $out/bin/i3lock-fancy-ffmpeg
+    cp icons/lock*.png $out/share/i3lock-fancy-ffmpeg/icons
+  '';
+  meta = with stdenv.lib; {
+    description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text.";
+    homepage = https://github.com/meskarune/i3lock-fancy;
+    maintainers = with maintainers; [ ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}

modules/applications/packages.nix

@@ -16,10 +16,12 @@ with deviceSpecific; {
     sysstat
 
     lxqt.pavucontrol-qt
-    git
+    bibata-cursors
+    i3lock-fancy-ffmpeg
     # Samba support
     cifs-utils
     # Utils
+    nix-prefetch-git
     hdparm
     vdpauinfo
     libva-utils

modules/default.nix

@@ -1,16 +1,15 @@
 { config, lib, ... }: {
   imports = [
     ./applications/packages.nix
-    ./applications/rofi.nix
     # ./applications/vivaldi
     ./workspace/i3blocks
     ./workspace/i3
     ./workspace/zsh.nix
+    ./workspace/rofi.nix
     ./workspace/gtk.nix
     # ./workspace/compton.nix
     ./workspace/misc.nix
     ./workspace/dunst.nix
-    ./workspace/cursor.nix
     ./workspace/mpv.nix
     ./workspace/kde
     # ./workspace/ssh.nix

modules/hardware.nix

@@ -39,6 +39,7 @@ with deviceSpecific; {
     pkgs.linuxPackages
   else
     pkgs.linuxPackages_latest;
+  boot.zfs.enableUnstable = true; # For latest kernel
   boot.supportedFilesystems = [ "ntfs" ];
   boot.blacklistedKernelModules = lib.mkIf (device == "Dell-Laptop") [
     "psmouse"

modules/packages.nix

@@ -4,6 +4,7 @@
       rec {
         # nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd;
         youtube-to-mpv = pkgs.callPackage ./applications/youtube-to-mpv.nix {};
+        i3lock-fancy-ffmpeg = pkgs.callPackage ./applications/i3lock-fancy-ffmpeg.nix {};
       }
     )
   ];

modules/workspace/barrier.nix

@@ -21,7 +21,6 @@
     };
   } else {
     client.enable = true;
-    client.autoStart = true;
     client.serverAddress = "NixOS-VM";
   };
 }

modules/workspace/cursor.nix

@@ -1,10 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  environment.systemPackages = with pkgs; [
-    bibata-cursors
-  ];
-  # Bibata_Amber, Bibata_Ice, Bibata_Oil
-  home-manager.users.alukard.home.file.".icons/default" = {
-    source = "${pkgs.bibata-cursors}/share/icons/Bibata_Oil";
-  };
-}

modules/workspace/gtk.nix

@@ -31,8 +31,9 @@ in {
     generated-gtk-theme = self.stdenv.mkDerivation rec {
       name = "generated-gtk-theme";
       src = ../../imports/github/nana-4/materia-theme;
-      buildInputs = with self; [ sassc bc which inkscape optipng bash ];
+      buildInputs = with self; [ sassc bc which inkscape optipng ];
       installPhase = ''
+        HOME=/build
         chmod 777 -R .
         mkdir -p $out/share/themes
         patchShebangs .
@@ -55,6 +56,11 @@ in {
         name = "Generated";
         package = pkgs.generated-gtk-theme;
       };
+      font = {
+        name = "Roboto 11";
+        package = pkgs.roboto;
+      };
+      gtk3.extraConfig.gtk-cursor-theme-name = "bibata_oil";
     };
   };
   environment.sessionVariables.GTK_THEME = "Generated";

modules/workspace/i3/default.nix

@@ -2,18 +2,7 @@
 let
   thm = config.themes.colors;
   apps = config.defaultApplications;
-  customPackages = pkgs.callPackage ../../../packages { };
 in {
-  systemd.services.changeNice = {
-    description = "Update niceness levels of important processes";
-    serviceConfig.User = "root";
-    wantedBy = [ "graphical.target" ];
-    script = ''
-      sleep 5
-      ${pkgs.utillinux}/bin/renice -n -10 -p $(${pkgs.procps}/bin/pidof i3)
-      ${pkgs.utillinux}/bin/renice -n -10 -p $(${pkgs.procps}/bin/pidof X)
-    '';
-  };
   environment.sessionVariables._JAVA_AWT_WM_NONREPARENTING = "1";
   home-manager.users.alukard.xsession.windowManager.i3 = {
     enable = true;
@@ -78,26 +67,9 @@ in {
           }
         ];
       };
-      # startup = map (a: { notification = false; } // a) [
+      startup = map (a: { notification = false; } // a) [
-      #   { command = apps.browser.cmd; }
+        { command = "${pkgs.xorg.xrdb}/bin/xrdb -merge ~/.Xresources"; }
-      #   { command = "${pkgs.kdeconnect}/lib/libexec/kdeconnectd"; }
+      ];
-      #   {
-      #     command =
-      #       "${pkgs.polkit-kde-agent}/lib/libexec/polkit-kde-authentication-agent-1";
-      #   }
-      #   {
-      #     command =
-      #       "${pkgs.keepassxc}/bin/keepassxc /home/alukard/projects/nixos-config/misc/Passwords.kdbx";
-      #   }
-      #   { command = "balooctl start"; }
-      #   { command = "${pkgs.trojita}/bin/trojita"; }
-      #   {
-      #     command = "${pkgs.hsetroot}/bin/hsetroot -solid '${thm.bg}'";
-      #     always = true;
-      #   }
-      #   { command = "${pkgs.termNote}/bin/noted"; }
-      #   { command = "${pkgs.nheko}/bin/nheko"; }
-      # ];
       keybindings = let
         moveMouse = ''
           "sh -c 'eval `${pkgs.xdotool}/bin/xdotool \

modules/workspace/i3blocks/default.nix

@@ -12,7 +12,7 @@ in {
       status_command ${pkgs.i3blocks}/bin/i3blocks
       workspace_buttons yes
       strip_workspace_numbers no
-      tray_output none
+      tray_output primary
       colors {
         background ${config.themes.colors.bg}
         statusline ${config.themes.colors.fg}

modules/workspace/misc.nix

@@ -26,7 +26,9 @@
       options = [ "grp:win_space_toogle" ];
       layout = "us,ru";
     };
-    # home.file.".icons/default".source ="${pkgs.breeze-qt5}/share/icons/breeze_cursors";
+    home.file.".icons/default" = {
+      source = "${pkgs.bibata-cursors}/share/icons/Bibata_Oil";
+    };
     systemd.user.startServices = true;
   };
 }

todo.md

@@ -1,4 +1,6 @@
 # TODO
 
-* Экран по умолчанию в i3 - 1, а не 0.
+* смена темы со светлой на темную
-* youtube-mpv в фоне без видео, для прослушивания музыки с ютуба
+* i3 хоткеи на русской раскладке
+* добавить прогу словарь
+* Сделать pull request на i3lock-fancy