Refactor, mumble domain change, sway changes

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "config/private"]
-	path = config/private
+	path = private
 	url = "gcrypt::git@github.com:kittywitch/nixfiles-private#main"
 	branch = main

config/profiles/common/nixos/secrets.nix

@@ -1,9 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  secrets = {
-    root = "/var/lib/kat/secrets";
-    persistentRoot = "/var/lib/kat/secrets";
-    external = true;
-  };
-}

home.nix

@@ -7,6 +7,6 @@ let
 in {
 
   imports = lib.attrValues homeModules
-    ++ [ ../modules/home ./private/profile/home ];
+    ++ [ ./modules/home ./private/profile/home ];
 }
 

hosts/athame/home/default.nix

@@ -0,0 +1 @@
+{ ... }: { }

hosts/athame/nixos/default.nix

@@ -2,22 +2,22 @@
 
 {
   imports = [
-    ./hardware.nix
+    ./hw.nix
     # host-specific services 
     ./postgres.nix
     ./virtualhosts.nix
     ./fail2ban.nix
     # services 
-    ../../services/nginx.nix
+    ../../../services/nginx.nix
-    ../../services/mail.nix
+    ../../../services/mail.nix
-    ../../services/asterisk.nix
+    ../../../services/asterisk.nix
-    ../../services/gitea.nix
+    ../../../services/gitea.nix
-    ../../services/syncplay.nix
+    ../../../services/syncplay.nix
-    ../../services/bitwarden.nix
+    ../../../services/bitwarden.nix
-    ../../services/taskserver.nix
+    ../../../services/taskserver.nix
-    ../../services/murmur.nix
+    ../../../services/murmur.nix
-    ../../services/znc.nix
+    ../../../services/znc.nix
-    ../../services/matrix.nix
+    ../../../services/matrix.nix
   ];
 
   deploy.profiles = [ "kat" ];

hosts/boline/home/default.nix

@@ -0,0 +1 @@
+{ ... }: { }

hosts/boline/nixos/default.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./hardware.nix ../../services/nginx.nix ];
+  imports = [ ./hw.nix ../../../services/nginx.nix ];
 
   deploy.profiles = [ "kat" ];
   deploy.ssh.host = "boline.kittywit.ch";

hosts/samhain/home/default.nix

@@ -0,0 +1 @@
+{ ... }: { }

hosts/samhain/nixos/default.nix

