Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
300 changes: 165 additions & 135 deletions flake.lock

Large diffs are not rendered by default.

18 changes: 17 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,11 @@
};

vault = {
url = "git+ssh://git@github.com/runarsf/vault";
url = "git+ssh://git@github.com/Boiing587/vault";
flake = false;
};

hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
};

outputs = inputs @ {self, ...}: let
Expand Down Expand Up @@ -145,6 +147,12 @@
hostname = "toaster";
users = ["thomas"];
};

roomba = lib.mkHost {
system = "x86_64-linux";
hostname = "roomba";
users = ["majus"];
};
};

homeConfigurations = {
Expand Down Expand Up @@ -181,6 +189,14 @@
system = "x86_64-linux";
hostname = "toaster";
};

majus = lib.mkUser {username = "majus";};

"majus@roomba" = lib.mkUser {
username = "majus";
system = "x86_64-linux";
hostname = "roomba";
};
};

formatter = inputs.flake-utils.eachDefaultSystem (
Expand Down
24 changes: 24 additions & 0 deletions hosts/roomba/configuration.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
_: {
imports = [
../../modules/linux/locales/norwegian.nix
../../modules/linux/systemd-boot.nix
../../modules/linux/thunderbolt.nix
../../modules/linux/network.nix
../../modules/linux/firewall.nix
../../modules/linux/printing.nix
];

services.libinput.enable = true;
services.xserver.enable = true;
services.displayManager.gdm.enable = true;
services.desktopManager.gnome.enable = true;

system.stateVersion = "24.05";

boot.kernelParams = [
"modset=1"
"fbdev=1"
"pcie_port_pm=off"
"pcie_aspm.policy=performance"
];
}
31 changes: 31 additions & 0 deletions hosts/roomba/hardware-configuration.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:

{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];

boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "thunderbolt" "usbhid" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];

fileSystems."/" =
{ device = "/dev/disk/by-uuid/3efcf2fe-7c0f-4fc6-940f-fdc5c3b643a3";
fsType = "ext4";
};

fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/4D18-C912";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};

swapDevices = [ ];

nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}
14 changes: 7 additions & 7 deletions modules/linux/network.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
enable = true;
plugins = with pkgs; [
networkmanager-openconnect
networkmanager-l2tp
# networkmanager-l2tp
];
};

programs.nm-applet.enable = true;

# Required for Unify L2TP VPN, enable *only* MSCHAPv2 in networkmanager.
services.strongswan = {
enable = true;
secrets = [
"ipsec.d/ipsec.nm-l2tp.secrets"
];
};
# services.strongswan = {
# enable = true;
# secrets = [
# "ipsec.d/ipsec.nm-l2tp.secrets"
# ];
# };
}
10 changes: 6 additions & 4 deletions modules/users/development/javascript.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
...
}:
# TODO set node prefix to .local/share/npm and npm/bin to path
outputs.lib.mkModule config "dev.javascript" {
home.packages = with pkgs; [
nodejs
];
outputs.lib.mkModule config ["dev" "javascript"] {
config = {
home.packages = with pkgs; [
nodejs
];
};
}
16 changes: 8 additions & 8 deletions modules/users/development/qmk.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
outputs.lib.mkModule config "qmk" {
nixos = {
hardware.keyboard = {
zsa.enable = true;
# zsa.enable = true;
qmk.enable = true;
};
services.udev.packages = with pkgs; [
qmk-udev-rules
qmk
via
vial
# qmk
# via
# vial
];
environment.systemPackages = with pkgs; [
qmk
via
vial
python313Packages.appdirs
# qmk
# via
# vial
# python313Packages.appdirs
];
};

Expand Down
10 changes: 10 additions & 0 deletions modules/users/gaming/hytale.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
config,
inputs,
outputs,
pkgs,
...
}:
outputs.lib.mkDesktopModule config "hytale" {
home.packages = [inputs.hytale-launcher.packages.${pkgs.system}.default];
}
1 change: 0 additions & 1 deletion modules/users/hyprland/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ in
enable_swallow = true;
key_press_enables_dpms = true;
render_unfocused_fps = 30;
new_window_takes_over_fullscreen = 1;
allow_session_lock_restore = 1;
swallow_regex = "^(Alacritty|kitty|org.wezfurlong.wezterm|com.mitchellh.ghostty)$";
animate_manual_resizes = config.modules.hyprland.animations;
Expand Down
11 changes: 11 additions & 0 deletions modules/users/streaming.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
config,
pkgs,
outputs,
...
}:
outputs.lib.mkDesktopModule config "streaming" {
home.packages = with pkgs; [
obs-studio
];
}
10 changes: 10 additions & 0 deletions modules/users/wootility.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
config,
pkgs,
outputs,
...
}:
outputs.lib.mkDesktopModule config "wootility" {
home.packages = with pkgs; [ wootility ];
modules.udev.extraRules = [ ./wootility.rules ];
}
35 changes: 35 additions & 0 deletions modules/users/wootility.rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Wooting One Legacy
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input", TAG+="uaccess"
# Wooting One update mode
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", MODE:="0660", GROUP="input", TAG+="uaccess"

# Wooting Two Legacy
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input", TAG+="uaccess"
# Wooting Two update mode
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE:="0660", GROUP="input", TAG+="uaccess"

# Generic Wootings
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", MODE:="0660", GROUP="input", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", MODE:="0660", GROUP="input", TAG+="uaccess"

# Wooting One Legacy for snap Chromium (Ubuntu)
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="snap_chromium_chromedriver"
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="snap_chromium_chromium"

# Wooting One update mode for snap Chromium (Ubuntu)
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="snap_chromium_chromedriver"
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="snap_chromium_chromium"

# Wooting Two Legacy for snap Chromium (Ubuntu)
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="snap_chromium_chromedriver"
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="snap_chromium_chromium"

# Wooting Two update mode for snap Chromium (Ubuntu)
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="snap_chromium_chromedriver"
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="snap_chromium_chromium"

# Generic Wootings for snap Chromium (Ubuntu)
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="snap_chromium_chromedriver"
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="snap_chromium_chromium"
Binary file added users/majus/avatar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions users/majus/config/git.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
_: {
modules.git = {
enable = true;
emailSelector = {
enable = true;
};
};

programs.git.settings = {
user.name = "Majus-Dev";
user.email = "83781075+Majus-Dev@users.noreply.github.com";
};
}
Loading