diff --git a/flake.nix b/flake.nix index 514e9cb..1a5dab6 100644 --- a/flake.nix +++ b/flake.nix @@ -18,30 +18,24 @@ outputs = { self, nixpkgs, nixos-hardware, nixos-raspberrypi, home-manager, aagl, ... }@attrs: { nixosConfigurations = { - # NOcomputer = nixpkgs.lib.nixosSystem { - # system = "x86_64-linux"; - # # config.allowUnfree = true; - # modules = [ - # nixos-hardware.nixosModules.common-cpu-amd - # nixos-hardware.nixosModules.common-gpu-nvidia-nonprime - # ./systems/BASED.nix - # ./systems/NOcomputer.nix - # # ./users/tao.nix - # home-manager.nixosModules.home-manager - # { - # home-manager.useGlobalPkgs = true; - # home-manager.useUserPackages = true; - # home-manager.users.jdoe = import ./tao.nix; - # } - # ./extras/uwuraid.nix - # ./extras/dev.nix - # ./extras/gaming.nix - # ]; - # }; + NOcomputer = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = attrs; + modules = [ + nixos-hardware.nixosModules.common-cpu-amd + nixos-hardware.nixosModules.common-gpu-nvidia-nonprime + ./systems/BASED.nix + ./systems/NOcomputer.nix + ./users/tao.nix + home-manager.nixosModules.home-manager + ./extras/uwuraid.nix + ./extras/dev.nix + ./extras/gaming.nix + ]; + }; NOlaptop = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; - # config.allowUnfree = true; modules = [ nixos-hardware.nixosModules.common-cpu-intel # inputs.nixos-hardware.nixosModules.framework diff --git a/users/tao/helix.nix b/users/tao/helix.nix index ec556e0..c5dc200 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -24,6 +24,7 @@ display-messages = true; display-inlay-hints = true; }; + soft-wrap.enable = true; }; }; languages = { @@ -35,6 +36,10 @@ command = "clang-format"; args = [ "--style=file:/home/tao/Templates/clang-format" ]; }; + indent = { + tab-width = 8; + unit = "\t"; + }; } { name = "nix"; diff --git a/users/tao/wezterm.lua b/users/tao/wezterm.lua index e4891de..800472b 100644 --- a/users/tao/wezterm.lua +++ b/users/tao/wezterm.lua @@ -1,4 +1,3 @@ --- local wezterm = require 'wezterm' return { font = wezterm.font 'FiraCode Nerd Font', color_scheme = "Dracula",