a lot of shuffling things around

flake.nix

@@ -7,6 +7,5 @@
     deploy-rs.url = "github:serokell/deploy-rs";
   };
 
-
   outputs = { ... }@inputs: import ./outputs.nix inputs;
 }

home/base/zsh.nix

@@ -1,7 +1,7 @@
 { ... }: {
   programs.zsh = {
     enable = true;
-    ohMyZsh = {
+    oh-my-zsh = {
       enable = true;
       theme = "afowler";
       plugins = [ ];

home/dev/archives.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
+  home.packages = with pkgs; [
     zip
     unzip
     p7zip

home/dev/git.nix

@@ -4,10 +4,6 @@
     package = pkgs.gitAndTools.gitFull;
     userName = "ChaotiCryptidz";
     userEmail = "chaoticryptidz@owo.monster";
-    extraConfig = {
+    extraConfig = { credential = { helper = "store"; }; };
-      credential = {
-        helper = "store";
-      };
-    };
   };
 }

home/gaming/gaming.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, ... }: {
+  home.packages = with pkgs; [
+    steam
+    lutris
+    mgba
+    nestopia
+    snes9x-gtk
+    melonDS
+    sixpair
+    xboxdrv
+  ];
+}

home/programming/code.nix

@@ -3,12 +3,6 @@
 {
   programs.vscode = {
     enable = true;
-    extensions = with pkgs; [
-      vscode-extensions.bbenoist.nix
-      vscode-extensions.brettm12345.nixfmt-vscode
-      vscode-extensions.tiehuis.zig
-      vscode-extensions.golang.go
-    ];
     userSettings = {
       "window.zoomLevel" = -1;
       "editor.fontSize" = 24;
@@ -19,7 +13,6 @@
       "markdown.preview.fontFamily" = "'Comic Code'";
       "terminal.integrated.fontFamily" = "'Comic Code'";
       "files.autoSave" = "afterDelay";
-      "[nix]" = { "editor.defaultFormatter" = "brettm12345.nixfmt-vscode"; };
     };
   };
 }

home/programming/languages/go/go.nix

@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ go gopls go-outline goimports ];
+  programs.vscode.extensions = with pkgs; [ vscode-extensions.golang.go ];
+}

home/programming/languages/nix/nix.nix

@@ -0,0 +1,14 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ nixfmt ];
+
+  programs.vscode.extensions = with pkgs; [
+    vscode-extensions.bbenoist.nix
+    vscode-extensions.brettm12345.nixfmt-vscode
+  ];
+
+  programs.vscode.userSettings."[nix]" = {
+    "editor.defaultFormatter" = "brettm12345.nixfmt-vscode";
+  };
+}

home/programming/languages/zig/zig.nix

@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ zig zls ];
+  programs.vscode.extensions = with pkgs; [ vscode-extensions.tiehuis.zig ];
+}

home/reversing/reversing.nix

@@ -1,9 +1,8 @@
 { pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
+  home.packages = with pkgs; [
     binwalk
     file
     binutils # strings
     diffoscope
   ];
-
 }

home/sway/sway.nix

@@ -35,20 +35,12 @@
         GPG_TTY \
         NIX_PATH \
         SHLVL
-      systemctl --user import-environment
-      #exec systemctl --user start sway.service
       exec env --unset=SHLVL systemd-cat -t sway -- sway
       fi
   '';
 
