clean ups

This commit is contained in:
ari committed 2024-04-29 10:36:31 -04:00
1 parent fd5e62626e
commit 8120493a1c
9 files changed
+6 -183

No files matched your search

-1
View File
@@ -1 +0,0 @@
/etc/nixos/configuration.nix
-82
View File
@@ -1,82 +0,0 @@
{
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11;
inputs.home-manager.url = github:nix-community/home-manager;
inputs.fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*.tar.gz";
inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
outputs =
{ self
, nixpkgs
, home-manager
, fh
, nixos-hardware
}@attrs:
let
user = {
name = "ari";
fullName = "Ari Sosnovsky";
email = "ariel@sosnovsky.ca";
};
dataDir = "/mnt/Data";
systemStateVersion = "23.11";
homeMangerVersion = "23.11";
hostName = "fwbook";
in
{
nixosConfigurations.fwbook = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./hardware-configs/fwbook.nix
nixos-hardware.nixosModules.framework-13-7040-amd
(import ./modules/os/nix.nix {
systemStateVersion = systemStateVersion;
})
(import ./modules/os/core.nix {
user = user;
hostName = hostName;
firewall = { enable = true; };
})
(import ./modules/os/hardware.nix {
enableFingerPrint = true;
})
(import ./modules/os/ssh.nix {
user = user;
enableSSHServer = false;
})
./modules/os/services.nix
./modules/docker/core.nix
(import ./modules/user.nix {
user = user;
})
(import ./modules/rootUser.nix {
hostName = hostName;
})
home-manager.nixosModules.default
fh.packages.x86_64-linux.default
(import ./modules/optional/home-manager-config.nix {
homeMangerVersion = homeMangerVersion;
hostName = hostName;
user = user;
})
./modules/optional/amd-packages.nix
./modules/optional/gnome.nix
(import ./modules/optional/hyprland.nix {
user = user;
})
{
hardware.framework.amd-7040.preventWakeOnAC = true;
services.fwupd.enable = true;
fileSystems."${dataDir}" = {
device = "/dev/sda1";
fsType = "ext4";
options = [
"users"
"nofail"
];
};
}
];
};
};
}
+1 -1
View File
@@ -21,7 +21,7 @@
hostName = "fwbook";
in
{
nixosConfigurations.fwbook = nixpkgs.lib.nixosSystem {
nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
nixos-hardware.nixosModules.framework-13-7040-amd
-40
View File
@@ -1,40 +0,0 @@
{ pkgs, config, ... }:
let
user = {
name = "ari";
fullName = "Ari Sosnovsky";
email = "ariel@sosnovsky.ca";
};
dataDir = "/mnt/Data";
in
{
imports =
[
/etc/nixos/cachix.nix
/etc/nixos/hardware-configuration.nix
<nixos-hardware/framework/13-inch/7040-amd>
(import /home/ari/nixos-setup/main.nix {
enableFingerPrint = true;
hostName = "fwbook";
user = user;
})
/home/ari/nixos-setup/modules/optional/amd-packages.nix
/home/ari/nixos-setup/modules/optional/gnome.nix
(import /home/ari/nixos-setup/modules/optional/hyprland.nix {
user = user;
})
];
hardware.framework.amd-7040.preventWakeOnAC = true;
services.fwupd.enable = true;
fileSystems."${dataDir}" = {
device = "/dev/sda1";
fsType = "ext4";
options = [
"users"
"nofail"
];
};
# home-manager.users.${user.name}.zsh.extraEnv = ''
# export KUBECONFIG=${dataDir}/local/kube/config.yml
# '';
}
-57
View File
@@ -1,57 +0,0 @@
{ systemStateVersion ? "23.11"
, homeMangerVersion ? "23.11"
, enableHomeManager ? true
, hostName
, user
, enableSSHServer ? false
, firewall ? { enable = true; }
, enableFingerPrint ? false
,
}:
{ pkgs, ... }:
let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-${homeMangerVersion}.tar.gz";
in
{
imports = [
(import ./modules/os/nix.nix {
systemStateVersion = systemStateVersion;
})
(import ./modules/os/networking.nix {
hostName = hostName;
firewall = firewall;
})
import
./modules/os/fonts.nix
(import ./modules/os/core.nix {
user = user;
})
(import ./modules/os/hardware.nix {
enableFingerPrint = enableFingerPrint;
})
(import ./modules/os/ssh.nix {
user = user;
enableSSHServer = enableSSHServer;
})
./modules/os/services.nix
./modules/docker/core.nix
(import ./modules/user.nix {
user = user;
})
(import ./modules/rootUser.nix {
hostName = hostName;
})
] ++ (if enableHomeManager then [
(import "${home-manager}/nixos")
(import ./modules/optional/home-manager-config.nix {
homeMangerVersion = homeMangerVersion;
hostName = hostName;
user = user;
})
] else [ ]);
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.useTmpfs = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
}
+1
View File
@@ -29,6 +29,7 @@ in
rye
betterdiscordctl
discord
devenv
];
};
programs = {
+1 -1
View File
@@ -25,7 +25,7 @@
glib
glibc
glib-networking
# (import (fetchTarball "https://install.devenv.sh/latest")).default
flatpak
];
programs.tmux = {
enable = true;
-1
View File
@@ -8,7 +8,6 @@
font-awesome
mplus-outline-fonts.githubRelease
noto-fonts-emoji
flatpak
];
enableDefaultPackages = true;
fontDir.enable = true;
+3
View File
@@ -14,4 +14,7 @@
# Tailscale
services.tailscale.enable = true;
services.tailscale.useRoutingFeatures = "client";
# Disable the flaky nm service
systemd.services.NetworkManager-wait-online.enable = false;
}