Lots more Jupiter changes, wireless for all by default, no more earlyoom
This commit is contained in:
parent
5cdd5989dd
commit
e6ab43c882
15 changed files with 113 additions and 65 deletions
|
@ -10,10 +10,7 @@
|
||||||
../../modules/system
|
../../modules/system
|
||||||
];
|
];
|
||||||
|
|
||||||
networking = {
|
networking.hostName = "envy";
|
||||||
hostName = "envy";
|
|
||||||
wireless.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
system = {
|
system = {
|
||||||
desktop.enable = true;
|
desktop.enable = true;
|
||||||
|
|
|
@ -10,10 +10,7 @@
|
||||||
../../modules/system
|
../../modules/system
|
||||||
];
|
];
|
||||||
|
|
||||||
networking = {
|
networking.hostName = "intuos";
|
||||||
hostName = "intuos";
|
|
||||||
wireless.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
system = {
|
system = {
|
||||||
desktop.enable = true;
|
desktop.enable = true;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
boot = {
|
boot = {
|
||||||
|
kernelPackages = pkgs.linuxPackages_latest;
|
||||||
loader.systemd-boot.enable = true;
|
loader.systemd-boot.enable = true;
|
||||||
plymouth.enable = true;
|
plymouth.enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,18 +6,15 @@
|
||||||
./filesystems
|
./filesystems
|
||||||
./hardware
|
./hardware
|
||||||
./jovian
|
./jovian
|
||||||
./network
|
|
||||||
./users
|
./users
|
||||||
../../modules/system
|
../../modules/system
|
||||||
];
|
];
|
||||||
|
|
||||||
networking = {
|
networking.hostName = "jupiter";
|
||||||
hostName = "jupiter";
|
|
||||||
networkmanager.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
system = {
|
system = {
|
||||||
desktop.enable = true;
|
desktop.enable = true;
|
||||||
stateVersion = "24.05";
|
steamdeck.enable = true;
|
||||||
|
stateVersion = "24.11";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHJ2Gy1Gaq96K85zOSfgWzGY0rIaUcqGS7Si5Nvzg+n
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHkggr+MbQuBGko8mWsATYq/Y0BlQc++TH9Mq5Q0x8KG
|
||||||
|
|
|
@ -1,32 +1,107 @@
|
||||||
{ config, lib, jovian, ... }:
|
{ config, lib, pkgs, jovian, ... }:
|
||||||
{
|
{
|
||||||
imports = [ jovian.nixosModules.jovian ];
|
imports = [ jovian.nixosModules.jovian ];
|
||||||
|
|
||||||
jovian = {
|
options.system.steamdeck.enable = lib.mkEnableOption "Enable Jovian NixOS environment";
|
||||||
steam = {
|
|
||||||
enable = true;
|
config = lib.mkIf config.system.steamdeck.enable {
|
||||||
autoStart = true;
|
jovian = {
|
||||||
desktopSession = "sway";
|
steam = {
|
||||||
user = config.sysusers.main;
|
enable = true;
|
||||||
|
autoStart = true;
|
||||||
|
desktopSession = "gnome";
|
||||||
|
user = config.sysusers.main;
|
||||||
|
};
|
||||||
|
decky-loader = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.decky-loader-prerelease;
|
||||||
|
};
|
||||||
|
devices.steamdeck = {
|
||||||
|
enable = true;
|
||||||
|
enableGyroDsuService = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
devices.steamdeck.enable = true;
|
|
||||||
decky-loader.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
services = {
|
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_jovian;
|
||||||
displayManager.ly.enable = lib.mkForce false;
|
|
||||||
keyd.enable = lib.mkForce false;
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.persistence."/persist" = {
|
programs.steam = {
|
||||||
directories = [ "/etc/NetworkManager/system-connections" ];
|
extest.enable = true;
|
||||||
users.${config.sysusers.main}.directories = [ ".steam" ];
|
extraCompatPackages = with pkgs; [ proton-ge-bin ];
|
||||||
};
|
localNetworkGameTransfers.openFirewall = true;
|
||||||
|
remotePlay.openFirewall = true;
|
||||||
|
};
|
||||||
|
|
||||||
nixpkgs.allowUnfreePackages = [
|
services = {
|
||||||
"steam"
|
displayManager.ly.enable = lib.mkForce false;
|
||||||
"steam-jupiter-unwrapped"
|
keyd.enable = lib.mkForce false;
|
||||||
"steamdeck-firmware"
|
tlp.enable = lib.mkForce false;
|
||||||
"steamdeck-hw-theme"
|
xserver.desktopManager.gnome.enable = true;
|
||||||
];
|
};
|
||||||
|
|
||||||
|
networking = {
|
||||||
|
networkmanager.enable = true;
|
||||||
|
wireless.enable = lib.mkForce false;
|
||||||
|
};
|
||||||
|
|
||||||
|
environment = {
|
||||||
|
persistence."/persist" = {
|
||||||
|
directories = [
|
||||||
|
"/etc/NetworkManager/system-connections"
|
||||||
|
"/var/lib/decky-loader"
|
||||||
|
];
|
||||||
|
users.${config.sysusers.main}.directories = [
|
||||||
|
".local/share/gnome-settings-daemon"
|
||||||
|
".local/share/gnome-shell"
|
||||||
|
".steam"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
gnome.excludePackages = with pkgs; [
|
||||||
|
adwaita-icon-theme
|
||||||
|
baobab
|
||||||
|
epiphany
|
||||||
|
evince
|
||||||
|
file-roller
|
||||||
|
geary
|
||||||
|
gnome-calculator
|
||||||
|
gnome-calendar
|
||||||
|
gnome-characters
|
||||||
|
gnome-clocks
|
||||||
|
gnome-color-manager
|
||||||
|
gnome-connections
|
||||||
|
gnome-console
|
||||||
|
gnome-contacts
|
||||||
|
gnome-disk-utility
|
||||||
|
gnome-font-viewer
|
||||||
|
gnome-logs
|
||||||
|
gnome-maps
|
||||||
|
gnome-music
|
||||||
|
gnome-shell-extensions
|
||||||
|
gnome-software
|
||||||
|
gnome-system-monitor
|
||||||
|
gnome-text-editor
|
||||||
|
gnome-tour
|
||||||
|
gnome-user-docs
|
||||||
|
gnome-weather
|
||||||
|
loupe
|
||||||
|
nautilus
|
||||||
|
orca
|
||||||
|
seahorse
|
||||||
|
simple-scan
|
||||||
|
snapshot
|
||||||
|
sushi
|
||||||
|
sysprof
|
||||||
|
totem
|
||||||
|
yelp
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
nixpkgs.allowUnfreePackages = [
|
||||||
|
"steam"
|
||||||
|
"steam-jupiter-unwrapped"
|
||||||
|
"steamdeck-firmware"
|
||||||
|
"steamdeck-hw-theme"
|
||||||
|
];
|
||||||
|
|
||||||
|
specialisation.desktop.configuration.config.system.steamdeck.enable = lib.mkForce false;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
networking = {
|
|
||||||
interfaces."wlp1s0".ipv4.addresses = [{
|
|
||||||
address = "192.168.2.200";
|
|
||||||
prefixLength = 24;
|
|
||||||
}];
|
|
||||||
defaultGateway = {
|
|
||||||
address = "192.168.2.1";
|
|
||||||
interface = "wlp1s0";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -10,10 +10,7 @@
|
||||||
../../modules/system
|
../../modules/system
|
||||||
];
|
];
|
||||||
|
|
||||||
networking = {
|
networking.hostName = "redmond";
|
||||||
hostName = "redmond";
|
|
||||||
wireless.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
system = {
|
system = {
|
||||||
desktop.enable = true;
|
desktop.enable = true;
|
||||||
|
|
|
@ -55,7 +55,6 @@
|
||||||
"/root" = {
|
"/root" = {
|
||||||
mountpoint = "/";
|
mountpoint = "/";
|
||||||
mountOptions = [
|
mountOptions = [
|
||||||
"noexec"
|
|
||||||
"compress=zstd"
|
"compress=zstd"
|
||||||
"ssd"
|
"ssd"
|
||||||
];
|
];
|
||||||
|
|
|
@ -129,7 +129,7 @@
|
||||||
# Theming and visibility
|
# Theming and visibility
|
||||||
"browser.aboutConfig.showWarning" = false;
|
"browser.aboutConfig.showWarning" = false;
|
||||||
"browser.compactmode.show" = true;
|
"browser.compactmode.show" = true;
|
||||||
"browser.tabs.inTitlebar" = 0;
|
"browser.tabs.inTitlebar" = 1;
|
||||||
"browser.theme.content-theme" = 0;
|
"browser.theme.content-theme" = 0;
|
||||||
"browser.theme.toolbar-theme" = 0;
|
"browser.theme.toolbar-theme" = 0;
|
||||||
"browser.toolbars.bookmarks.visibility" = "never";
|
"browser.toolbars.bookmarks.visibility" = "never";
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
{ command = "wl-paste -t text --watch clipman store -P"; }
|
{ command = "wl-paste -t text --watch clipman store -P"; }
|
||||||
{ command = "wl-copy"; }
|
{ command = "wl-copy"; }
|
||||||
{ command = "mako"; }
|
{ command = "mako"; }
|
||||||
{ command = "sunshine"; }
|
|
||||||
{ command = "rot8"; }
|
{ command = "rot8"; }
|
||||||
{ command = "wlsunset -s 22:30 -S 07:30"; }
|
{ command = "wlsunset -s 22:30 -S 07:30"; }
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,10 @@
|
||||||
dhcpcd.enable = false;
|
dhcpcd.enable = false;
|
||||||
nftables.enable = true;
|
nftables.enable = true;
|
||||||
firewall.allowPing = false;
|
firewall.allowPing = false;
|
||||||
wireless.userControlled.enable = true;
|
wireless = {
|
||||||
|
enable = config.system.desktop.enable;
|
||||||
|
userControlled.enable = true;
|
||||||
|
};
|
||||||
nameservers = [
|
nameservers = [
|
||||||
"2620:fe::11#dns11.quad9.net"
|
"2620:fe::11#dns11.quad9.net"
|
||||||
"2620:fe::fe:11#dns11.quad9.net"
|
"2620:fe::fe:11#dns11.quad9.net"
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./displaymanager
|
./displaymanager
|
||||||
./earlyoom
|
|
||||||
./gnome-keyring
|
./gnome-keyring
|
||||||
./keyd
|
./keyd
|
||||||
./libvirtd
|
./libvirtd
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
services.earlyoom.enable = true;
|
|
||||||
}
|
|
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
../../../../hosts/envy/id_ed25519.pub
|
../../../../hosts/envy/id_ed25519.pub
|
||||||
../../../../hosts/intuos/id_ed25519.pub
|
../../../../hosts/intuos/id_ed25519.pub
|
||||||
|
../../../../hosts/jupiter/id_ed25519.pub
|
||||||
../../../../hosts/redmond/id_ed25519.pub
|
../../../../hosts/redmond/id_ed25519.pub
|
||||||
|
|
||||||
../../../../hosts/midas/id_ed25519.pub
|
../../../../hosts/midas/id_ed25519.pub
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue