Merge branch 'main' of https://git.marty.tf/marty/config.nix
This commit is contained in:
commit
540ac42eac
20 changed files with 475 additions and 211 deletions
14
hosts/marty-thinkpad/custom.nix
Normal file
14
hosts/marty-thinkpad/custom.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
services.flatpak.enable = true;
|
||||
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware.nvidia.modesetting.enable = true;
|
||||
hardware.nvidia.open = true;
|
||||
}
|
||||
|
|
@ -8,37 +8,20 @@
|
|||
}:
|
||||
|
||||
{
|
||||
networking = {
|
||||
hostName = "marty-thinkpad";
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users = {
|
||||
marty = import ./home.nix;
|
||||
"${config.user.userName}" = import ./home.nix;
|
||||
};
|
||||
};
|
||||
|
||||
main-user = {
|
||||
userName = "marty";
|
||||
shell = pkgs.fish;
|
||||
};
|
||||
|
||||
imports = [
|
||||
./hardware.nix
|
||||
# ../../modules/server/nginx.nix
|
||||
./custom.nix
|
||||
./options.nix
|
||||
];
|
||||
|
||||
desktop.niri.enable = true;
|
||||
|
||||
programs = {
|
||||
light.enable = true;
|
||||
};
|
||||
services.flatpak.enable = true;
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware.nvidia.modesetting.enable = true;
|
||||
hardware.nvidia.open = true;
|
||||
system.stateVersion = "24.11"; # Did you read the comment?
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,95 +3,18 @@
|
|||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
osConfig,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
home.username = "marty";
|
||||
home.homeDirectory = "/home/marty";
|
||||
|
||||
# This value determines the Home Manager release that your configuration is
|
||||
# compatible with. This helps avoid breakage when a new Home Manager release
|
||||
# introduces backwards incompatible changes.
|
||||
#
|
||||
# You should not change this value, even if you update Home Manager. If you do
|
||||
# want to update the value, then make sure to first check the Home Manager
|
||||
# release notes.
|
||||
home.stateVersion = "24.11"; # Please read the comment before changing.
|
||||
|
||||
# The home.packages option allows you to install Nix packages into your
|
||||
# environment.
|
||||
|
||||
programs.fish.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
# # Adds the 'hello' command to your environment. It prints a friendly
|
||||
# # "Hello, world!" when run.
|
||||
# hello
|
||||
|
||||
# # It is sometimes useful to fine-tune packages, for example, by applying
|
||||
# # overrides. You can do that directly here, just don't forget the
|
||||
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
||||
# # fonts?
|
||||
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
|
||||
|
||||
# # You can also create simple shell scripts directly inside your
|
||||
# # configuration. For example, this adds a command 'my-hello' to your
|
||||
# # environment:
|
||||
# (pkgs.writeShellScriptBin "my-hello" ''
|
||||
# echo "Hello, ${config.home.username}!"
|
||||
# '')
|
||||
];
|
||||
|
||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||
# plain files is through 'home.file'.
|
||||
home.file = {
|
||||
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
|
||||
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
|
||||
# # symlink to the Nix store copy.
|
||||
# ".screenrc".source = dotfiles/screenrc;
|
||||
|
||||
# # You can also set the file content immediately.
|
||||
# ".gradle/gradle.properties".text = ''
|
||||
# org.gradle.console=verbose
|
||||
# org.gradle.daemon.idletimeout=3600000
|
||||
# '';
|
||||
};
|
||||
|
||||
# Home Manager can also manage your environment variables through
|
||||
# 'home.sessionVariables'. These will be explicitly sourced when using a
|
||||
# shell provided by Home Manager. If you don't want to manage your shell
|
||||
# through Home Manager then you have to manually source 'hm-session-vars.sh'
|
||||
# located at either
|
||||
#
|
||||
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# /etc/profiles/per-user/marty/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
|
||||
device.type.laptop = true;
|
||||
|
||||
desktop.hyprland = {
|
||||
monitors = [
|
||||
"desc:AU Optronics 0x313E,1600x900@60,0x0,1"
|
||||
];
|
||||
};
|
||||
home.username = osConfig.user.userName;
|
||||
home.homeDirectory = "/home/${osConfig.user.userName}";
|
||||
home.stateVersion = "24.11";
|
||||
|
||||
imports = [
|
||||
inputs.walker.homeManagerModules.default
|
||||
inputs.noctalia.homeModules.default
|
||||
./../../modules
|
||||
./../../home
|
||||
|
||||
];
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
}
|
||||
|
|
|
|||
157
hosts/marty-thinkpad/options.nix
Normal file
157
hosts/marty-thinkpad/options.nix
Normal file
|
|
@ -0,0 +1,157 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
config = {
|
||||
user = {
|
||||
userName = "marty";
|
||||
shell = pkgs.fish;
|
||||
};
|
||||
system = {
|
||||
timezone = "Europe/Berlin";
|
||||
language = "en_GB.UTF-8";
|
||||
locale = "de_DE.UTF-8";
|
||||
hostname = "marty-thinkpad";
|
||||
};
|
||||
apps = {
|
||||
audio = {
|
||||
base.enable = true;
|
||||
media.enable = true;
|
||||
editing.enable = true;
|
||||
};
|
||||
development = {
|
||||
editor = {
|
||||
vscodium.enable = true;
|
||||
emacs.enable = true;
|
||||
default = "vscodium";
|
||||
};
|
||||
languages = {
|
||||
python.enable = true;
|
||||
};
|
||||
godot.enable = true;
|
||||
};
|
||||
gaming = {
|
||||
enable = true;
|
||||
steam.enable = true;
|
||||
minecraft.enable = true;
|
||||
};
|
||||
image = {
|
||||
base.enable = true;
|
||||
editing.enable = true;
|
||||
};
|
||||
internet = {
|
||||
browsers = {
|
||||
zen-browser.enable = true;
|
||||
tor-browser.enable = true;
|
||||
default = "zen";
|
||||
};
|
||||
mail = {
|
||||
enable = true;
|
||||
providers = {
|
||||
protonmail.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
messaging = {
|
||||
signal.enable = true;
|
||||
element = {
|
||||
enable = true;
|
||||
selfhosted = true;
|
||||
};
|
||||
};
|
||||
misc = {
|
||||
obsidian.enable = true;
|
||||
bitwarden.enable = true;
|
||||
blender.enable = true;
|
||||
};
|
||||
sync = {
|
||||
kde-connect.enable = true;
|
||||
nextcloud.enable = true;
|
||||
syncthing = {
|
||||
devices = {
|
||||
marty-pc = {
|
||||
id = "6PJZD52-EEWIO7U-MZMJJ5B-33DGNSU-O7DJVRT-GAE7QZG-ZY3VIMV-VSMBDQP";
|
||||
autoAcceptFolder = true;
|
||||
};
|
||||
marty-server = {
|
||||
id = "UDMXEKZ-HYIFI5S-VAKE75O-K3C65QV-LS43QA5-3JTHWKL-CI5C3Y6-P4NSQQM";
|
||||
autoAcceptFolders = true;
|
||||
};
|
||||
marty-latitude = {
|
||||
id = "SOAWHKA-BCQGO5G-IJ24WTO-RDETP5M-LNTVO66-MHIOUU2-NNQ57P6-FFKNSA6";
|
||||
autoAcceptFolders = true;
|
||||
};
|
||||
marty-thinkpad = {
|
||||
id = "NWHFQSW-FOBGFLV-YMZR77Q-KNRR3YC-4C6PKXT-TTPDCOL-CDB6QX4-3QJE2AN";
|
||||
autoAcceptFolders = true;
|
||||
};
|
||||
marty-pixel = {
|
||||
id = "GSBXOGW-6SYLDUQ-HPH7FBJ-CKHWQIK-K5YORB4-CYKGYT6-DLCVSAK-LA2RMAK";
|
||||
autoAcceptFolders = true;
|
||||
};
|
||||
marty-fairphone = {
|
||||
id = "2ISVWQV-4USY5IA-2OU55CE-Q7VLPD7-4RVQ5WX-FXQSJMY-2ES4EZG-IGFB7QG";
|
||||
autoAcceptFolders = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
terminal = {
|
||||
kitty = {
|
||||
enable = true;
|
||||
};
|
||||
default = "kitty";
|
||||
tui = {
|
||||
ranger.enable = true;
|
||||
};
|
||||
toys = true;
|
||||
};
|
||||
video = {
|
||||
base.enable = true;
|
||||
media.enable = true;
|
||||
editing.enable = true;
|
||||
};
|
||||
};
|
||||
desktop = {
|
||||
window-managers = {
|
||||
hyprland = {
|
||||
enable = false;
|
||||
};
|
||||
niri = {
|
||||
enable = true;
|
||||
};
|
||||
sway = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
shell = {
|
||||
noctalia = {
|
||||
enable = true;
|
||||
};
|
||||
swww = {
|
||||
enable = false;
|
||||
};
|
||||
walker = {
|
||||
enable = true;
|
||||
};
|
||||
waybar = {
|
||||
enable = false;
|
||||
};
|
||||
};
|
||||
utilities = {
|
||||
grimblast = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
server = {
|
||||
synapse = {
|
||||
subdomain = "yap";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue