valnyx/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

got it working!

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

47
flake.nix
View file

@ -34,7 +34,33 @@
home-manager,
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};
inherit (self) outputs;
in {
@ -49,25 +75,6 @@
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
];
};
});
}

2
modules/home/dev/default.nix
View file

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

35
modules/home/dv.nix
View file

@ -1,4 +1,4 @@
{pkgs, lib, config, inputs, ...}: {
{pkgs, lib, config, inputs, outputs, ...}: {
imports = [
./services.nix
./programs.nix
@ -10,9 +10,32 @@
./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 = {
file.".ssh/id_user.pub".text = builtins.readFile ../nixos/id_user.pub;
username = config.users.users.dv.name;
username = "dv";
homeDirectory = "/dv";
extraOutputsToInstall = ["doc" "devdoc"];
packages = [
@ -30,7 +53,7 @@
NIX_AUTO_RUN = "1";
FLAKE = "/dv/nixos";
};
# stateVersion = ""; <- figure out when installing WARNING:
stateVersion = "24.11";
};
nix.package = lib.mkForce pkgs.unstable.nixVersions.latest;
nix.extraOptions = ''
@ -43,8 +66,8 @@
};
programs.home-manager.enable = true;
programs.git.enable = true;
programs.nix-index.enable = true;
programs.nix-index.symlinkToCacheHome = true;
programs.nix-index-database.comma.enable = true;
#programs.nix-index.enable = true;
#programs.nix-index.symlinkToCacheHome = true;
#programs.nix-index-database.comma.enable = true;
systemd.user.startServices = "sd-switch";
}

36
modules/home/term/default.nix
View file

@ -78,23 +78,23 @@ tmux = {
plugins = with pkgs.tmuxPlugins; [
vim-tmux-navigator
yank
{
plugin = tokyo-night-tmux;
extraConfig = ''
# tokyo night tmux config
set -g @tokyo-night-tmux_theme "night"
set -g @tokyo-night-tmux_show_datetime 0
set -g @tokyo-night-tmux_path_format relative
set -g @tokyo-night-tmux_window_id_style digital
set -g @tokyo-night-tmux_pane_id_style hide
set -g @tokyo-night-tmux_show_git 0
# Undercurl fixes (tokyonight.nvim)
set -g default-terminal "${TERM}"
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
'';
}
# {
# plugin = tokyo-night-tmux;
# extraConfig = ''
## tokyo night tmux config
#set -g @tokyo-night-tmux_theme "night"
#set -g @tokyo-night-tmux_show_datetime 0
#set -g @tokyo-night-tmux_path_format relative
#set -g @tokyo-night-tmux_window_id_style digital
#set -g @tokyo-night-tmux_pane_id_style hide
#set -g @tokyo-night-tmux_show_git 0
#
## Undercurl fixes (tokyonight.nvim)
#set -g default-terminal "${TERM}"
#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
# '';
# }
];
extraConfig = ''
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}"
'';
};
xdg.configFile."lf/icons".source = ./lf-icons;
};
xdg.configFile."lf/icons".source = ./lf-icons;
programs.bat.enable = true;
programs.eza.enable = true;
programs.man.enable = true;

2
modules/nixos/adb.nix
View file

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

2
modules/nixos/console.nix
View file

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

5
modules/nixos/gui.nix
View file

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

2
modules/nixos/i18n.nix
View file

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

2
modules/nixos/users.nix
View file

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

33
waves.nix
View file

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