style changes

This commit is contained in:
Markus Heurung 2024-08-13 12:50:10 +02:00
parent 0fd53b62f1
commit c37a577c1c
3 changed files with 41 additions and 35 deletions

View file

@ -1,31 +1,41 @@
{
description = "Home Manager configuration of muhh";
description = "muhh configs for all nix managed things";
inputs = {
# nixpkgs.url = "nixpkgs/release-24.05";
nixpkgs.url = "nixpkgs/nixos-unstable";
# hardware.url = "nixos/nixos-hardware";
home-manager = {
# url = "github:nix-community/home-manager/release-23.11";
# url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
stylix = {
url = "github:danth/stylix";
inputs.nixpkgs.follows = "nixpkgs";
};
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
stylix = {
url = "github:danth/stylix";
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
niri = {
url = "github:sodiboo/niri-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
};
@ -33,10 +43,10 @@
self,
nixpkgs,
home-manager,
nixvim,
lix-module,
sops-nix,
stylix,
lix-module,
nixvim,
niri,
...
} @ inputs: let
@ -58,11 +68,12 @@
muhhStar = lib.nixosSystem {
inherit system;
modules = [
inputs.sops-nix.nixosModules.sops
sops-nix.nixosModules.sops
./hosts/muhhStar.nix
];
};
};
homeConfigurations = {
muhh = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
@ -73,10 +84,10 @@
];
};
modules = [
inputs.nixvim.homeManagerModules.nixvim
inputs.sops-nix.homeManagerModules.sops
inputs.stylix.homeManagerModules.stylix
inputs.niri.homeModules.niri
nixvim.homeManagerModules.nixvim
sops-nix.homeManagerModules.sops
stylix.homeManagerModules.stylix
niri.homeModules.niri
./home.nix
];
};

View file

@ -6,7 +6,7 @@
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
];
boot = {
initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
@ -20,23 +20,23 @@
fileSystems."/" =
{ device = "/dev/disk/by-uuid/f0a69b93-3fdc-48ad-a288-a12ce1e3a205";
fsType = "ext4";
};
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0428-C12E";
fsType = "vfat";
};
fsType = "vfat";
};
fileSystems."/storage/family" =
{ device = "/dev/disk/by-uuid/896c11dc-d275-4992-99e6-fddc394a7bf1";
fsType = "xfs";
};
fsType = "xfs";
};
fileSystems."/storage/muhh" =
{ device = "/dev/disk/by-uuid/8b716713-359b-4bac-8951-a35405dccd4c";
fsType = "xfs";
};
fsType = "xfs";
};
swapDevices = [ ];

View file

@ -92,8 +92,6 @@
};
environment.shells = with pkgs; [ bash fish zsh ];
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
git
home-manager
@ -107,9 +105,6 @@
iosevka
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
programs = {
_1password.enable = true;
_1password-gui = {