diff --git a/flake.nix b/flake.nix index d493922..448ce4c 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - helix = { - url = "github:helix-editor/helix/master"; - # inputs.nixpkgs.follows = "nixpkgs"; - }; + helix.url = "github:helix-editor/helix/master"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -47,9 +44,6 @@ nur.overlay ]; in { - formatter.${system} = pkgs.alejandra; - - # nixosConfigurations: define options for different systems # desktop nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem { inherit system; @@ -76,25 +70,15 @@ home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; + home-manager.extraSpecialArgs = {inherit inputs;}; home-manager.users."tacocat" = { imports = [./users/tacocat/home.nix]; _module.args.theme = import ./modules/themes; }; - home-manager.extraSpecialArgs = {inherit inputs;}; } ]; }; - #homeConfigurations: define options for different users - # 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; + formatter.${system} = pkgs.alejandra; }; } diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix index 405b7ab..721505b 100644 --- a/hosts/JWST/configuration.nix +++ b/hosts/JWST/configuration.nix @@ -14,7 +14,7 @@ sops.defaultSopsFile = ./secrets/secrets.yaml; sops.defaultSopsFormat = "yaml"; - + sops.age.keyFile = "/home/tacocat/.config/sops/age/keys.txt"; boot.loader = { @@ -74,8 +74,8 @@ enable = true; # wlr.enable = true; extraPortals = with pkgs; [ - # xdg-desktop-portal-wlr - xdg-desktop-portal-gtk + # xdg-desktop-portal-wlr + xdg-desktop-portal-gtk ]; }; @@ -108,11 +108,12 @@ programs.waybar.enable = true; programs.steam.enable = true; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-run" - ]; + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-run" + ]; environment = { systemPackages = with pkgs; [ diff --git a/users/tacocat/helix/default.nix b/users/tacocat/helix/default.nix index c90d03d..0de7c4a 100644 --- a/users/tacocat/helix/default.nix +++ b/users/tacocat/helix/default.nix @@ -32,11 +32,11 @@ }); settings = { - theme = "rose_pine_moon"; + theme = "gruvbox"; editor = { line-number = "relative"; lsp.display-messages = true; - scrolloff = 5; + scrolloff = 10; middle-click-paste = false; cursorline = true; cursor-shape = { diff --git a/users/tacocat/programs/taskwarrior.nix b/users/tacocat/programs/taskwarrior.nix index 38a4be4..309062e 100644 --- a/users/tacocat/programs/taskwarrior.nix +++ b/users/tacocat/programs/taskwarrior.nix @@ -17,7 +17,7 @@ "Sched" "Due" "Description" - "Urg" + "Urg" ]; }; };