Skip to content

Commit

Permalink
chore: bump inputs
Browse files Browse the repository at this point in the history
  • Loading branch information
sioodmy committed Jun 14, 2024
1 parent 7ff40db commit b446444
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 125 deletions.
79 changes: 29 additions & 50 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
env = extra.shellEnv;
packages = with pkgs; [
inputs'.agenix.packages.default # provide agenix CLI within flake shell
inputs'.disko.packages.disko-install
config.treefmt.build.wrapper # treewide formatter
nil # nix ls
alejandra # nix formatter
Expand Down Expand Up @@ -110,11 +109,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};

disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};

schizofox = {
url = "github:schizofox/schizofox";
inputs = {
Expand Down
8 changes: 6 additions & 2 deletions home/packages.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{pkgs, inputs, ...}: {
{
pkgs,
inputs,
...
}: {
nixpkgs.config.allowUnfree = false;
home.packages = with pkgs; [
inputs.ags.packages.${pkgs.system}.default

cider
#ags
overskride
dart-sass


libreoffice-fresh
thunderbird
nicotine-plus
Expand Down
2 changes: 1 addition & 1 deletion hosts/calypso/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
'';
inherit (lib) mkDefault;
in {
imports = [./hardware-configuration.nix ./disko.nix];
imports = [./hardware-configuration.nix];
environment.systemPackages = with pkgs; [
acpi
powertop
Expand Down
57 changes: 0 additions & 57 deletions hosts/calypso/disko.nix

This file was deleted.

3 changes: 1 addition & 2 deletions hosts/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
wayland = ../system/wayland;
hw = inputs.nixos-hardware.nixosModules;
agenix = inputs.agenix.nixosModules.age;
disko = inputs.disko.nixosModules.default;
hmModule = inputs.home-manager.nixosModules.home-manager;

shared = [core agenix disko];
shared = [core agenix];

home-manager = {
useUserPackages = true;
Expand Down
7 changes: 2 additions & 5 deletions system/core/nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,8 @@
};

nix = {
gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 3d";
};
# gc kills ssds
gc.automatic = lib.mkDefault false;
package = pkgs.nixVersions.git;

# Make builds run with low priority so my system stays responsive
Expand Down
4 changes: 2 additions & 2 deletions system/core/system.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
};

environment.variables = {
EDITOR = "hx";
BROWSER = "schizofox";
EDITOR = "v";
BROWSER = "brave";
};
environment.systemPackages = with pkgs; [
git
Expand Down

0 comments on commit b446444

Please sign in to comment.