Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
number5 committed May 31, 2024
1 parent 1d1a7e8 commit b88b178
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 81 deletions.
90 changes: 45 additions & 45 deletions flake.lock

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

1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
anyrun-ha-assist.url = "github:n3oney/anyrun-ha-assist";
anyrun-nixos-options.url = "github:n3oney/anyrun-nixos-options";


disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
Expand Down
2 changes: 1 addition & 1 deletion home/modules/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ in {
p.lefthook
];

stateVersion = "23.11";
stateVersion = "24.05";
};
}
11 changes: 7 additions & 4 deletions nixos/configurations/bootloader/chestnut.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
# Bootloader.
boot = {
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
efi.efiSysMountPoint = "/boot/";
systemd-boot = {
enable = true;
};
efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot";
};
};
};
}
2 changes: 1 addition & 1 deletion nixos/configurations/chestnut.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ _: {
# compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you
# should.
system.stateVersion = "23.11"; # Did you read the comment?
system.stateVersion = "24.05"; # Did you read the comment?

time.timeZone = lib.mkDefault "Australia/Melbourne";

Expand Down
49 changes: 20 additions & 29 deletions nixos/configurations/chestnut/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,9 @@
pkgs,
...
}: {
# Bootloader.
boot = {
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
efi.efiSysMountPoint = "/boot/";
};

# use latest kernel
kernelPackages = pkgs.linuxPackages_xanmod_latest;
kernelPackages = pkgs.linuxPackages_latest;

kernelParams = [
"amdgpu.dcdebugmask=0x10"
Expand Down Expand Up @@ -71,37 +64,35 @@

journald.extraConfig = "SystemMaxUse=1G";

xserver = {
enable = true;
layout = "us";
xkbOptions = "caps:escape"; # Caps-lock is the new Escape.
videoDrivers = ["amdgpu"];
libinput = {
displayManager = {
defaultSession = "none+i3";
sddm.autoNumlock = true;

autoLogin = {
enable = true;
mouse = {
accelProfile = "flat"; # Disable acceleration.
middleEmulation = false; # Disable emulating middle click using left + right clicks;
};
user = "bruce";
};
};

displayManager = {
defaultSession = "none+i3";
sddm.autoNumlock = true;

autoLogin = {
enable = true;
user = "bruce";
};
xserver = {
enable = true;
xkb = {
layout = "us";
options = "caps:escape"; # Caps-lock is the new Escape.
};
videoDrivers = ["amdgpu"];

windowManager.i3 = {
enable = true;
package = pkgs.i3;
};
};
};

console.useXkbConfig = true;
console = {
font = "${pkgs.terminus_font}/share/consolefonts/ter-u32n.psf.gz";
packages = [pkgs.terminus_font];
useXkbConfig = true;
};

hardware = {
bluetooth.enable = true;
Expand All @@ -114,7 +105,7 @@
environment = {
# List packages installed in system profile. To search, run:
# $ nix search wget
systemPackages = with pkgs; [git curl wget ripgrep openssh];
systemPackages = with pkgs; [git curl wget ripgrep openssh pciutils btrfs-progs];

defaultPackages = lib.mkForce [];

Expand Down
1 change: 1 addition & 0 deletions parts/system_configs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ in {
{system.configurationRevision = self.rev or "dirty";}
{documentation.man.enable = true;}
{documentation.man.generateCaches = true;}
inputs.disko.nixosModules.disko
inputs.sops-nix.nixosModules.sops
]
++ config.modules
Expand Down

0 comments on commit b88b178

Please sign in to comment.