Skip to content

Commit

Permalink
fatalis setup
Browse files Browse the repository at this point in the history
  • Loading branch information
viperML committed Jan 8, 2024
1 parent 730a3e1 commit 7576486
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 50 deletions.
6 changes: 3 additions & 3 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@
inputs.flake-compat.follows = "flake-compat";
};
};
}
}
5 changes: 1 addition & 4 deletions homes/ayats/@HESTIA.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
config,
...
}: {
{config, ...}: {
unsafeFlakePath = "${config.home.homeDirectory}/Projects/dotfiles";
}
5 changes: 1 addition & 4 deletions homes/ayats/@shiva.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
config,
...
}: {
{config, ...}: {
unsafeFlakePath = "${config.home.homeDirectory}/Projects/dotfiles";
}
34 changes: 18 additions & 16 deletions hosts/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,26 @@
inputs.nixpkgs.lib.nixosSystem {
inherit specialArgs;

modules = [
#-- Core
inputs.nixpkgs.nixosModules.readOnlyPkgs
{nixpkgs.pkgs = (withSystem system ({pkgs, ...}: pkgs));}
modules =
[
#-- Core
inputs.nixpkgs.nixosModules.readOnlyPkgs
{nixpkgs.pkgs = withSystem system ({pkgs, ...}: pkgs);}

config.flake.nixosModules.common
inputs.nix-common.nixosModules.default
config.flake.nixosModules.common
inputs.nix-common.nixosModules.default

inputs.home-manager.nixosModules.home-manager
{
home-manager.sharedModules = [
config.flake.homeModules.common
inputs.nix-common.homeModules.default
];
home-manager.extraSpecialArgs = specialArgs;
}
inputs.home-manager.nixosModules.home-manager
{
home-manager.sharedModules = [
config.flake.homeModules.common
inputs.nix-common.homeModules.default
];
home-manager.extraSpecialArgs = specialArgs;
}

inputs.nh.nixosModules.default
] ++ extraModules;
inputs.nh.nixosModules.default
]
++ extraModules;
};
}
15 changes: 9 additions & 6 deletions hosts/fatalis/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
password = "1234";
createHome = true;
};

home-manager.users.ayats = {};

security.sudo.wheelNeedsPassword = false;

Expand All @@ -30,19 +32,20 @@
# powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";

hardware = {
# cpu.amd.updateMicrocode = true;
# enableRedistributableFirmware = true;
cpu.amd.updateMicrocode = true;
enableAllFirmware = true;
bluetooth.enable = true;
opengl = {
enable = true;
# extraPackages = with pkgs.rocmPackages; [
# clr
# clr.icd
# ];
# extraPackages = with pkgs.rocmPackages; [
# clr
# clr.icd
# ];
};
};

# services.fwupd.enable = true;
services.kmscon.enable = lib.mkForce false;

# security.pam.services = {
# login.u2fAuth = true;
Expand Down
6 changes: 2 additions & 4 deletions hosts/fatalis/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ in {
./configuration.nix
./hardware.nix
# nixosModules.user-ayats
nixosModules.common
inputs.lanzaboote.nixosModules.lanzaboote

{
Expand All @@ -29,10 +28,9 @@ in {
# nixosModules.sway
# nixosModules.hyprland
# nixosModules.plasma5
# nixosModules.gnome
nixosModules.gnome

#-- Other
nixosModules.tailscale
{services.kmscon.autologinUser = "ayats";}
# nixosModules.tailscale
]);
}
5 changes: 5 additions & 0 deletions hosts/fatalis/hardware.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ in {
"size=2G"
"mode=0755"
];
neededForBoot = true;
};
in {
"/" = {
Expand All @@ -75,6 +76,7 @@ in {
};

# "/etc" = mkTmpfs;
# "/var" = mkTmpfs;
"/bin" = mkTmpfs;
"/lib64" = mkTmpfs;
"/opt" = mkTmpfs;
Expand All @@ -87,4 +89,7 @@ in {
# device = "/dev/disk/by-partlabel/LINUX_SWAP";
# }
# ];
security.tpm2 = {
enable = true;
};
}
3 changes: 2 additions & 1 deletion hosts/fatalis/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
}: {
nixpkgs.config.allowUnfree = true;

unsafeFlakePath = "/home/ayats/Documents/dotfiles";
unsafeFlakePath = "/home/ayats/dotfiles";

home.packages = [
pkgs.vscode
packages.self.wezterm
pkgs.firefox
# pkgs.obsidian
];
}
8 changes: 1 addition & 7 deletions modules/home-manager/gnome.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ in {
"focus-mode" = gvariant.mkValue "sloppy";
};
"org/gnome/mutter" = {
"experimental-features" = gvariant.mkArray gvariant.type.string ["scale-monitor-framebuffer"];
"focus-change-on-pointer-rest" = gvariant.mkBoolean false;
};
"org/gnome/settings-daemon/plugins/media-keys" = {
Expand All @@ -51,7 +52,6 @@ in {
"enabled-extensions" = gvariant.mkArray gvariant.type.string [
"[email protected]"
# "blur-my-shell@aunetx"
"[email protected]"
];
};
"org/gnome/desktop/interface" = {
Expand Down Expand Up @@ -94,12 +94,6 @@ in {
"org/gnome/shell" = {
"disable-user-extensions" = gvariant.mkBoolean false;
};
"org/gnome/shell/extensions/forge" = {
"window-gap-hidden-on-single" = gvariant.mkBoolean true;
};
"org/gnome/shell/extensions/forge/keybindings" = {
"window-swap-last-active" = gvariant.mkString "<Control><Super>Return";
};
};

systemd.user = {
Expand Down
1 change: 1 addition & 0 deletions modules/nixos/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
vim
file
pax-utils
efibootmgr

packages.self.git
packages.nh.default
Expand Down
2 changes: 1 addition & 1 deletion modules/nixos/containerd.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
makeWrapper = pkgs.makeBinaryWrapper;
};
in {
environment.systemPackages =[
environment.systemPackages = [
nerdctl
];

Expand Down
5 changes: 2 additions & 3 deletions modules/nixos/gnome.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
services.xserver = {
desktopManager.gnome.enable = true;
displayManager.gdm.enable = true;
displayManager.defaultSession = "gnome";
# displayManager.defaultSession = "gnome";
};

environment.sessionVariables = {
Expand All @@ -21,7 +21,7 @@

gnome.gnome-characters
gnome.cheese
gnome.gedit
gedit
gnome.totem
gnome.geary
gnome.gnome-screenshot
Expand Down Expand Up @@ -51,7 +51,6 @@
libsForQt5.qtwayland
libsForQt5.gwenview
pkgs.gnomeExtensions.appindicator
pkgs.gnomeExtensions.forge
];

home-manager.sharedModules = [
Expand Down

0 comments on commit 7576486

Please sign in to comment.