diff --git a/flake.nix b/flake.nix index 0697685..20e7dee 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,10 @@ sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; + + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + + }; outputs = { @@ -30,6 +34,7 @@ , nix-minecraft , nixpkgs , sops-nix + , nixos-hardware , unstable , ... }@inputs: let @@ -40,23 +45,6 @@ { nixosConfigurations = { - #aragon = nixpkgs.lib.nixosSystem { - # system = "x83_64-linux"; - # specialArgs = { - # inherit inputs; - # }; - # modules = [ - # # Overlays-module makes "pkgs.unstable" available in configuration.nix - # ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) - # ./machines/aragon/configuration.nix - # sops-nix.nixosModules.sops - # home-manager.nixosModules.home-manager { - # home-manager.useGlobalPkgs = true; - # home-manager.useUserPackages = true; - # home-manager.users."gunalx" = import ./home/home.nix; - # } - # ]; - #}; eowyn = nixpkgs.lib.nixosSystem { system = "x84_64-linux"; @@ -68,6 +56,13 @@ ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) ./machines/eowyn/configuration.nix sops-nix.nixosModules.sops + nixos-hardware.nixosModules.dell-latitude-7280 + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users."gunalx" = import ./home/home.nix; + } + ]; }; diff --git a/home/home.nix b/home/home.nix index 8dadf45..1b30b8c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,15 +1,65 @@ -{ config, pkgs, home-manager, ... }: +{ pkgs, lib, ... }: { imports = [ - (import "${home-manager}/nixos") - ./code.nix - ]; + ]; + + programs.bash = { + shellAliases = { + "rebuild" = "sudo nixos-rebuild switch --update-input nixpkgs --update-input unstable --no-write-lock-file --refresh --flake git+https://github.com/adrlau/nix-dotfiles.git --upgrade"; + "nixedit" = "vim /etc/nixos/nix-dotfiles/."; + "gst" = "git status"; + "gsw" = "git switch"; + "gcm" = "git commit -m "; + "gca" = "git commit --amend"; + "gaa" = "git add -A"; + "gb" = "git branch"; + "sl" = "ls"; + "la" = "la -la"; + "neofetch" = "fastfetch"; + }; - home-manager.users.gunalx = { - /* The home.stateVersion option does not have a default and must be set */ - home.stateVersion = "23.11"; - /* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */ - }; + + home.packages = with pkgs; [ + bottom + htop + fastfetch + ]; + + + + programs.git = { + enable = true; + + extraConfig = { + pull.rebase = true; + push.autoSetupRemote = true; + color.ui = "auto"; + init.defaultBranch = "main"; + lfs.enable = true; + + user = { + name = "Adrian G L"; + email = "adrian@lauterer.it"; + }; + }; + ignores = [ + "*~" + "*.swp" + ".DS_Store" + ".vscode" + "*__PYCACHE__*" + "*__pycache__*" + ]; + }; + + + + + + + + home.stateVersion = "23.05"; } +