formatted

This commit is contained in:
Aria Nolan 2023-11-22 23:54:46 -05:00
parent 0f28a1c1be
commit 631c22a3b0
4 changed files with 15 additions and 30 deletions

View file

@ -16,10 +16,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
helix = { helix.url = "github:helix-editor/helix/master";
url = "github:helix-editor/helix/master";
# inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -47,9 +44,6 @@
nur.overlay nur.overlay
]; ];
in { in {
formatter.${system} = pkgs.alejandra;
# nixosConfigurations: define options for different systems
# desktop # desktop
nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem { nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
@ -76,25 +70,15 @@
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.users."tacocat" = { home-manager.users."tacocat" = {
imports = [./users/tacocat/home.nix]; imports = [./users/tacocat/home.nix];
_module.args.theme = import ./modules/themes; _module.args.theme = import ./modules/themes;
}; };
home-manager.extraSpecialArgs = {inherit inputs;};
} }
]; ];
}; };
#homeConfigurations: define options for different users formatter.${system} = pkgs.alejandra;
# homeConfigurations."tacocat" = inputs.home-manager.lib.homeManagerConfiguration {
# inherit pkgs;
# extraSpecialArgs = {inherit inputs;}; # Pass flake inputs to our config
# modules = [
# {nixpkgs.overlays = overlays;}
# ./users/tacocat/home.nix
# ];
# };
# packages.${system}."tacocat" = self.homeConfigurations."tacocat".activationPackage;
}; };
} }

View file

@ -14,7 +14,7 @@
sops.defaultSopsFile = ./secrets/secrets.yaml; sops.defaultSopsFile = ./secrets/secrets.yaml;
sops.defaultSopsFormat = "yaml"; sops.defaultSopsFormat = "yaml";
sops.age.keyFile = "/home/tacocat/.config/sops/age/keys.txt"; sops.age.keyFile = "/home/tacocat/.config/sops/age/keys.txt";
boot.loader = { boot.loader = {
@ -74,8 +74,8 @@
enable = true; enable = true;
# wlr.enable = true; # wlr.enable = true;
extraPortals = with pkgs; [ extraPortals = with pkgs; [
# xdg-desktop-portal-wlr # xdg-desktop-portal-wlr
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
]; ];
}; };
@ -108,11 +108,12 @@
programs.waybar.enable = true; programs.waybar.enable = true;
programs.steam.enable = true; programs.steam.enable = true;
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg:
"steam" builtins.elem (lib.getName pkg) [
"steam-original" "steam"
"steam-run" "steam-original"
]; "steam-run"
];
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [

View file

@ -32,11 +32,11 @@
}); });
settings = { settings = {
theme = "rose_pine_moon"; theme = "gruvbox";
editor = { editor = {
line-number = "relative"; line-number = "relative";
lsp.display-messages = true; lsp.display-messages = true;
scrolloff = 5; scrolloff = 10;
middle-click-paste = false; middle-click-paste = false;
cursorline = true; cursorline = true;
cursor-shape = { cursor-shape = {

View file

@ -17,7 +17,7 @@
"Sched" "Sched"
"Due" "Due"
"Description" "Description"
"Urg" "Urg"
]; ];
}; };
}; };