got it working!

This commit is contained in:
valerie 2024-08-20 23:00:00 -04:00
parent 19166b47a4
commit e86fcef075
Signed by: valnyx
GPG key ID: CC10324DD962CB7E
10 changed files with 101 additions and 65 deletions

View file

@ -34,7 +34,33 @@
home-manager, home-manager,
flake-utils, flake-utils,
... ...
} @ inputs: flake-utils.lib.eachDefaultSystem(system: let } @ inputs: {
nixosConfigurations.waves = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit (self) outputs;
inherit inputs flake-utils;
};
modules = [
inputs.disko.nixosModules.default
(import ./disko.nix {device="/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_with_Heatsink_1TB_S6WSNJ0T900943T";})
./waves.nix
];
};
overlays = import ./overlays {inherit inputs;};
homeConfigurations."dv@waves" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs { system = "x86_64-linux"; };
extraSpecialArgs = {
inherit (self) outputs;
inherit inputs flake-utils;
};
modules = [
./modules/home/dv.nix
];
};
} // flake-utils.lib.eachDefaultSystem(system: let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
inherit (self) outputs; inherit (self) outputs;
in { in {
@ -49,25 +75,6 @@
formatter = pkgs.alejandra; formatter = pkgs.alejandra;
overlays = import ./overlays {inherit inputs;};
nixosConfigurations.waves = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs outputs flake-utils;
};
modules = [
inputs.disko.nixosModules.default
(import ./disko.nix {device="/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_with_Heatsink_1TB_S6WSNJ0T900943T";})
./waves.nix
];
};
homeConfigurations."dv@waves" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs { system = system; };
modules = [
./modules/home/dv.nix
];
};
}); });
} }

View file

@ -1,5 +1,5 @@
{pkgs, ...}: { {pkgs, ...}: {
import = [ imports = [
./git.nix ./git.nix
./ssh.nix ./ssh.nix
./gpg.nix ./gpg.nix

View file

@ -1,4 +1,4 @@
{pkgs, lib, config, inputs, ...}: { {pkgs, lib, config, inputs, outputs, ...}: {
imports = [ imports = [
./services.nix ./services.nix
./programs.nix ./programs.nix
@ -10,9 +10,32 @@
./gui.nix ./gui.nix
]; ];
nix = {
#package = pkgs.nix;
registry.nixpkgs.flake = inputs.nixpkgs;
gc.automatic = true;
settings = {
# Enable flakes and new 'nix' command
experimental-features = "nix-command flakes";
# Opinionated: disable global registry
flake-registry = "";
# Workaround for https://github.com/NixOS/nix/issues/9574
#allowUnfree = true;
};
};
nixpkgs.config = {
allowUnfree = true;
cudaSupport = true;
};
nixpkgs.overlays = [
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.unstable-packages
];
home = { home = {
file.".ssh/id_user.pub".text = builtins.readFile ../nixos/id_user.pub; file.".ssh/id_user.pub".text = builtins.readFile ../nixos/id_user.pub;
username = config.users.users.dv.name; username = "dv";
homeDirectory = "/dv"; homeDirectory = "/dv";
extraOutputsToInstall = ["doc" "devdoc"]; extraOutputsToInstall = ["doc" "devdoc"];
packages = [ packages = [
@ -30,7 +53,7 @@
NIX_AUTO_RUN = "1"; NIX_AUTO_RUN = "1";
FLAKE = "/dv/nixos"; FLAKE = "/dv/nixos";
}; };
# stateVersion = ""; <- figure out when installing WARNING: stateVersion = "24.11";
}; };
nix.package = lib.mkForce pkgs.unstable.nixVersions.latest; nix.package = lib.mkForce pkgs.unstable.nixVersions.latest;
nix.extraOptions = '' nix.extraOptions = ''
@ -43,8 +66,8 @@
}; };
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.git.enable = true; programs.git.enable = true;
programs.nix-index.enable = true; #programs.nix-index.enable = true;
programs.nix-index.symlinkToCacheHome = true; #programs.nix-index.symlinkToCacheHome = true;
programs.nix-index-database.comma.enable = true; #programs.nix-index-database.comma.enable = true;
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
} }

View file

@ -78,23 +78,23 @@ tmux = {
plugins = with pkgs.tmuxPlugins; [ plugins = with pkgs.tmuxPlugins; [
vim-tmux-navigator vim-tmux-navigator
yank yank
{ # {
plugin = tokyo-night-tmux; # plugin = tokyo-night-tmux;
extraConfig = '' # extraConfig = ''
# tokyo night tmux config ## tokyo night tmux config
set -g @tokyo-night-tmux_theme "night" #set -g @tokyo-night-tmux_theme "night"
set -g @tokyo-night-tmux_show_datetime 0 #set -g @tokyo-night-tmux_show_datetime 0
set -g @tokyo-night-tmux_path_format relative #set -g @tokyo-night-tmux_path_format relative
set -g @tokyo-night-tmux_window_id_style digital #set -g @tokyo-night-tmux_window_id_style digital
set -g @tokyo-night-tmux_pane_id_style hide #set -g @tokyo-night-tmux_pane_id_style hide
set -g @tokyo-night-tmux_show_git 0 #set -g @tokyo-night-tmux_show_git 0
#
# Undercurl fixes (tokyonight.nvim) ## Undercurl fixes (tokyonight.nvim)
set -g default-terminal "${TERM}" #set -g default-terminal "${TERM}"
set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support #set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support
set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # underscore colours - needs tmux 3.0 #set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # underscore colours - needs tmux 3.0
''; # '';
} # }
]; ];
extraConfig = '' extraConfig = ''
set-option -sa terminal-overrides ",xterm*:Tc" set-option -sa terminal-overrides ",xterm*:Tc"
@ -124,8 +124,8 @@ set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{25
bind c new-window -c "#{pane_current_path}" bind c new-window -c "#{pane_current_path}"
''; '';
}; };
xdg.configFile."lf/icons".source = ./lf-icons;
}; };
xdg.configFile."lf/icons".source = ./lf-icons;
programs.bat.enable = true; programs.bat.enable = true;
programs.eza.enable = true; programs.eza.enable = true;
programs.man.enable = true; programs.man.enable = true;

