From 66f7edf9a3d980158bf7caaef0e11151b0f94c3e Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 16 Jul 2025 20:59:28 +0200 Subject: [PATCH] feat: fix duplicate config on work config & some minor changes --- dev-flakes/flake.lock | 12 ++++++------ flake.nix | 4 ++-- hosts/home/configuration.nix | 12 +++++++++++- hosts/work/configuration.nix | 4 ++-- hosts/work/hardware-configuration.nix | 21 ++++++--------------- hosts/work/home.nix | 25 ++++++++++++++----------- 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/dev-flakes/flake.lock b/dev-flakes/flake.lock index 04f5b88..4c96982 100644 --- a/dev-flakes/flake.lock +++ b/dev-flakes/flake.lock @@ -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": { diff --git a/flake.nix b/flake.nix index 581e31b..c818c90 100644 --- a/flake.nix +++ b/flake.nix @@ -10,8 +10,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; }; disko = { "url" = "github:nix-community/disko"; diff --git a/hosts/home/configuration.nix b/hosts/home/configuration.nix index 82b8c94..9dc0ceb 100644 --- a/hosts/home/configuration.nix +++ b/hosts/home/configuration.nix @@ -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 = { diff --git a/hosts/work/configuration.nix b/hosts/work/configuration.nix index ad957ed..064315a 100644 --- a/hosts/work/configuration.nix +++ b/hosts/work/configuration.nix @@ -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 = { diff --git a/hosts/work/hardware-configuration.nix b/hosts/work/hardware-configuration.nix index 2d365b9..f6555c5 100644 --- a/hosts/work/hardware-configuration.nix +++ b/hosts/work/hardware-configuration.nix @@ -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..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; diff --git a/hosts/work/home.nix b/hosts/work/home.nix index 3ec7958..9040485 100644 --- a/hosts/work/home.nix +++ b/hosts/work/home.nix @@ -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 = { @@ -61,8 +65,8 @@ programs = { awscli.enable = true; bat = { - enable = true; - extraPackages = with pkgs.bat-extras; [ batman ]; + enable = true; + extraPackages = with pkgs.bat-extras; [ batman ]; }; btop = { enable = true; @@ -71,7 +75,7 @@ direnv.enable = true; eza = { enable = true; - extraOptions = ["--group-directories-first"]; + extraOptions = [ "--group-directories-first" ]; git = true; icons = "auto"; }; @@ -85,11 +89,10 @@ la = "eza -lah"; man = "batman"; }; - interactiveShellInit = - '' + interactiveShellInit = '' source /usr/share/cachyos-fish-config/cachyos-config.fish fish_vi_key_bindings - ''; + ''; }; fzf.enable = true; gh.enable = true;