diff --git a/configuration.nix b/configuration.nix index 48f5480..432a04f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ config, lib, pkgs, inputs, helix, ... }: +{ config, lib, pkgs, inputs, ... }: { imports = @@ -47,7 +47,7 @@ # Shell & Editor fish # better shell - helix.packages."${pkgs.system}".helix + #helix.packages."${pkgs.system}".helix # Archives zip @@ -137,13 +137,18 @@ security.sudo.wheelNeedsPassword = false; sops.defaultSopsFile = ./secrets/secrets.yaml; sops.defaultSopsFormat = "yaml"; - sops.age.keyFile = "/home/origami/.config/sops/age/keys.txt" + sops.age.keyFile = "/home/origami/.config/sops/age/keys.txt"; # List services that you want to enable: # Enable the OpenSSH daemon. services.openssh.enable = true; system.stateVersion = "23.11"; + + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "vscode" + ]; } diff --git a/flake.nix b/flake.nix index b4ec369..ef7be1e 100644 --- a/flake.nix +++ b/flake.nix @@ -15,15 +15,15 @@ nixosConfigurations = { "um790-nix" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = inputs; + specialArgs = { inherit inputs; }; modules = [ ./configuration.nix - #home-manager.nixosModules.home-manager { - # home-manager.useGlobalPkgs = true; - # home-manager.useUserPackages = true; - # home-manager.users.origami = import ./home.nix; - # home-manager.extraSpecialArgs = inputs; - #} + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.origami = import ./home.nix; + home-manager.extraSpecialArgs = inputs; + } ]; }; }; diff --git a/home.nix b/home.nix index 205f567..5a78af7 100644 --- a/home.nix +++ b/home.nix @@ -6,20 +6,9 @@ programs.home-manager.enable = true; - programs.git = { - enable = true; - userName = "origami"; - userEmail = "Origami404@foxmail.com"; - }; - home.packages = with pkgs;[]; - - programs.bash = { + programs.vscode = { enable = true; - enableCompletion = true; - bashrcExtra = '' - export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin" - ''; }; home.stateVersion = "23.11";