lytedev/nix
1
0
Fork 1
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Laptops building again

Browse source
This commit is contained in:
Daniel Flanagan 2024-06-28 22:04:37 -05:00
parent ed9ae0bd07
commit 52c3f11b41
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

@ -180,7 +180,7 @@
modules = with nixosModules; [ modules = with nixosModules; [
common common
diskoConfigurations.standard outputs.diskoConfigurations.standard
hardware.nixosModules.common-cpu-amd hardware.nixosModules.common-cpu-amd
hardware.nixosModules.common-pc-ssd hardware.nixosModules.common-pc-ssd
@ -217,7 +217,6 @@
hardware.nixosModules.framework-13-7040-amd hardware.nixosModules.framework-13-7040-amd
graphical-workstation graphical-workstation
development-tools
laptop laptop
gaming gaming
@ -248,11 +247,20 @@
hardware.nixosModules.lenovo-thinkpad-x1-yoga hardware.nixosModules.lenovo-thinkpad-x1-yoga
graphical-workstation graphical-workstation
development-tools
laptop laptop
gaming gaming
./nixos/thablet.nix ./nixos/thablet.nix
{
home-manager.users.daniel = {
imports = with homeManagerModules; [
iex
cargo
linux-desktop-environment-config
];
};
}
]; ];
}; };

10
modules/home-manager/default.nix
View file

@ -90,7 +90,7 @@
gnupg gnupg
(pkgs.buildEnv { (pkgs.buildEnv {
name = "my-common-scripts"; name = "my-common-scripts";
paths = [./modules/home-manager/scripts/common]; paths = [./scripts/common];
}) })
]; ];
}; };
@ -241,8 +241,8 @@
programs.fish = { programs.fish = {
enable = true; enable = true;
# I load long scripts from files for a better editing experience # I load long scripts from files for a better editing experience
shellInit = builtins.readFile ./modules/home-manager/fish/shellInit.fish; shellInit = builtins.readFile ./fish/shellInit.fish;
interactiveShellInit = builtins.readFile ./modules/home-manager/fish/interactiveShellInit.fish; interactiveShellInit = builtins.readFile ./fish/interactiveShellInit.fish;
loginShellInit = ""; loginShellInit = "";
functions = { functions = {
# TODO: I think these should be loaded from fish files too for better editor experience? # TODO: I think these should be loaded from fish files too for better editor experience?
@ -1104,7 +1104,7 @@
home.packages = [ home.packages = [
(pkgs.buildEnv { (pkgs.buildEnv {
name = "my-linux-scripts"; name = "my-linux-scripts";
paths = [./modules/home-manager/scripts/linux]; paths = [./scripts/linux];
}) })
]; ];
}; };
@ -1195,7 +1195,7 @@
# docs: https://wezfurlong.org/wezterm/config/appearance.html#defining-your-own-colors # docs: https://wezfurlong.org/wezterm/config/appearance.html#defining-your-own-colors
programs.wezterm = with colors.withHashPrefix; { programs.wezterm = with colors.withHashPrefix; {
enable = true; enable = true;
extraConfig = builtins.readFile ./modules/home-manager/wezterm/config.lua; extraConfig = builtins.readFile ./wezterm/config.lua;
colorSchemes = { colorSchemes = {
catppuccin-mocha-sapphire = { catppuccin-mocha-sapphire = {
ansi = map (x: colors.withHashPrefix.${toString x}) (pkgs.lib.lists.range 0 7); ansi = map (x: colors.withHashPrefix.${toString x}) (pkgs.lib.lists.range 0 7);

2
modules/nixos/default.nix
View file

@ -720,7 +720,7 @@
family-users = { family-users = {
imports = with nixosModules; [ imports = with nixosModules; [
daniel # daniel # part of common
valerie valerie
flanfam flanfam
]; ];