mx42/nixos
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: fix duplicate config on work config & some minor changes

Browse Source
This commit is contained in:
Xavier Morel
2025-07-16 20:59:28 +02:00
parent 8db9f2f154
commit 66f7edf9a3
6 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dev-flakes/flake.lock generated
View File

@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1745391562, "lastModified": 1748026106,
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -48,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747153592, "lastModified": 1747154383,
"narHash": "sha256-LdqcDLzGzhP6JGdMPw9e/kfLrSYNc6ILZDSze+tEeMk=", "narHash": "sha256-cuc9xCvhifb9Gu2ELs2HLBY0Quif/WGdaWf23168R/g=",
"owner": "mx42", "owner": "mx42",
"repo": "nix_spacetimedb", "repo": "nix_spacetimedb",
"rev": "205f52c60ab71daa92d1f4a667b0f9d915eda513", "rev": "ac50832939bee62420b210cd6b581f60346d33dc",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
hosts/home/configuration.nix
View File

@@ -113,7 +113,7 @@
DIRENV_LOG_FORMAT = ""; DIRENV_LOG_FORMAT = "";
}; };
systemPackages = with pkgs; [ systemPackages = with pkgs; [
logitech-udev-rules vial
]; ];
}; };
@@ -133,6 +133,16 @@
}; };
services = { services = {
udev.packages = with pkgs; [
vial
];
openssh = {
enable = true;
settings = {
PasswordAuthentication = true;
AllowUsers = null;
};
};
pulseaudio.enable = false; pulseaudio.enable = false;
xserver.enable = true; xserver.enable = true;
xserver.xkb = { xserver.xkb = {

4
hosts/work/configuration.nix
View File

@@ -21,8 +21,8 @@
environment.systemPackages = map lib.lowPrio [ environment.systemPackages = map lib.lowPrio [
pkgs.curl pkgs.curl
pkgs.gitMinimal pkgs.gitMinimal
pkgs.slack # pkgs.slack
pkgs.teams-for-linux # pkgs.teams-for-linux
pkgs.openvpn pkgs.openvpn
]; ];
networking = { networking = {

19
hosts/work/hardware-configuration.nix
View File

@@ -1,23 +1,14 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config, lib, pkgs, modulesPath, ... }:
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = [ imports =
(modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
"nvme"
"xhci_pci"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@@ -28,7 +19,7 @@
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true;
# networking.interfaces.enp5s0f3u1u3c2.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

19
hosts/work/home.nix
View File

@@ -12,14 +12,14 @@
}; };
home = { home = {
username = "xmorel"; username = "xmorel";
homeDirectory = "/home/xmorel/"; homeDirectory = "/home/xmorel";
sessionVariables = { sessionVariables = {
FLAKE = "/home/xmorel/nixos/"; FLAKE = "/home/xmorel/nixos/";
}; };
packages = with pkgs; [ packages = with pkgs; [
devenv devenv
lazyjj lazyjj
slack # slack
tailscale-systray tailscale-systray
tree tree
ungoogled-chromium ungoogled-chromium
@@ -41,12 +41,16 @@
}; };
nix = { nix = {
package = pkgs.nix; # package = pkgs.nix;
settings = { settings = {
auto-optimise-store = true; auto-optimise-store = true;
experimental-features = ["nix-command" "flakes"]; experimental-features = [
"nix-command"
"flakes"
];
trusted-users = [ trusted-users = [
"root" "xmorel" "root"
"xmorel"
]; ];
}; };
gc = { gc = {
@@ -71,7 +75,7 @@
direnv.enable = true; direnv.enable = true;
eza = { eza = {
enable = true; enable = true;
extraOptions = ["--group-directories-first"]; extraOptions = [ "--group-directories-first" ];
git = true; git = true;
icons = "auto"; icons = "auto";
}; };
@@ -85,8 +89,7 @@
la = "eza -lah"; la = "eza -lah";
man = "batman"; man = "batman";
}; };
interactiveShellInit = interactiveShellInit = ''
''
source /usr/share/cachyos-fish-config/cachyos-config.fish source /usr/share/cachyos-fish-config/cachyos-config.fish
fish_vi_key_bindings fish_vi_key_bindings
''; '';