-    
   programs.waybar = {
     enable = true;
-      #       style = ''
-      #         * {
-      #           font-family: Iosevka;
-      #         }
-      #       '';
     settings = [{
       position = "bottom";
 
@@ -62,16 +54,11 @@ programs.waybar = {
     enable = true;
     wrapperFeatures.base = true;
     wrapperFeatures.gtk = true;
-    config =
+    config = let
-      let
       terminal = "${pkgs.kitty}/bin/kitty";
       menu = "${pkgs.wofi}/bin/wofi -idbt ${pkgs.kitty}/bin/kitty -p '' -W 25%";
       cfg = config.wayland.windowManager.sway.config;
-      in
+    in {
-      {
-
-
-
       bars = [
         {
           position = "top";
@@ -86,16 +73,10 @@ programs.waybar = {
           ];
 
         }
-          { 
+        { command = "${pkgs.waybar}/bin/waybar"; }
-            command = "${pkgs.waybar}/bin/waybar";
-          }
       ];
 
-        input = {
+      input = { "*" = { xkb_layout = "gb"; }; };
-          "*" = {
-            xkb_layout = "gb";
-          };
-        };
 
       fonts = {
         names = [ "Comic Code" ];
@@ -107,15 +88,17 @@ programs.waybar = {
 
       startup = [
         # gets blueman applet working for some reason
-          { command = "dbus-update-activation-environment DISPLAY"; always = true; }
+        {
-          { command = "nm-applet"; always = true; }
+          command = "dbus-update-activation-environment DISPLAY";
+          always = true;
+        }
+        {
+          command = "nm-applet";
+          always = true;
+        }
       ];
 
-        seat = {
+      seat = { "*" = { "xcursor_theme" = "Adwaita 24"; }; };
-          "*" = {
-            "xcursor_theme" = "Adwaita 24";
-          };
-        };
 
       gaps = {
         top = 10;
@@ -148,14 +131,20 @@ programs.waybar = {
         "${cfg.modifier}+Shift+space" = "floating toggle";
         "${cfg.modifier}+space" = "focus mode_toggle";
 
-          "XF86AudioRaiseVolume" = "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') +5%";
+        "XF86AudioRaiseVolume" =
-          "XF86AudioLowerVolume" = "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') -5%";
+          "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') +5%";
-          "XF86AudioMute" = "exec pactl set-sink-mute $(pacmd list-sinks |awk '/* index:/{print $3}') toggle";
+        "XF86AudioLowerVolume" =
-          "XF86AudioMicMute" = "exec pactl set-source-mute $(pacmd list-sources |awk '/* index:/{print $3}') toggle";
+          "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') -5%";
+        "XF86AudioMute" =
+          "exec pactl set-sink-mute $(pacmd list-sinks |awk '/* index:/{print $3}') toggle";
+        "XF86AudioMicMute" =
+          "exec pactl set-source-mute $(pacmd list-sources |awk '/* index:/{print $3}') toggle";
         "XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 5";
         "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 5";
-          "Print" = "exec ${pkgs.grim}/bin/grim -t png - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png";
+        "Print" =
-          "Shift+Print" = "exec ${pkgs.grim}/bin/grim -t png -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png";
+          "exec ${pkgs.grim}/bin/grim -t png - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png";
+        "Shift+Print" = ''
+          exec ${pkgs.grim}/bin/grim -t png -g "$(${pkgs.slurp}/bin/slurp -d)" - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png'';
 
         "${cfg.modifier}+d" = "exec ${cfg.menu}";
         "${cfg.modifier}+f" = "fullscreen";
@@ -164,14 +153,12 @@ programs.waybar = {
         "${cfg.modifier}+Shift+c" = "reload";
 
         "${cfg.modifier}+r" = "mode resize";
-        } // (lib.foldl lib.recursiveUpdate { } (map
+      } // (lib.foldl lib.recursiveUpdate { } (map (workspace: {
-          (workspace: {
         "${cfg.modifier}+${workspace}" = "workspace ${workspace}";
-            "${cfg.modifier}+Shift+${workspace}" = "move container to workspace ${workspace}";
+        "${cfg.modifier}+Shift+${workspace}" =
+          "move container to workspace ${workspace}";
       }) [ "1" "2" "3" "4" "5" "6" "7" "8" "9" ]));
     };
   };
 }
 
-
-

hosts/default.nix

@@ -1,21 +1,16 @@
 { home-manager, nixpkgs, tree, ... }@inputs:
 let
-  defaultModules = [
+  defaultModules =
-    home-manager.nixosModules.home-manager
+    [ home-manager.nixosModules.home-manager tree.impure.profiles.base ];
-    tree.impure.profiles.base
-  ];
   defaultSpecialArgs = {
     tree = tree.impure;
     pureTree = tree.pure;
     inherit inputs;
   };
-in
+in {
-{
   lappy = nixpkgs.lib.nixosSystem {
     specialArgs = defaultSpecialArgs;
     system = "x86_64-linux";
-    modules = defaultModules ++ [
+    modules = defaultModules ++ [ ./lappy.nix ];
-      ./lappy.nix
-    ];
   };
 }

hosts/lappy.nix

@@ -15,18 +15,23 @@
     profiles.gaming
   ];
 
+  config.home-manager.users.root = { imports = with tree; [ home.base ]; };
+
   config.home-manager.users.chaoticryptidz = {
     imports = with tree; [
+      home.base
       home.gui
-      home.dev
+      home.gaming
       home.dev
       home.network_manager
       home.sway
-      home.vscode
+      home.reversing
+      home.programming
+      home.programming.languages.go
+      home.programming.languages.nix
     ];
   };
 
-
   config.networking.hostName = "lappy";
   config.time.timeZone = "Europe/London";
   config.powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
@@ -36,7 +41,8 @@
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
     };
-    initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+    initrd.availableKernelModules =
+      [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
     kernelModules = [ "kvm-intel" ];
   };
 

outputs.nix

@@ -8,10 +8,10 @@ let
       "profiles/*".functor.enable = true;
       "users/*".functor.enable = true;
       "home/*".functor.enable = true;
+      "home/programming/languages/*".functor.enable = true;
     };
   };
-in
+in {
-{
   legacyPackages.tree = tree;
   nixosConfigurations = import ./hosts {
     nixosSystem = nixpkgs.lib.nixosSystem;

overlay/comic-code/default.nix

@@ -1,7 +1,9 @@
-{ fetchzip }: fetchzip {
+{ fetchzip }:
+fetchzip {
   name = "comic-code-1.0";
 
-  url = "https://cdn.discordapp.com/attachments/780878889924165652/919700644347142214/COCOD.ZIP";
+  url =
+    "https://cdn.discordapp.com/attachments/780878889924165652/919700644347142214/COCOD.ZIP";
   sha256 = "sha256-MzEkMAopjpQBk24nRVDAtGNeF6f61XGww4rya2cU8TU=";
 
   postFetch = ''

overlay/gobar/default.nix

@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitLab, buildGoModule, lib, go }: buildGoModule rec {
+{ stdenv, fetchFromGitLab, buildGoModule, lib, go }:
+buildGoModule rec {
   pname = "gobar";
   version = "latest-1";
 

overlay/zar/default.nix

@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitLab, lib, zig }: stdenv.mkDerivation rec {
+{ stdenv, fetchFromGitLab, lib, zig }:
+stdenv.mkDerivation rec {
   pname = "zar";
   version = "latest-1";
 

profiles/base/access.nix

@@ -1,8 +1,4 @@
 { tree, config, lib, pkgs, ... }: {
   users.defaultUserShell = pkgs.zsh;
   security.sudo.wheelNeedsPassword = lib.mkForce false;
-
-  imports = with tree; [
-    home.base
-  ];
 }

profiles/base/home.nix

@@ -1,4 +1,5 @@
-{ inputs, tree, config, lib, ... }: with lib; {
+{ inputs, tree, config, lib, ... }:
+with lib; {
   options.home-manager.users = mkOption {
     type = types.attrsOf (types.submoduleWith {
       modules = [ ];

profiles/base/nix.nix

@@ -1,19 +1,14 @@
 { inputs, config, lib, ... }: {
   nix = {
-    nixPath = [
+    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
-      "nixpkgs=${inputs.nixpkgs}"
+    extraOptions = lib.optionalString
-    ];
+      (lib.versionAtLeast config.nix.package.version "2.4") ''
-    extraOptions = lib.optionalString (lib.versionAtLeast config.nix.package.version "2.4") ''
         experimental-features = nix-command flakes
       '';
     trustedUsers = [ "root" "@wheel" ];
   };
   nixpkgs = {
-    config = {
+    config = { allowUnfree = true; };
-      allowUnfree = true;
+    overlays = [ (import ../../overlay) ];
-    };
-    overlays = [
-      (import ../../overlay)
-    ];
   };
 }

profiles/base/programs.nix

@@ -1,3 +1 @@
-{ config, ... }: {
+{ config, ... }: { programs.mtr.enable = true; }
-  programs.mtr.enable = true;
-}

profiles/base/services.nix

@@ -1,4 +1,2 @@
-{ config, ... }: {
+{ config, ... }: { services.localtime.enable = true; }
-  services.localtime.enable = true;
-}
 

profiles/dev/debugging.nix

@@ -1,6 +1 @@
-{ pkgs, ... }: {
+{ pkgs, ... }: { environment.systemPackages = with pkgs; [ gdb lldb ]; }
-  environment.systemPackages = with pkgs; [
-    gdb
-    lldb
-  ];
-}

profiles/dev/editors.nix

@@ -1,5 +1 @@
-{ pkgs, ... }: {
+{ pkgs, ... }: { environment.systemPackages = with pkgs; [ nano ]; }
-  environment.systemPackages = with pkgs; [
-    nano
-  ];
-}

profiles/dev/extra.nix

@@ -1,10 +1,3 @@
 { pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ jq ripgrep fd pv tmux socat ];
-    jq
-    ripgrep
-    fd
-    pv
-    tmux
-    socat
-  ];
 }

profiles/dev/info.nix

@@ -1,7 +1,3 @@
 { pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ neofetch inxi htop ];
-    neofetch
-    inxi
-    htop
-  ];
 }

profiles/dev/programming.nix

@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    # Nix
-    nixfmt
-    # Go
-    go
-    gopls
-    go-outline
-    goimports
-    # Zig
-    zig 
-    zls
-  ];
-}

profiles/dev/vcs.nix

@@ -1,7 +1,3 @@
 { pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ git darcs subversion ];
-    git
-    darcs
-    subversion
-  ];
 }

profiles/gaming/gaming.nix

@@ -1,13 +1,3 @@
 { pkgs, ... }: {
   programs.steam.enable = true;
-  environment.systemPackages = with pkgs; [
-    steam
-    lutris
-    mgba
-    nestopia
-    snes9x-gtk
-    melonDS
-    sixpair
-    xboxdrv
-  ];
 }

profiles/gui/default.nix

@@ -1,8 +1,5 @@
 { config, pkgs, ... }: {
-  fonts.fonts = with pkgs; [
+  fonts.fonts = with pkgs; [ comic-neue comic-code ];
-    comic-neue
-    comic-code
-  ];
 
   environment.systemPackages = with pkgs; [
     tdesktop

profiles/network_manager/nm.nix

@@ -2,9 +2,7 @@
   networking = {
     networkmanager = {
       enable = true;
-      connectionConfig = {
+      connectionConfig = { "ipv6.ip6-privacy" = lib.mkForce 0; };
-        "ipv6.ip6-privacy" = lib.mkForce 0;
-      };
     };
   };
   programs.nm-applet.enable = true;

profiles/pulse/default.nix

@@ -6,11 +6,7 @@
     support32Bit = true;
     extraModules = with pkgs; [ pkgs.pulseaudio-modules-bt ];
     package = pkgs.pulseaudioFull;
-    extraConfig = "
+    extraConfig = "\n      load-module module-switch-on-connect\n    ";
-      load-module module-switch-on-connect
-    ";
   };
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ pavucontrol ];
-    pavucontrol
-  ];
 }

profiles/sway/sway.nix

@@ -2,6 +2,6 @@
   programs.sway.enable = true;
   programs.xwayland.enable = true;
   services.xserver.enable = true;
-  systemd.services.display-manager.enable = true;
+  #systemd.services.display-manager.enable = true;
-  services.xserver.displayManager.sddm.enable = true;
+  #services.xserver.displayManager.sddm.enable = true;
 }

tree.nix

@@ -1,4 +1,7 @@
-{ lib }: { config, folder, inputs, ... }@args: with lib; let
+{ lib }:
+{ config, folder, inputs, ... }@args:
+with lib;
+let
   # Made by kat witch (kittywitch)
   pureTreeGrab = { base, path }:
     let
@@ -9,40 +12,37 @@
       isDir = entry: _: (isDirectory entry) && !(isHidden entry);
       directories = filterAttrs isDir dirContents;
       isNixFile = entry: _:
-        let
+        let result = builtins.match "(.*)\\.nix" entry;
-          result = builtins.match "(.*)\\.nix" entry;
+        in result != null && builtins.length result > 0;
-        in
-        result != null && builtins.length result > 0;
       nixFiles = filterAttrs isNixFile dirContents;
       getPath = entry: "${realPath}/${entry}";
-      getPaths = entries: mapAttrs'
+      getPaths = entries:
-        (n: v:
+        mapAttrs' (n: v: nameValuePair (removeSuffix ".nix" n) (getPath n))
-          nameValuePair (removeSuffix ".nix" n) (getPath n)
-        )
         entries;
       nixFilePaths = getPaths nixFiles;
       dirPaths = getPaths directories;
-      recursedPaths = mapAttrs
+      recursedPaths = mapAttrs (_: fullPath:
-        (_: fullPath: pureTreeGrab {
+        pureTreeGrab {
           inherit base;
           path = fullPath;
-        })
+        }) dirPaths;
-        dirPaths;
       contents = recursedPaths // nixFilePaths;
-    in
+    in contents;
-    contents;
   configTreeStruct = { config, ... }: {
     options.treeConfig = mkOption {
-      type = with types; attrsOf (submodule ({ name, options, config, ... }: {
+      type = with types;
+        attrsOf (submodule ({ name, options, config, ... }: {
           options = {
             evaluateDefault = mkOption {
               type = types.bool;
-            description = "Replace the contents of this branch or leaf with those provided by the evaluation of default.nix.";
+              description =
+                "Replace the contents of this branch or leaf with those provided by the evaluation of default.nix.";
               default = false;
             };
             aliasDefault = mkOption {
               type = types.bool;
-            description = "Replace the contents of this branch or leaf with the default.nix.";
+              description =
+                "Replace the contents of this branch or leaf with the default.nix.";
               default = false;
             };
             excludes = mkOption {
@@ -70,51 +70,48 @@
           };
         }));
     };
-    config.treeConfig = {
+    config.treeConfig = { "*" = { }; };
-      "*" = { };
-    };
   };
   configTree.treeConfig = config;
   configTreeModule = (evalModules {
-    modules = [
+    modules = [ configTreeStruct configTree ];
-      configTreeStruct
-      configTree
-    ];
   }).config.treeConfig;
   mapAttrsRecursive = f: set:
     let
       recurse = path: set:
         let
           g = name: value:
-            if isAttrs value
+            if isAttrs value then
-            then f (path ++ [ name ]) (recurse (path ++ [ name ]) value)
+              f (path ++ [ name ]) (recurse (path ++ [ name ]) value)
-            else f (path ++ [ name ]) value;
+            else
-        in
+              f (path ++ [ name ]) value;
-        mapAttrs g set;
+        in mapAttrs g set;
-    in
+    in recurse [ ] set;
-    recurse [ ] set;
   getPathString = path: concatStringsSep "/" path;
   getConfig = path: default: configTreeModule.${getPathString path} or default;
   revtail = path: sublist 0 (length path - 1) path;
   getConfigRecursive = path:
-    let
+    let parentPath = revtail path;
-      parentPath = revtail path;
+    in getConfig (path ++ singleton "*") (getConfigRecursive parentPath);
-    in
+  processLeaves = tree: config:
-    getConfig (path ++ singleton "*") (getConfigRecursive parentPath);
+    mapAttrsRecursive (path: value:
-  processLeaves = tree: config: mapAttrsRecursive
-    (path: value:
       let
         pathString = getPathString path;
         leafConfig = getConfig path (getConfigRecursive (revtail path));
         processConfig = path: value:
           let
-            processFunctor = prev: prev // {
+            processFunctor = prev:
-              __functor = self: { ... }: {
+              prev // {
-                imports = attrValues (removeAttrs prev leafConfig.functor.excludes) ++ leafConfig.functor.external;
+                __functor = self:
+                  { ... }: {
+                    imports =
+                      attrValues (removeAttrs prev leafConfig.functor.excludes)
+                      ++ leafConfig.functor.external;
                   };
               };
             processAliasDefault = prev: prev.default;
-            processDefault = prev: import prev.default (args // {
+            processDefault = prev:
+              import prev.default (args // {
                 inherit lib;
                 tree = {
                   prev = removeAttrs prev (singleton "default");
@@ -123,21 +120,19 @@
                 };
               });
             processExcludes = prev: removeAttrs prev leafConfig.excludes;
-            processes = optionals (isAttrs value) (
+            processes = optionals (isAttrs value)
-              optional (leafConfig.excludes != [ ]) processExcludes
+              (optional (leafConfig.excludes != [ ]) processExcludes
                 ++ optional leafConfig.evaluateDefault processDefault
                 ++ optional leafConfig.aliasDefault processAliasDefault
-              ++ optional leafConfig.functor.enable processFunctor
+                ++ optional leafConfig.functor.enable processFunctor);
-            );
+          in pipe value processes;
-          in
+      in processConfig path value) tree;
-          pipe value processes;
+  pureTree = pureTreeGrab {
-      in
+    base = folder;
-      processConfig path value)
+    path = folder;
-    tree;
+  };
-  pureTree = pureTreeGrab { base = folder; path = folder; };
   impureTree = processLeaves pureTree configTreeModule;
-in
+in {
-{
   config = configTreeModule;
   pure = pureTree;
   impure = impureTree;

users/chaoticryptidz/chaoticryptidz.nix

@@ -1,6 +1,7 @@
 { config, ... }: {
   users.users.chaoticryptidz = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "video" "systemd-journal" "plugdev" "vfio" "input" "uinput" ];
+    extraGroups =
+      [ "wheel" "video" "systemd-journal" "plugdev" "vfio" "input" "uinput" ];
   };
 }