@@ -2,9 +2,9 @@
 
 {
   imports = [
-    ./hardware.nix
+    ./hw.nix
-    ../../services/zfs.nix
+    ../../../services/zfs.nix
-    ../../services/nginx.nix
+    ../../../services/nginx.nix
     ./thermal
     ./vm
     ./torrenting.nix

hosts/yule/home/default.nix

@@ -0,0 +1 @@
+{ ... }: { }

hosts/yule/nixos/default.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./hardware.nix ../../services/zfs.nix ];
+  imports = [ ./hw.nix ../../../services/zfs.nix ];
 
   deploy.profiles = [ "gui" "sway" "kat" "laptop" "private" ];
   deploy.groups = [ "gui" ];

lib/hosts.nix

@@ -1,5 +1,5 @@
-{ pkgs, hostsDir ? ../config/hosts, privateHostsDir ? ../config/private/hosts
+{ pkgs, hostsDir ? ../hosts, privateHostsDir ? ../private/hosts
-, commonImports ? [ ../config/nixos.nix ../modules/nixos ], pkgsPath ? ../pkgs
+, commonImports ? [ ../nixos.nix ../modules/nixos ], pkgsPath ? ../pkgs
 , sources ? { }, witch ? { } }:
 
 with pkgs.lib;
@@ -12,8 +12,8 @@ rec {
     { config, ... }: {
       _module.args = { inherit hosts groups; };
       imports = [
-        (import (hostsDir + "/${hostName}/configuration.nix"))
+        (import (hostsDir + "/${hostName}/nixos"))
-        (import (privateHostsDir + "/${hostName}/configuration.nix"))
+        (import (privateHostsDir + "/${hostName}/nixos"))
         ../modules/nixos/deploy
       ] ++ commonImports;
       networking = { inherit hostName; };
@@ -32,7 +32,7 @@ rec {
         else
           { })
       ];
-      specialArgs = { inherit sources witch; };
+      specialArgs = { inherit sources witch hostName; };
     })) hostNames);
 
   groupNames = unique (concatLists

nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": "https://nur.nix-community.org/",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d2b3d9cc84099b9b23bf54f0bbb44371fe5d70f0",
+        "rev": "79226020063ce21ade4c192cf0c6b7da8b4e7c70",
-        "sha256": "00849mfq5yjxsb4fbcvs3i92qbivmrybm80wd18yq6gv1nvhl1wg",
+        "sha256": "10xvmbm24pgl3276n34qx8217423bv5a2wha2r2wbrfbvl5m8q89",
         "type": "tarball",
-        "url": "https://github.com/nix-community/NUR/archive/d2b3d9cc84099b9b23bf54f0bbb44371fe5d70f0.tar.gz",
+        "url": "https://github.com/nix-community/NUR/archive/79226020063ce21ade4c192cf0c6b7da8b4e7c70.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "arc-nixexprs": {
@@ -98,10 +98,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f17621f6881f07283e66cc478fce5dff6b4e1c72",
+        "rev": "070bfc96b7446e7d2653a1913b9bc4082d529638",
-        "sha256": "0fkzlhqy6d5ss7dw7rca39zh137i5vjbwq438m14wdm7wxjazbly",
+        "sha256": "0kwbbsqi1vlm65a14p100vffyrjprbwgr6wpcs5yhg68gxsds30v",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/f17621f6881f07283e66cc478fce5dff6b4e1c72.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/070bfc96b7446e7d2653a1913b9bc4082d529638.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "pbb-nixfiles": {

nixos.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, sources, witch, options, ... }:
+{ pkgs, config, lib, sources, witch, options, hostName, ... }:
 
 let
   nixosModules = witch.modList {
@@ -13,7 +13,7 @@ in {
     type = lib.types.attrsOf (lib.types.submoduleWith {
       modules = [ ];
       specialArgs = {
-        inherit sources witch;
+        inherit sources witch hostName;
         superConfig = config;
         modulesPath = sources.home-manager + "/modules";
       };
@@ -28,7 +28,7 @@ in {
 
       users = {
         kat = {
-          imports = [ ./home.nix ];
+          imports = [ ./home.nix (import (./hosts + "/${hostName}/home")) ];
 
           deploy.profile = lib.mkMerge (map (prof: {
             ${if options ? deploy.profile.${prof} then prof else null} = true;

pkgs/default.nix

@@ -7,7 +7,6 @@ let
       inherit (super) dino;
     };
 
-
     discord = unstable.discord.override { nss = self.nss_latest; };
 
     lib = super.lib.extend

profiles/gui/home/email.nix

@@ -18,7 +18,7 @@
         passwordCommand = ''
           ${pkgs.arc.pkgs.rbw-bitw}/bin/bitw -p gpg://${
             ../../../private/files/bitw/master.gpg
-          } get "kittywitch email"'';
+          } get "email/kittywitch"'';
         msmtp.enable = true;
         mbsync.enable = true;
         mbsync.create = "maildir";

profiles/gui/home/weechat.nix

@@ -48,7 +48,7 @@
             passphrase_command = ''
               ${pkgs.rbw-bitw}/bin/bitw -p gpg://${
                 ../../../private/files/bitw/master.gpg
-              } get "weechat"'';
+              } get "comms/weechat"'';
             hash_algo = "sha512";
           };
         };
@@ -78,7 +78,10 @@
             autoreconnect_delay_max = 5;
             lag_min-show = 1000;
           };
-          look = { server_buffer = "independent"; };
+          look = {
+            server_buffer = "independent";
+            redactions = "notice";
+          };
           server.kat = {
             address = "kittywit.ch";
             device_name = "${superConfig.networking.hostName}/weechat";

profiles/kat/home/vim/default.nix

@@ -18,6 +18,8 @@
         coc-git
         vim-fugitive
         vim-startify
+        vim-airline
+        vim-airline-themes
         base16-vim
       ];
       #extraPackages = with pkgs;

profiles/kat/home/vim/vimrc.nix

@@ -9,6 +9,9 @@
   "colorscheme base16-rebecca
   colorscheme default
 
+  " tabline
+  let g:airline#extensions#tabline#enabled = 1
+
   " notmuch! 
   let g:notmuch_config_file='${config.xdg.configHome}/notmuch/notmuchrc'
   let g:notmuch_folders_count_threads=0

profiles/sway/home/sway.nix

@@ -26,6 +26,7 @@
         exec env --unset=SHLVL systemd-cat -t sway -- sway
       fi
     '';
+
     wayland.windowManager.sway = {
       enable = true;
       config = let
@@ -86,6 +87,7 @@
           "${pkgs.j4-dmenu-desktop}/bin/j4-dmenu-desktop --dmenu=\"${dmenu}\" --term='${cfg.terminal}'";
         modifier = "Mod4";
 
+        assigns = { "2" = [{ class = "screenstub"; }]; };
         startup = [
           {
             command = "systemctl --user restart mako";
@@ -223,6 +225,9 @@
       wrapperFeatures.gtk = true;
       extraConfig = ''
         seat seat0 xcursor_theme breeze_cursors 20
+        workspace "1" output "DP-1"
+        workspace "2" output "DVI-D-1"
+        workspace "3" output "HDMI-A-1"
       '';
     };
   };