changes

.gitattributes

@@ -1 +1 @@
-* eol=lf
+* text=auto eol=lf

imports/github/rycee/home-manager

@@ -1 +1 @@
-Subproject commit 13fa61744c0c8242446a349cc1e9d6279446db35
+Subproject commit bfc28cacbed9124d0162db60a1cb0a453da273bd

modules/applications.nix

@@ -7,11 +7,11 @@ with import ../support.nix { inherit lib config; }; {
   config = rec {
     defaultApplications = {
       term = {
-        cmd = "${pkgs.xst}/bin/st";
+        cmd = "${pkgs.rxvt_unicode}/bin/urxvt";
-        desktop = "xst";
+        desktop = "urxvt";
       };
       editor = {
-        cmd = "${pkgs.codium}/bin/codium";
+        cmd = "${pkgs.vscodium}/bin/codium";
         desktop = "codium";
       };
       browser = {
@@ -60,7 +60,7 @@ with import ../support.nix { inherit lib config; }; {
     let
       apps = builtins.mapAttrs (name: value: "${value.desktop}.desktop;") {
         "text/html" = browser;
-        "image/*" = { desktop = "org.kde.gwenview"; };
+        # "image/*" = { desktop = "org.kde.gwenview"; };
         "application/x-bittorrent" = torrent;
         "application/zip" = archive;
         "application/rar" = archive;

modules/applications/packages.nix

@@ -0,0 +1,27 @@
+{ pkgs, config, lib, ... }: {
+  # programs.adb.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    (vivaldi.override { proprietaryCodecs = true; })
+    rxvt_unicode
+    wget
+    curl
+    gparted
+    neofetch
+    pavucontrol
+    bashmount
+    p7zip
+    zip
+    ranger
+
+  ];
+
+  home-manager.users.balsoft.home.packages = with pkgs; [
+    nix-zsh-completions
+    qbittorrent
+    vscodium
+    xarchiver
+    xfce4-14.xfce4-taskmanager
+  ];
+
+}

modules/default.nix

@@ -1,6 +1,6 @@
 { ... }: {
   imports = [
-    # ./applications/packages.nix
+    ./applications/packages.nix
     # ./applications/kate.nix
     # ./applications/emacs
     # ./applications/xst.nix
@@ -11,7 +11,7 @@
     # ./applications/spectral.nix
     # ./workspace/i3blocks
     # ./workspace/i3
-    # ./workspace/zsh.nix
+    ./workspace/zsh.nix
     # ./workspace/gtk.nix
     # ./workspace/compton.nix
     # ./workspace/misc.nix
@@ -19,15 +19,15 @@
     # ./workspace/kde
     # ./workspace/synergy.nix
     # ./workspace/ssh.nix
-    # ./workspace/locale.nix
+    ./workspace/locale.nix
-    # ./workspace/fonts.nix
+    ./workspace/fonts.nix
     # ./workspace/light.nix
     # ./workspace/autorandr.nix
     # ./workspace/gcalcli.nix
     # ./workspace/rclone.nix
-    # ./workspace/xresources.nix
+    ./workspace/xresources.nix
     ./themes.nix
-    ./applications.nix
+    # ./applications.nix
     ./secrets.nix
     ./devices.nix
     # ./packages.nix

modules/nix.nix

@@ -8,7 +8,4 @@
     autoOptimiseStore = config.deviceSpecific.isSSD;
     optimise.automatic = true;
   };
-  environment.systemPackages = with pkgs; [
-    xfce4-14.xfce4-taskmanager
-  ];
 }

modules/themes.nix

@@ -64,6 +64,6 @@ in {
   };
   config = {
     themes.colors = fromBase16 (fromYAML (builtins.readFile
-    ../imports/github/dawikur/base16-gruvbox-scheme/gruvbox-dark-hard.yaml));
+    ../imports/github/michael-ball/base16-horizon-scheme/horizon-dark.yaml));
   };
 }

modules/workspace/fonts.nix

@@ -0,0 +1,25 @@
+{ pkgs, config, lib, ... }: {
+  fonts = {
+    fonts = with pkgs; [
+      terminus_font
+      opensans-ttf
+      roboto
+      roboto-mono
+      roboto-slab
+      # nerdfonts
+      fira-code
+      noto-fonts
+      noto-fonts-emoji
+      hasklig
+    ];
+    fontconfig = {
+      enable = true;
+      defaultFonts = {
+        monospace = ["Roboto Mono 13"];
+        sansSerif = ["Roboto 13"];
+        serif = ["Roboto Slab 13"];
+      };
+    };
+    enableDefaultFonts = true;
+  };
+}

modules/workspace/locale.nix

@@ -0,0 +1,19 @@
+{ pkgs, config, lib, ... }: {
+  i18n = {
+    defaultLocale = "en_GB.UTF-8";
+    consoleFont = "cyr-sun16";
+    consoleKeyMap = "ruwin_cplk-UTF-8";
+  };
+
+  time.timeZone = "Europe/Volgograd";
+  home-manager.users.alukard.home.language = let
+    en = "en_GB.UTF-8";
+    ru = "ru_RU.UTF-8";
+  in {
+    address = ru;
+    monetary = ru;
+    paper = ru;
+    time = en;
+    base = en;
+  };
+}

modules/workspace/xresources.nix

@@ -0,0 +1,73 @@
+
+{ config, lib, pkgs, ... }:
+{
+  home-manager.users.alukard = {
+    xresources.properties = with config.themes.colors; {
+      "*background" = bg;
+      "*foreground" = fg;
+      "*color0" = dark;
+      "*color1" = red;
+      "*color2" = green;
+      "*color3" = yellow;
+      "*color4" = blue;
+      "*color5" = purple;
+      "*color6" = cyan;
+      "*color7" = fg;
+      "*color8" = dark;
+      "*color9" = red;
+      "*color10" = green;
+      "*color11" = yellow;
+      "*color12" = blue;
+      "*color13" = purple;
+      "*color14" = cyan;
+      "*color15" = fg;
+
+      # "URxvt.font" = "Fira Code:style=Regular:size=8";
+      # "URxvt.boldFont" = "Fira Code:style=Bold:size=8";
+      # "URxvt.italicFont" = "Fira Code:style=Italic:size=8";
+      # "URxvt.boldItalicfont" = "Fira Code:style=Bold Italic:size=8";
+      "URxvt.letterSpace" = "0";
+      "URxvt.lineSpace" = "0";
+      "URxvt.geometry" = "92x24";
+      "URxvt.internalBorder" = "24";
+      "URxvt.cursorBlink" = "true";
+      "URxvt.cursorUnderline" = "false";
+      "URxvt.saveline" = "2048";
+      "URxvt.scrollBar" = "false";
+      "URxvt.scrollBar_right" = "false";
+      "URxvt.urgentOnBell" = "true";
+      "URxvt.depth" = "24";
+      "URxvt.iso14755" = "false";
+
+      "URxvt.keysym.Shift-Up" = "command:\\033]720;1\\007";
+      "URxvt.keysym.Shift-Down" = "command:\\033]721;1\\007";
+      "URxvt.keysym.Control-Up" = "\\033[1;5A";
+      "URxvt.keysym.Control-Down" = "\\033[1;5B";
+      "URxvt.keysym.Control-Right" = "\\033[1;5C";
+      "URxvt.keysym.Control-Left" = "\\033[1;5D";
+
+      # "emacs.color0" = dark;
+      # "emacs.color1" = red;
+      # "emacs.color2" = green;
+      # "emacs.color3" = yellow;
+      # "emacs.color4" = gray;
+      # "emacs.color5" = purple;
+      # "emacs.color6" = cyan;
+      # "emacs.color7" = gray;
+      # "emacs.color8" = alt;
+      # "emacs.color9" = green;
+      # "emacs.color10" = green;
+      # "emacs.color11" = yellow;
+      # "emacs.color12" = green;
+      # "emacs.color13" = purple;
+      # "emacs.color14" = cyan;
+      # "emacs.color15" = fg;
+
+    };
+    home.activation.xrdb = {
+      after = ["linkGeneration"];
+      before = [];
+      data = "DISPLAY=:0 ${pkgs.xorg.xrdb}/bin/xrdb -merge ${config.users.users.alukard.home}/.Xresources";
+    };
+  };
+}

modules/workspace/zsh.nix

@@ -0,0 +1,45 @@
+{ pkgs, config, ... }: {
+
+  environment.pathsToLink = [ "/share/zsh" ];
+  environment.sessionVariables.SHELL = "zsh";
+  home-manager.users.alukard.programs.zsh = {
+    enable = true;
+    enableAutosuggestions = true;
+    enableCompletion = true;
+    oh-my-zsh = {
+      enable = true;
+      theme = "agnoster";
+      plugins = [ "git" "dirhistory" ];
+    };
+    plugins = [
+      {
+        name = "zsh-nix-shell";
+        file = "nix-shell.plugin.zsh";
+        src = pkgs.fetchFromGitHub {
+         owner = "chisui";
+         repo = "zsh-nix-shell";
+         rev = "b2609ca787803f523a18bb9f53277d0121e30389";
+         sha256 = "01w59zzdj12p4ag9yla9ycxx58pg3rah2hnnf3sw4yk95w3hlzi6";
+       };
+      }
+      {
+        name = "zsh-autosuggestions";
+        src = pkgs.fetchFromGitHub {
+          owner = "zsh-users";
+          repo = "zsh-autosuggestions";
+          rev = "v0.4.0";
+          sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc";
+        };
+      }
+      {
+        name = "you-should-use";
+        src = pkgs.fetchFromGitHub {
+          owner = "MichaelAquilina";
+          repo = "zsh-you-should-use";
+          rev = "2be37f376c13187c445ae9534550a8a5810d4361";
+          sha256 = "0yhwn6av4q6hz9s34h4m3vdk64ly6s28xfd8ijgdbzic8qawj5p1";
+        };
+      }
+    ];
+  };
+}