From 07634b295e1624d75f36d15830dc59939da3510b Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Sun, 23 Mar 2025 20:10:45 +0100 Subject: [PATCH] align lambda and mu --- flake.lock | 90 +++++++++++++++++--------------- flake.nix | 3 +- hosts/lambdaos/configuration.nix | 58 +++++++++++--------- hosts/muos/configuration.nix | 52 +++++++++--------- 4 files changed, 110 insertions(+), 93 deletions(-) diff --git a/flake.lock b/flake.lock index 428c967..83255b9 100644 --- a/flake.lock +++ b/flake.lock @@ -146,11 +146,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1742209773, - "narHash": "sha256-+d9zNzXHK/qQnWfFrjFxmCNJLm1JShsLNNViJxnKIpI=", + "lastModified": 1742641703, + "narHash": "sha256-hoN8blvJco8OSZmPj8izwQaQUdydVi+5FO4/nWd1MNU=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "0b2d5feae25fe6176b5844a689712a3a13954f12", + "rev": "216557e6cd229dbe7d73a497c227824a3c579cd7", "type": "github" }, "original": { @@ -285,11 +285,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1741986577, - "narHash": "sha256-WbYZnuapYJmP0+Bf5iWKVv4THpx2+SMSVS7x5eIrPjU=", + "lastModified": 1742562453, + "narHash": "sha256-0CEFzdmIOClxTBNgvqNU9LIB7+lJ1n/0Kg+Kmg2PgsA=", "owner": "itepastra", "repo": "disqalculate", - "rev": "fc4b8660bb252c1111c23b0e2cc19ffadee9b1ec", + "rev": "f1cc702f37e1a0e67e312ecda421f59fa8afee68", "type": "github" }, "original": { @@ -653,11 +653,11 @@ }, "hardware": { "locked": { - "lastModified": 1742217307, - "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -695,11 +695,11 @@ ] }, "locked": { - "lastModified": 1742246081, - "narHash": "sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc=", + "lastModified": 1742744903, + "narHash": "sha256-qd2uiGol/kb9Dk0vgOOLBl9VsycG0VfteM78OduFl2Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "c657142e24a43ea1035889f0b0a7c24598e0e18a", + "rev": "5ff90f09d1bd189b722e60798513724cdd3580b6", "type": "github" }, "original": { @@ -779,15 +779,17 @@ "lix": { "flake": false, "locked": { - "lastModified": 1737234286, - "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", - "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" + "lastModified": 1742751971, + "narHash": "sha256-bZDR10P9rn6CZAje5VZLdU+DB3/BH9JqH1Brl9JK1Yo=", + "ref": "refs/heads/main", + "rev": "53b41a7f9bb3822b0ca79ec47c5c10d6536cd479", + "revCount": 17713, + "type": "git", + "url": "https://git.lix.systems/lix-project/lix.git" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" } }, "lix-module": { @@ -800,15 +802,17 @@ ] }, "locked": { - "lastModified": 1737237494, - "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", - "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" + "lastModified": 1742709496, + "narHash": "sha256-6rWA8QlVe3HTCVHyI/gJ5IULyvHkT9d8fMpYC0Kyeh8=", + "ref": "refs/heads/main", + "rev": "d8e4fee796342636f345e358f33583c8b2fa496e", + "revCount": 137, + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module.git" }, "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module.git" } }, "mailserver": { @@ -821,11 +825,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1741986986, - "narHash": "sha256-V/OjvrJHCuTcPsT/JA/GGhDSrdOdUQp2HS4kk/7t1hQ=", + "lastModified": 1742413977, + "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "90539a1a993a7ec16563139e82fa66f1c439ba0f", + "rev": "b4fbffe79c00f19be94b86b4144ff67541613659", "type": "gitlab" }, "original": { @@ -841,11 +845,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1742276600, - "narHash": "sha256-muceB5DW++WPqrGKpX3Hkii/DNSMmFs2oQrYRYHmPiU=", + "lastModified": 1742719554, + "narHash": "sha256-zBB/Niset99u6/b6z9hS2IYfDigDI9huiG0QXvDKDS4=", "owner": "YaLTeR", "repo": "niri", - "rev": "e251ca7340bc71870c3a81a7ffc3d9bde58e685a", + "rev": "c709696237f3e963225b8df248538cc691ccba3d", "type": "github" }, "original": { @@ -914,11 +918,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742251239, - "narHash": "sha256-QH61lUWvO7jkZAzsgBJtyjmX5/UozZcSZQxOl10jVk4=", + "lastModified": 1742580728, + "narHash": "sha256-SyhAnd66UwtisdTOen13K5iSRkp/H+/w9tYH8c4AGKc=", "owner": "kaylorben", "repo": "nixcord", - "rev": "d7f44d000158fa46af9fae1819d8221d1ccb4ca2", + "rev": "b5f200ebbc880dd69ce06a9cd442fc758f426f87", "type": "github" }, "original": { @@ -975,11 +979,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -1103,11 +1107,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1742281270, - "narHash": "sha256-NZUaIKymDkk3TA9J2RvNqkcctP7YdaLvLVy/tuhuD3Y=", + "lastModified": 1742745220, + "narHash": "sha256-nR9RFygg7pazym+bdEvwdgVSocrVeuD7NDBdtleIe3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2664146806473dd3f98b79f6d1cf3221af2a31c0", + "rev": "a1293dacda7ae622d6aa6047cfcf7a89b4191aa3", "type": "github" }, "original": { @@ -1124,11 +1128,11 @@ ] }, "locked": { - "lastModified": 1742265167, - "narHash": "sha256-RB0UEF9IXIgwuuBFC+s9H4rDyvmMZePHlBAK4vRAwf4=", + "lastModified": 1742697269, + "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "87f0965f9f5b13fca9f38074eee8369dc767550d", + "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8d26c4c..a369007 100644 --- a/flake.nix +++ b/flake.nix @@ -69,8 +69,9 @@ }; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; + url = "git+https://git.lix.systems/lix-project/nixos-module.git"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.lix.url = "git+https://git.lix.systems/lix-project/lix.git"; }; nixcord = { diff --git a/hosts/lambdaos/configuration.nix b/hosts/lambdaos/configuration.nix index 1cc7b81..3614da7 100644 --- a/hosts/lambdaos/configuration.nix +++ b/hosts/lambdaos/configuration.nix @@ -46,6 +46,13 @@ }; }; + # Allow unfree packages + nixpkgs.config = { + allowUnfree = true; + nvidia.acceptLicense = true; + cudaSupport = true; + }; + nix.settings = { trusted-users = [ "noa" ]; sandbox = true; @@ -58,13 +65,6 @@ sandbox-paths = [ "/bin/sh=${pkgs.busybox-sandbox-shell.out}/bin/busybox" ]; }; - # Allow unfree packages - nixpkgs.config = { - allowUnfree = true; - nvidia.acceptLicense = true; - cudaSupport = true; - }; - networking = { hostName = "lambdaOS"; # Define your hostname. networkmanager.enable = true; @@ -147,11 +147,19 @@ }; environment = { - pathsToLink = [ "/share/zsh" ]; systemPackages = with pkgs; [ restic cudatoolkit ]; + plasma6.excludePackages = with pkgs.kdePackages; [ + plasma-browser-integration + konsole + xwaylandvideobridge + kate + khelpcenter + okular + elisa + ]; }; # TODO: find list of fonts to install @@ -161,19 +169,14 @@ fira-code fira-code-symbols liberation_ttf - maple-mono-NF + maple-mono.NF ]; xdg.portal = { enable = true; - configPackages = [ pkgs.niri ]; }; programs = { - nm-applet.enable = true; - - zsh.enable = true; - gnupg.agent = { enable = true; enableSSHSupport = true; @@ -184,18 +187,15 @@ enable = true; package = inputs.niri.packages.${pkgs.system}.niri; }; - nix-ld.enable = true; - - nix-ld.libraries = with pkgs; [ - wayland - ]; + nm-applet.enable = true; + zsh.enable = true; wireshark.enable = true; }; modules = { games.steam.enable = true; - plasma.enable = true; + plasma.enable = false; }; users.defaultUserShell = pkgs.zsh; @@ -203,13 +203,16 @@ security.rtkit.enable = true; boot = { kernelPackages = pkgs.linuxPackages_latest; + consoleLogLevel = 0; + initrd.verbose = false; plymouth = rec { enable = true; theme = "colorful"; themePackages = [ (pkgs.adi1090x-plymouth-themes.override { selected_themes = [ theme ]; }) ]; }; + kernelParams = [ "quiet" "splash" @@ -240,6 +243,13 @@ }; services = { + displayManager = { + defaultSession = "niri"; + sddm = { + enable = true; + wayland.enable = true; + }; + }; postgresql = { enable = true; ensureDatabases = [ "noa" ]; @@ -277,18 +287,15 @@ settings.PasswordAuthentication = false; settings.KbdInteractiveAuthentication = false; }; + thermald.enable = true; xserver = { enable = false; xkb = { layout = "us"; - variant = "intl"; + variant = "altgr intl"; }; videoDrivers = [ "nvidia" ]; }; - displayManager.sddm = { - enable = true; - wayland.enable = true; - }; udev.packages = [ pkgs.yubikey-personalization ]; }; @@ -360,6 +367,7 @@ }; security = { polkit.enable = true; + sudo.execWheelOnly = true; }; # Or disable the firewall altogether. diff --git a/hosts/muos/configuration.nix b/hosts/muos/configuration.nix index 5a6c13c..e734931 100644 --- a/hosts/muos/configuration.nix +++ b/hosts/muos/configuration.nix @@ -13,11 +13,12 @@ { imports = [ # Include the results of the hardware scan. - ../../modules/games/steam.nix - ./disk-config.nix ./hardware-configuration.nix + ../../modules/games/steam.nix ../../common + + ./disk-config.nix ]; powerManagement.enable = true; @@ -39,11 +40,31 @@ nixpkgs.config = { allowUnfree = true; }; - nixpkgs.overlays = [ ]; + + nix.settings = { + trusted-users = [ "noa" ]; + sandbox = true; + show-trace = true; + system-features = [ + "nixos-test" + "recursive-nix" + ]; + + sandbox-paths = [ "/bin/sh=${pkgs.busybox-sandbox-shell.out}/bin/busybox" ]; + }; networking = { hostName = "muOS"; # Define your hostname. networkmanager.enable = true; + firewall.allowedTCPPorts = [ + 53317 # Localsend + 22000 # syncthing + ]; + firewall.allowedUDPPorts = [ + 53317 + 22000 # syncthing + 21027 # syncthing + ]; }; # Set your time zone. @@ -114,11 +135,13 @@ fira-code fira-code-symbols liberation_ttf - maple-mono-NF + maple-mono.NF newcomputermodern ]; - xdg.portal.enable = true; + xdg.portal = { + enable = true; + }; programs = { gnupg.agent = { @@ -131,10 +154,6 @@ enable = true; package = inputs.niri.packages.${pkgs.system}.niri; }; - nix-ld.enable = false; - nix-ld.libraries = with pkgs; [ - wayland - ]; nm-applet.enable = true; wireshark.enable = true; @@ -281,21 +300,6 @@ sudo.execWheelOnly = true; }; - # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ - 53317 # Localsend - - 22000 # syncthing - ]; - networking.firewall.allowedUDPPorts = [ - 53317 - - 22000 # syncthing - 21027 # syncthing - ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave