added hardware and home manager

This commit is contained in:
Adrian Gunnar Lauterer 2024-06-13 00:23:24 +02:00
parent ab897da23e
commit 619be4f1e1
3 changed files with 85 additions and 28 deletions

View File

@ -19,6 +19,10 @@
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
}; };
outputs = { outputs = {
@ -30,6 +34,7 @@
, nix-minecraft , nix-minecraft
, nixpkgs , nixpkgs
, sops-nix , sops-nix
, nixos-hardware
, unstable , unstable
, ... }@inputs: , ... }@inputs:
let let
@ -40,23 +45,6 @@
{ {
nixosConfigurations = { 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 { eowyn = nixpkgs.lib.nixosSystem {
system = "x84_64-linux"; system = "x84_64-linux";
@ -68,6 +56,13 @@
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./machines/eowyn/configuration.nix ./machines/eowyn/configuration.nix
sops-nix.nixosModules.sops 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;
}
]; ];
}; };

View File

@ -1,15 +1,65 @@
{ config, pkgs, home-manager, ... }: { pkgs, lib, ... }:
{ {
imports = [ imports = [
(import "${home-manager}/nixos")
./code.nix
]; ];
home-manager.users.gunalx = { programs.bash = {
/* The home.stateVersion option does not have a default and must be set */ shellAliases = {
home.stateVersion = "23.11"; "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";
/* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */ "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.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";
} }

View File

@ -15,11 +15,23 @@
set backspace=indent,eol,start set backspace=indent,eol,start
" Turn on syntax highlighting by default " Turn on syntax highlighting by default
syntax on syntax on
set tabstop=4 softtabstop=0 autoindent expandtab shiftwidth=4 smarttab
" ... " ...
''; '';
packages.myplugins = with pkgs.vimPlugins; { packages.myplugins = with pkgs.vimPlugins; {
start = [ vim-nix vim-lastplace vim-yaml coc-rust-analyzer neovim-fuzzy LanguageClient-neovim copilot-vim chadtree]; start = [
opt = []; vim-nix
vim-lastplace
vim-yaml
coc-rust-analyzer
neovim-fuzzy
LanguageClient-neovim
copilot-vim
chadtree
];
opt = [
#copilot-vim
];
}; };
}; };
}; };