diff --git a/common/colors.nix b/common/colors.nix index 073e890..8cc1060 100644 --- a/common/colors.nix +++ b/common/colors.nix @@ -1,10 +1,7 @@ { - config, - pkgs, nix-colors, ... }: - { imports = [ nix-colors.homeManagerModules.default diff --git a/flake.nix b/flake.nix index 2a26f00..8d26c4c 100644 --- a/flake.nix +++ b/flake.nix @@ -95,9 +95,11 @@ nixosConfigurations = { lambdaOS = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs; - inherit nix-colors; - inherit automapaper; + inherit + inputs + nix-colors + automapaper + ; }; modules = [ ./hosts/lambdaos/configuration.nix @@ -109,8 +111,10 @@ }; nuOS = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs; - inherit nix-colors; + inherit + inputs + nix-colors + ; }; modules = [ disko.nixosModules.disko @@ -122,9 +126,11 @@ }; muOS = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs; - inherit nix-colors; - inherit automapaper; + inherit + inputs + nix-colors + automapaper + ; }; modules = [ disko.nixosModules.disko diff --git a/hosts/lambdaos/configuration.nix b/hosts/lambdaos/configuration.nix index 40153c8..1cc7b81 100644 --- a/hosts/lambdaos/configuration.nix +++ b/hosts/lambdaos/configuration.nix @@ -7,7 +7,6 @@ pkgs, inputs, nix-colors, - lib, ... }: { @@ -167,7 +166,6 @@ xdg.portal = { enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-gnome ]; configPackages = [ pkgs.niri ]; }; diff --git a/hosts/muos/configuration.nix b/hosts/muos/configuration.nix index b38af3e..5a6c13c 100644 --- a/hosts/muos/configuration.nix +++ b/hosts/muos/configuration.nix @@ -43,10 +43,9 @@ networking = { hostName = "muOS"; # Define your hostname. + networkmanager.enable = true; }; - networking.networkmanager.enable = true; - # Set your time zone. time.timeZone = "Europe/Amsterdam"; @@ -55,9 +54,7 @@ # Define a user account. Don't forget to set a password with ‘passwd’. users.users = { - root = { - hashedPassword = "!"; - }; + root.hashedPassword = "!"; noa = { isNormalUser = true; description = "Noa Aarts"; @@ -134,7 +131,7 @@ enable = true; package = inputs.niri.packages.${pkgs.system}.niri; }; - nix-ld.enable = true; + nix-ld.enable = false; nix-ld.libraries = with pkgs; [ wayland ]; @@ -151,20 +148,20 @@ users.defaultUserShell = pkgs.zsh; security.rtkit.enable = true; - boot = rec { - + boot = { kernelPackages = pkgs.linuxPackages_latest; - extraModulePackages = with kernelPackages; [ - v4l2loopback - ]; + consoleLogLevel = 0; + initrd.verbose = false; plymouth = rec { enable = true; theme = "colorful"; themePackages = [ (pkgs.adi1090x-plymouth-themes.override { selected_themes = [ theme ]; }) ]; }; + kernelParams = [ + "plymouth.use-simpledrm" "quiet" "splash" "boot.shell_on_fail" @@ -176,15 +173,10 @@ ]; kernelModules = [ - "v4l2loopback" "nct6775" "k10temp" ]; - extraModprobeConfig = '' - options v4l2loopback devices=1 video_nr=2 card_label="OBS Cam" exclusive_caps=1 - ''; - loader = { timeout = 3; efi.canTouchEfiVariables = true; @@ -225,14 +217,13 @@ tlp.enable = true; power-profiles-daemon.enable = false; xserver = { - enable = true; + enable = false; xkb = { layout = "us"; - variant = "intl"; + variant = "altgr intl"; }; }; udev.packages = [ pkgs.yubikey-personalization ]; - upower.enable = true; }; systemd = { @@ -287,6 +278,7 @@ }; security = { polkit.enable = true; + sudo.execWheelOnly = true; }; # Open ports in the firewall. diff --git a/modules/applications/git.nix b/modules/applications/git.nix index 32319be..ee9d3e9 100644 --- a/modules/applications/git.nix +++ b/modules/applications/git.nix @@ -35,6 +35,7 @@ in safe.directory = "/etc/nixos"; pull.rebase = false; commit.gpgsign = cfg.do_sign; + push.autoSetupRemote = true; }; }; };