View file

@ -1,3 +1,3 @@
{}: { {...}: {
programs.adb.enable = true; programs.adb.enable = true;
} }

View file

@ -1,4 +1,4 @@
{pkgs, ...}: { {pkgs, lib, ...}: {
console = { console = {
earlySetup = true; earlySetup = true;
font = "${pkgs.terminus_font}/share/consolefonts/ter-v32n.psf.gz"; font = "${pkgs.terminus_font}/share/consolefonts/ter-v32n.psf.gz";

View file

@ -1,3 +1,8 @@
{ {
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.desktopManager = {
xterm.enable = false;
xfce.enable = true;
};
services.xserver.displayManager.defaultSession = "xfce";
} }

View file

@ -1,4 +1,4 @@
{}: { {...}: {
time.timeZone = "America/Indiana/Indianapolis"; time.timeZone = "America/Indiana/Indianapolis";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";

View file

@ -2,6 +2,8 @@
users.users.dv = { users.users.dv = {
uid = 1337; uid = 1337;
initialPassword = "iamsonaughty."; initialPassword = "iamsonaughty.";
home = "/dv";
createHome = true;
shell = pkgs.zsh; shell = pkgs.zsh;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
(builtins.readFile ./id_user.pub) (builtins.readFile ./id_user.pub)

View file

@ -5,28 +5,27 @@ pkgs,
outputs, outputs,
inputs, inputs,
... ...
}: let }:
modulesPath = "./modules/nixos"; {
in {
imports = [ imports = [
./waves-hardware.nix ./waves-hardware.nix
inputs.nix-gaming.nixosModules.pipewireLowLatency inputs.nix-gaming.nixosModules.pipewireLowLatency
"${modulesPath}/virtualisation.nix" ./modules/nixos/virtualisation.nix
"${modulesPath}/kanata.nix" ./modules/nixos/kanata.nix
"${modulesPath}/services.nix" ./modules/nixos/services.nix
"${modulesPath}/localnameresolution.nix" ./modules/nixos/localnameresolution.nix
"${modulesPath}/syncthing.nix" ./modules/nixos/syncthing.nix
"${modulesPath}/users.nix" ./modules/nixos/users.nix
"${modulesPath}/adb.nix" ./modules/nixos/adb.nix
"${modulesPath}/console.nix" ./modules/nixos/console.nix
"${modulesPath}/fonts.nix" ./modules/nixos/fonts.nix
"${modulesPath}/nvidia.nix" ./modules/nixos/nvidia.nix
"${modulesPath}/gui.nix" ./modules/nixos/gui.nix
"${modulesPath}/i18n.nix" ./modules/nixos/i18n.nix
"${modulesPath}/zsh.nix" ./modules/nixos/zsh.nix
]; ];
#system.stateVersion = ""; #<- replace when have stateversion system.stateVersion = "24.05";
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;