Added 2 PCs
This commit is contained in:
parent
3ea2e7ca05
commit
239337edde
20
README.md
20
README.md
|
@ -46,11 +46,15 @@ users | Individual User configs
|
||||||
flake.nix & flake.lock | Declared configuration using the above directories & configs
|
flake.nix & flake.lock | Declared configuration using the above directories & configs
|
||||||
|
|
||||||
## Hosts
|
## Hosts
|
||||||
Hostname | Model | Type | RAM | Processor | Main Use
|
Hostname | Model | Type | RAM | Processor | Main Use
|
||||||
---------|------------------|---------|------|----------------------|------------
|
---------|---------------------|---------|------|---------------------------|------------
|
||||||
weda | Dell Inspiron 15 | Laptop | 16GB | AMD Ryzen 5 (Cezanne)| Business
|
weda | Dell Inspiron 15 | Laptop | 16GB | AMD Ryzen 5 (Cezanne) | Business
|
||||||
frija | Acer Aspire 3 | Laptop | 4GB | AMD A9 | Testing
|
frija | Acer Aspire 3 | Laptop | 4GB | AMD A9 | Testing
|
||||||
tyr | Intel i5 | Desktop | 16GB | Intel i5 | Media
|
tyr | Intel i5 | Desktop | 16GB | Intel i5 | Media
|
||||||
tuisto | AMD Ryzen 5 | Desktop | 16GB | AMD Ryzen 5 (Renoir) | Remote
|
tii | Dell Lattitude 5511 | Laptop | 16GB | Intel i5 Quad (i5-10400H) | Remote
|
||||||
TODO | AMD Ryzen 5 | Server | ??GB | AMD 2200G | Test Server
|
tuisto | AMD Ryzen 5 | Desktop | 16GB | AMD Ryzen 5 (Renoir) | Remote
|
||||||
TODO | AMD Ryzen 5 | Server | ??GB | AMD 2200G | Main Server
|
sintanne | Intel i5 | Desktop | 16GB | Intel i5-11320H | Remote
|
||||||
|
TODO | AMD Ryzen 5 | Server | ??GB | AMD 2200G | Test Server
|
||||||
|
TODO | AMD Ryzen 5 | Server | ??GB | AMD 2200G | Main Server
|
||||||
|
|
||||||
|
Dell Latitude 5511 Notebook, 15.6-in HD (1366 x 768), Webcam, 1x Intel Core i5 Quad (i5-10400H) 2.60 GHz, 16 GB RAM, 512 GB SSD, No Optical, Intel Integrated Graphics, Backlit Keyboard, Windows 10 Professional
|
116
flake.nix
116
flake.nix
|
@ -17,6 +17,63 @@
|
||||||
|
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
|
|
||||||
|
sintanne = nixpkgs.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
modules = [
|
||||||
|
|
||||||
|
# Common Resources
|
||||||
|
|
||||||
|
# Desktop
|
||||||
|
./desktop/gnome.nix
|
||||||
|
./display/gdm.nix
|
||||||
|
#./desktop/kde.nix
|
||||||
|
#./display/sddm.nix
|
||||||
|
#./desktop/hyprland.nix
|
||||||
|
|
||||||
|
# Kernels & RAM
|
||||||
|
#./common/kernel.zen.nix
|
||||||
|
#./commmon/swappiness
|
||||||
|
|
||||||
|
# Common
|
||||||
|
#./common/amd.nix
|
||||||
|
#./common/bluetooth.nix
|
||||||
|
./common/CUPS.nix
|
||||||
|
#./common/hyprland.nix
|
||||||
|
./common/pipewire.nix
|
||||||
|
./common/time.nix
|
||||||
|
#./common/docker.nix
|
||||||
|
./common/flakeinit.nix
|
||||||
|
./common/flatpak.nix
|
||||||
|
#./common/gaming.nix
|
||||||
|
./common/insecure.nix
|
||||||
|
./common/networking.nix
|
||||||
|
./common/terminal.nix
|
||||||
|
./common/unfree.nix
|
||||||
|
./common/waydroid.nix
|
||||||
|
./common/x11.nix
|
||||||
|
|
||||||
|
# Host Specific
|
||||||
|
./hosts/remote/sintanne/default.nix
|
||||||
|
./hosts/remote/sintanne/hardware-configuration.nix
|
||||||
|
./hosts/remote/sintanne/packages.nix
|
||||||
|
|
||||||
|
# User Specific
|
||||||
|
./users/annette/home-manager.nix
|
||||||
|
#./users/annette/hd.nix
|
||||||
|
#./users/annette/syncthing.nix
|
||||||
|
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
{
|
||||||
|
home-manager.useGlobalPkgs = true;
|
||||||
|
home-manager.useUserPackages = true;
|
||||||
|
home-manager.users.admin = import ./hosts/remote/annette/home.nix;
|
||||||
|
}
|
||||||
|
|
||||||
|
#hyprland.nixosModules.default
|
||||||
|
#{programs.hyprland.enable = true;}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
frija = nixpkgs.lib.nixosSystem {
|
frija = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
|
@ -123,7 +180,64 @@
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
tii = nixpkgs.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
modules = [
|
||||||
|
|
||||||
|
# Common Resources
|
||||||
|
|
||||||
|
# Desktop
|
||||||
|
./desktop/gnome.nix
|
||||||
|
./display/gdm.nix
|
||||||
|
#./desktop/kde.nix
|
||||||
|
#./display/sddm.nix
|
||||||
|
#./desktop/hyprland.nix
|
||||||
|
|
||||||
|
# Kernels & RAM
|
||||||
|
#./common/kernel.zen.nix
|
||||||
|
#./commmon/swappiness
|
||||||
|
|
||||||
|
# Common
|
||||||
|
#./common/amd.nix
|
||||||
|
./common/bluetooth.nix
|
||||||
|
./common/CUPS.nix
|
||||||
|
#./common/hyprland.nix
|
||||||
|
./common/pipewire.nix
|
||||||
|
./common/time.nix
|
||||||
|
#./common/docker.nix
|
||||||
|
./common/flakeinit.nix
|
||||||
|
./common/flatpak.nix
|
||||||
|
#./common/gaming.nix
|
||||||
|
./common/insecure.nix
|
||||||
|
./common/networking.nix
|
||||||
|
./common/terminal.nix
|
||||||
|
./common/unfree.nix
|
||||||
|
#./common/waydroid.nix
|
||||||
|
./common/x11.nix
|
||||||
|
|
||||||
|
# Host Specific
|
||||||
|
./hosts/remote/tii/default.nix
|
||||||
|
./hosts/remote/tii/hardware-configuration.nix
|
||||||
|
./hosts/remote/tii/packages.nix
|
||||||
|
|
||||||
|
# User Specific
|
||||||
|
./users/admin/home-manager.nix
|
||||||
|
#./users/admin/hd.nix
|
||||||
|
#./users/admin/syncthing.nix
|
||||||
|
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
{
|
||||||
|
home-manager.useGlobalPkgs = true;
|
||||||
|
home-manager.useUserPackages = true;
|
||||||
|
home-manager.users.admin = import ./hosts/remote/tii/home.nix;
|
||||||
|
}
|
||||||
|
|
||||||
|
#hyprland.nixosModules.default
|
||||||
|
#{programs.hyprland.enable = true;}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
tuisto = nixpkgs.lib.nixosSystem {
|
tuisto = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
# Home Manager needs a bit of information about you and the
|
||||||
|
# paths it should manage.
|
||||||
|
home.username = "annette";
|
||||||
|
home.homeDirectory = "/home/annette";
|
||||||
|
|
||||||
|
# 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 can update Home Manager without changing this value. See
|
||||||
|
# the Home Manager release notes for a list of state version
|
||||||
|
# changes in each release.
|
||||||
|
home.stateVersion = "22.11";
|
||||||
|
|
||||||
|
# Let Home Manager install and manage itself.
|
||||||
|
programs.home-manager.enable = true;
|
||||||
|
}
|
|
@ -0,0 +1,31 @@
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [ ../../../common/fonts.nix];
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
adw-gtk3 # GTK3 libadwaita Theme ported to GTK-3
|
||||||
|
cpu-x # PC Information
|
||||||
|
dconf # Gnome Configuration
|
||||||
|
firefox # Browser
|
||||||
|
gamemode # Optimse Linux System Performance
|
||||||
|
gnome.gnome-tweaks # Gnome Customization Tool
|
||||||
|
gsmartcontrol # Disk Health Inspection Tool
|
||||||
|
hplip # HP Print Drivers
|
||||||
|
i2c-tools # Network Utilities
|
||||||
|
inetutils # Network Utilities
|
||||||
|
libsForQt5.kolourpaint # Painting Application
|
||||||
|
ntfs3g # FUSE Client
|
||||||
|
p7zip # File Archiver
|
||||||
|
papirus-icon-theme # Icons
|
||||||
|
phinger-cursors # Cursor Theme
|
||||||
|
powertop # Power Manager
|
||||||
|
protonup # Proton Installer
|
||||||
|
steam # Steam Game Launcher
|
||||||
|
syncthing # File Synchronization
|
||||||
|
waydroid # Android Emulator
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
# Home Manager needs a bit of information about you and the
|
||||||
|
# paths it should manage.
|
||||||
|
home.username = "admin";
|
||||||
|
home.homeDirectory = "/home/admin";
|
||||||
|
|
||||||
|
# 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 can update Home Manager without changing this value. See
|
||||||
|
# the Home Manager release notes for a list of state version
|
||||||
|
# changes in each release.
|
||||||
|
home.stateVersion = "22.11";
|
||||||
|
|
||||||
|
# Let Home Manager install and manage itself.
|
||||||
|
programs.home-manager.enable = true;
|
||||||
|
}
|
|
@ -0,0 +1,31 @@
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [ ../../../common/fonts.nix];
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
adw-gtk3 # GTK3 libadwaita Theme ported to GTK-3
|
||||||
|
cpu-x # PC Information
|
||||||
|
dconf # Gnome Configuration
|
||||||
|
firefox # Browser
|
||||||
|
gamemode # Optimse Linux System Performance
|
||||||
|
gnome.gnome-tweaks # Gnome Customization Tool
|
||||||
|
gsmartcontrol # Disk Health Inspection Tool
|
||||||
|
hplip # HP Print Drivers
|
||||||
|
i2c-tools # Network Utilities
|
||||||
|
inetutils # Network Utilities
|
||||||
|
libsForQt5.kolourpaint # Painting Application
|
||||||
|
ntfs3g # FUSE Client
|
||||||
|
p7zip # File Archiver
|
||||||
|
papirus-icon-theme # Icons
|
||||||
|
phinger-cursors # Cursor Theme
|
||||||
|
powertop # Power Manager
|
||||||
|
protonup # Proton Installer
|
||||||
|
steam # Steam Game Launcher
|
||||||
|
syncthing # File Synchronization
|
||||||
|
waydroid # Android Emulator
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
home-manager.users.admin = { pkgs, ... }: {
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
bleachbit # PC Cleaner
|
||||||
|
easytag # Music Tag Editor
|
||||||
|
kitty # Terminal Emulator
|
||||||
|
mpv # Media Player
|
||||||
|
nomachine-client # NoMachine remote desktop client (nxplayer)
|
||||||
|
onlyoffice-bin # Office Suite
|
||||||
|
rustdesk # Remote Desktop Software
|
||||||
|
smplayer # Media Player
|
||||||
|
speedcrunch # Calculator
|
||||||
|
strawberry # Media Player
|
||||||
|
vscodium # Code Editor
|
||||||
|
];
|
||||||
|
|
||||||
|
imports = [
|
||||||
|
../../config/config.nix
|
||||||
|
../../common/git.nix
|
||||||
|
../../common/vscodium.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
home.stateVersion = "22.11";
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
services = {
|
||||||
|
syncthing = {
|
||||||
|
enable = true;
|
||||||
|
user = "annette";
|
||||||
|
dataDir = "/home/annette/Syncthing"; # Default folder for new synced folders
|
||||||
|
configDir = "/home/annette/Documents/.config/syncthing"; # Folder for Syncthing's settings and keys
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in New Issue