feat: fix duplicate config on work config & some minor changes
This commit is contained in:
12
dev-flakes/flake.lock
generated
12
dev-flakes/flake.lock
generated
@@ -20,11 +20,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1745391562,
|
||||
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
|
||||
"lastModified": 1748026106,
|
||||
"narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
|
||||
"rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -48,11 +48,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747153592,
|
||||
"narHash": "sha256-LdqcDLzGzhP6JGdMPw9e/kfLrSYNc6ILZDSze+tEeMk=",
|
||||
"lastModified": 1747154383,
|
||||
"narHash": "sha256-cuc9xCvhifb9Gu2ELs2HLBY0Quif/WGdaWf23168R/g=",
|
||||
"owner": "mx42",
|
||||
"repo": "nix_spacetimedb",
|
||||
"rev": "205f52c60ab71daa92d1f4a667b0f9d915eda513",
|
||||
"rev": "ac50832939bee62420b210cd6b581f60346d33dc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
DIRENV_LOG_FORMAT = "";
|
||||
};
|
||||
systemPackages = with pkgs; [
|
||||
logitech-udev-rules
|
||||
vial
|
||||
];
|
||||
};
|
||||
|
||||
@@ -133,6 +133,16 @@
|
||||
};
|
||||
|
||||
services = {
|
||||
udev.packages = with pkgs; [
|
||||
vial
|
||||
];
|
||||
openssh = {
|
||||
enable = true;
|
||||
settings = {
|
||||
PasswordAuthentication = true;
|
||||
AllowUsers = null;
|
||||
};
|
||||
};
|
||||
pulseaudio.enable = false;
|
||||
xserver.enable = true;
|
||||
xserver.xkb = {
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
environment.systemPackages = map lib.lowPrio [
|
||||
pkgs.curl
|
||||
pkgs.gitMinimal
|
||||
pkgs.slack
|
||||
pkgs.teams-for-linux
|
||||
# pkgs.slack
|
||||
# pkgs.teams-for-linux
|
||||
pkgs.openvpn
|
||||
];
|
||||
networking = {
|
||||
|
||||
@@ -1,23 +1,14 @@
|
||||
# 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,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
];
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
@@ -28,7 +19,7 @@
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.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";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
};
|
||||
home = {
|
||||
username = "xmorel";
|
||||
homeDirectory = "/home/xmorel/";
|
||||
homeDirectory = "/home/xmorel";
|
||||
sessionVariables = {
|
||||
FLAKE = "/home/xmorel/nixos/";
|
||||
};
|
||||
packages = with pkgs; [
|
||||
devenv
|
||||
lazyjj
|
||||
slack
|
||||
# slack
|
||||
tailscale-systray
|
||||
tree
|
||||
ungoogled-chromium
|
||||
@@ -41,12 +41,16 @@
|
||||
};
|
||||
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
# package = pkgs.nix;
|
||||
settings = {
|
||||
auto-optimise-store = true;
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
trusted-users = [
|
||||
"root" "xmorel"
|
||||
"root"
|
||||
"xmorel"
|
||||
];
|
||||
};
|
||||
gc = {
|
||||
@@ -71,7 +75,7 @@
|
||||
direnv.enable = true;
|
||||
eza = {
|
||||
enable = true;
|
||||
extraOptions = ["--group-directories-first"];
|
||||
extraOptions = [ "--group-directories-first" ];
|
||||
git = true;
|
||||
icons = "auto";
|
||||
};
|
||||
@@ -85,8 +89,7 @@
|
||||
la = "eza -lah";
|
||||
man = "batman";
|
||||
};
|
||||
interactiveShellInit =
|
||||
''
|
||||
interactiveShellInit = ''
|
||||
source /usr/share/cachyos-fish-config/cachyos-config.fish
|
||||
fish_vi_key_bindings
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user