Commit.

flake.nix

@@ -4,6 +4,8 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    #nixpkgs-master.url = "github:nixos/nixpkgs";
+
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -15,8 +17,6 @@
   };
 
   outputs = inputs: {
-    inherit (inputs.nixpkgs) legacyPackages;
-
     nixosConfigurations = let
       inherit (inputs.nixpkgs) lib;
 

hosts/personal-server/networking.nix

@@ -1,6 +1,6 @@
 {
   # Need to make interface use DHCP manually, because systemd.
-  # networking.useDHCP = false;
+  networking.useDHCP = false;
   #networking.interfaces.enp2s0.useDHCP = true;
 
   # systemd master race.

modules/music/default.nix

@@ -66,10 +66,9 @@ plugins = with pkgs; [
   # Autotune
   zita-at1
 ];
+
 in
 {
-  imports = [ ./player.nix ];
-
   #nixpkgs.overlays = [ distrho-overlay ];
 
   environment.systemPackages = with pkgs; [
@@ -82,7 +81,7 @@ in
 
   environment.variables = {
     DSSI_PATH   = pkgs.lib.makeSearchPath "lib/dssi" plugins;
-    LADSPA_PATH = pkgs.lib.makeSearchPath "lib/adspa" plugins;
+    LADSPA_PATH = pkgs.lib.makeSearchPath "lib/ladspa" plugins;
     LV2_PATH    = pkgs.lib.makeSearchPath "lib/lv2" plugins;
     LXVST_PATH  = pkgs.lib.makeSearchPath "lib/lxvst" plugins;
     VST_PATH    = pkgs.lib.makeSearchPath "lib/vst" plugins;

modules/music/player.nix

@@ -1,7 +1,30 @@
+{ pkgs, ... }:
+
 {
   home-manager.users.kanashimia = { config, ... }: {
-    programs.ncmpcpp.enable = true;
-    services.mpd.enable = true;
-    services.mpd.musicDirectory = "${config.home.homeDirectory}/Music";
+    programs.ncmpcpp = {
+      enable = true;
+      package = pkgs.ncmpcpp.override { visualizerSupport = true; };
+      settings = {
+        visualizer_color = "blue";
+      };
+    };
+    services.mpd = {
+      network.startWhenNeeded = true;
+      enable = true;
+      musicDirectory = "${config.home.homeDirectory}/Music";
+      extraConfig = ''
+        audio_output {
+          type "pulse"
+          name "pulse audio"
+        }
+        audio_output {
+          type   "fifo"
+          name   "visualizer_fifo"
+          path   "/tmp/mpd.fifo"
+          format "44100:16:2"
+        }
+      '';
+    };
   };
 }

modules/input.nix → modules/system/input.nix

@@ -23,18 +23,18 @@
   # Layout config.
   services.xserver = {
     xkbOptions = "caps:swapescape,grp:rctrl_rshift_toggle,compose:menu,grp_led:num";
-    layout = "us(dvorak),us,ru,ua";
+    layout = "us(dvorak),ru,ua";
   };
 
-  i18n.inputMethod.enabled = "fcitx5";
-  i18n.inputMethod.fcitx5.addons = with pkgs; [
-    fcitx5-mozc fcitx5-m17n fcitx5-table-other fcitx5-table-extra
-  ];
-  i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [
-    mozc m17n table table-others
-  ];
-  services.xserver.displayManager.sessionCommands = "${config.i18n.inputMethod.package}/bin/fcitx5 -d";
-  #services.xserver.displayManager.sessionCommands = "${pkgs.ibus}/bin/ibus-daemon -drx";
+  # i18n.inputMethod.enabled = "fcitx5";
+  # i18n.inputMethod.fcitx5.addons = with pkgs; [
+  #   fcitx5-mozc fcitx5-m17n fcitx5-table-other fcitx5-table-extra
+  # ];
+  # i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [
+  #   mozc m17n table table-others
+  # ];
+  # services.xserver.displayManager.sessionCommands = "${config.i18n.inputMethod.package}/bin/fcitx5 -d";
+  # services.xserver.displayManager.sessionCommands = "${pkgs.ibus}/bin/ibus-daemon -drx";
 
   # Use same layout for console. 
   console.useXkbConfig = true;

modules/nix.nix → modules/system/nix.nix

@@ -1,14 +1,10 @@
 { pkgs, inputs, ... }:
 
 {
-  # Enable flake and profile support.
+  # Enable flake support.
   nix.package = pkgs.nixFlakes;
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes ca-references
-  '';
 
-  # Use same nixpkgs systemwide.
-  nix.registry.nixpkgs.flake = inputs.nixpkgs;
+  # Use n as an alias to the current configs nixpkgs.
   nix.registry.n.flake = inputs.nixpkgs;
 
   # Hardlink identical files in nix store.

modules/terminals/st/config.h

@@ -19,7 +19,7 @@ static int borderpx = 2;
 static char *shell = "/bin/sh";
 char *utmp = NULL;
 /* scroll program: to enable use a string like "scroll" */
-char *scroll = "@scroll@";
+char *scroll = NULL;
 char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
 
 /* identification sequence returned in DA and DECID */

modules/utils.nix → modules/tools/utils.nix

@@ -17,6 +17,7 @@
     linuxPackages.perf
 
     pciutils
+    usbutils
     inxi
     neofetch
     htop

modules/users/default.nix

@@ -14,6 +14,7 @@
       "jackaudio"
       "docker"
       "adbusers"
+      "dialout"
     ];
     initialHashedPassword = pkgs.lib.fileContents ./password;
   };

modules/window-managers/dwl/config.h

@@ -0,0 +1,119 @@
+/* appearance */
+static const int sloppyfocus        = 1;  /* focus follows mouse */
+static const unsigned int borderpx  = 1;  /* border pixel of windows */
+static const float rootcolor[]      = {0.3, 0.3, 0.3, 1.0};
+static const float bordercolor[]    = {0.5, 0.5, 0.5, 1.0};
+static const float focuscolor[]     = {0.7, 0.3, 1.0, 1.0};
+
+/* tagging */
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+static const Rule rules[] = {
+	/* app_id     title       tags mask     isfloating   monitor */
+	/* examples:
+	{ "Gimp",     NULL,       0,            1,           -1 },
+	{ "firefox",  NULL,       1 << 8,       0,           -1 },
+	*/
+};
+
+/* layout(s) */
+static const Layout layouts[] = {
+	/* symbol arrange function */
+	{ "[]=",  tile },
+	{ "><>",  NULL },    /* no layout function means floating behavior */
+	{ "[M]",  monocle },
+};
+
+/* monitors
+ * The order in which monitors are defined determines their position.
+ * Non-configured monitors are always added to the left. */
+static const MonitorRule monrules[] = {
+	/* name       mfact nmaster scale layout       rotate/reflect x y */
+	/* example of a HiDPI laptop monitor:
+	{ "eDP-1",    0.5,  1,      2,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0 },
+	*/
+	/* defaults */
+	{ NULL, 0.50, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0 },
+};
+
+/* keyboard */
+static const struct xkb_rule_names xkb_rules = {
+	/* can specify fields: rules, model, layout, variant, options */
+	.layout = "us",
+	.variant = "dvorak",
+	.options = "caps:swapescape"
+};
+
+static const int repeat_rate = 30;
+static const int repeat_delay = 300;
+
+/* Trackpad */
+static const int tap_to_click = 1;
+static const int natural_scrolling = 0;
+
+#define MODKEY WLR_MODIFIER_LOGO
+#define TAGKEYS(KEY,SKEY,TAG) \
+	{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
+	{ MODKEY | WLR_MODIFIER_CTRL,  KEY,  toggleview, {.ui = 1 << TAG} }, \
+	{ MODKEY | WLR_MODIFIER_SHIFT, SKEY, tag,        {.ui = 1 << TAG} }, \
+	{ MODKEY | WLR_MODIFIER_CTRL | WLR_MODIFIER_SHIFT, SKEY, toggletag, {.ui = 1 << TAG} }
+
+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
+
+/* commands */
+static const char *termcmd[] = { "foot", NULL };
+static const char *menucmd[] = { "bemenu-run", NULL };
+
+static const Key keys[] = {
+	/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
+	/* modifier, key, function, argument */
+	{ MODKEY, XKB_KEY_p,      spawn,            {.v = menucmd} },
+	{ MODKEY, XKB_KEY_j,      focusstack,       {.i = +1} },
+	{ MODKEY, XKB_KEY_k,      focusstack,       {.i = -1} },
+	{ MODKEY, XKB_KEY_i,      incnmaster,       {.i = +1} },
+	{ MODKEY, XKB_KEY_d,      incnmaster,       {.i = -1} },
+	{ MODKEY, XKB_KEY_h,      setmfact,         {.f = -0.05} },
+	{ MODKEY, XKB_KEY_l,      setmfact,         {.f = +0.05} },
+	{ MODKEY, XKB_KEY_Return, zoom,             {0} },
+	{ MODKEY, XKB_KEY_Tab,    view,             {0} },
+	{ MODKEY, XKB_KEY_t,      setlayout,        {.v = &layouts[0]} },
+	{ MODKEY, XKB_KEY_f,      setlayout,        {.v = &layouts[1]} },
+	{ MODKEY, XKB_KEY_m,      setlayout,        {.v = &layouts[2]} },
+	{ MODKEY, XKB_KEY_space,  setlayout,        {0} },
+	{ MODKEY, XKB_KEY_e,      togglefullscreen, {0} },
+	{ MODKEY, XKB_KEY_0,      view,             {.ui = ~0} },
+	{ MODKEY, XKB_KEY_comma,  focusmon,         {.i = WLR_DIRECTION_LEFT} },
+	{ MODKEY, XKB_KEY_period, focusmon,         {.i = WLR_DIRECTION_RIGHT} },
+
+	{ MODKEY | WLR_MODIFIER_SHIFT, XKB_KEY_Return,     spawn,          {.v = termcmd} },
+	{ MODKEY | WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
+	{ MODKEY | WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag,            {.ui = ~0} },
+	{ MODKEY | WLR_MODIFIER_SHIFT, XKB_KEY_C,          killclient,     {0} },
+	{ MODKEY | WLR_MODIFIER_SHIFT, XKB_KEY_less,       tagmon,         {.i = WLR_DIRECTION_LEFT} },
+	{ MODKEY | WLR_MODIFIER_SHIFT, XKB_KEY_greater,    tagmon,         {.i = WLR_DIRECTION_RIGHT} },
+
+	TAGKEYS ( XKB_KEY_1, XKB_KEY_exclam,     0 ),
+	TAGKEYS ( XKB_KEY_2, XKB_KEY_at,         1 ),
+	TAGKEYS ( XKB_KEY_3, XKB_KEY_numbersign, 2 ),
+	TAGKEYS ( XKB_KEY_4, XKB_KEY_dollar,     3 ),
+	TAGKEYS ( XKB_KEY_5, XKB_KEY_percent,    4 ),
+	TAGKEYS ( XKB_KEY_6, XKB_KEY_caret,      5 ),
+	TAGKEYS ( XKB_KEY_7, XKB_KEY_ampersand,  6 ),
+	TAGKEYS ( XKB_KEY_8, XKB_KEY_asterisk,   7 ),
+	TAGKEYS ( XKB_KEY_9, XKB_KEY_parenleft,  8 ),
+
+	{ MODKEY | WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} },
+
+	/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
+	{ WLR_MODIFIER_CTRL | WLR_MODIFIER_ALT, XKB_KEY_Terminate_Server, quit, {0} },
+#define CHVT(n) { WLR_MODIFIER_CTRL | WLR_MODIFIER_ALT, XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
+	CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
+	CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
+};
+
+static const Button buttons[] = {
+	{ MODKEY, BTN_LEFT,   moveresize,     {.ui = CurMove} },
+	{ MODKEY, BTN_MIDDLE, togglefloating, {0} },
+	{ MODKEY, BTN_RIGHT,  moveresize,     {.ui = CurResize} },
+};

modules/window-managers/dwl/default.nix

@@ -1,5 +1,13 @@
 { pkgs, ...}:
 
+let
+dwlPackage = pkgs.dwl.override {
+  conf = ./config.h;
+};
+in
 {
-  environment.systemPackages = with pkgs; [ dwl ];
+  environment.systemPackages = with pkgs; [ foot dwlPackage river ];
+  # services.xserver.displayManager.sessionPackages = [ dwlPackage ];
+  programs.xwayland.enable = true;
+  hardware.opengl.enable = true;
 }