diff --git a/configuration.nix b/configuration.nix index edcb418..268caaf 100644 --- a/configuration.nix +++ b/configuration.nix @@ -41,6 +41,9 @@ in ''; }; + services.rpcbind.enable = true; + boot.supportedFilesystems = [ "nfs" ]; + services.dbus.packages = with pkgs; [ gsettings-desktop-schemas ]; @@ -53,6 +56,10 @@ in } ]; + networking.hosts = { + #"192.168.1.165" = [ "walruslab.org" ]; + }; + services.netbird.enable = true; # Enable NAT so the container can reach the Debian repos @@ -64,7 +71,7 @@ in services.resolved = { enable = true; - dnssec = "false"; + settings.Resolve.DNSSEC = "false"; }; networking.nameservers = [ "1.1.1.1" @@ -211,7 +218,7 @@ in # List packages installed in system profile. # You can use https://search.nixos.org/ to find more packages (and options). environment.systemPackages = with pkgs; [ - openmodelica + #openmodelica vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. pkg-config wget diff --git a/flake.lock b/flake.lock index dfdfaaa..c03f2f1 100644 --- a/flake.lock +++ b/flake.lock @@ -77,11 +77,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1748906842, - "narHash": "sha256-KWpXXXciUDJp2DitQWT8MNzhECBuHA2SRPz51t0bZG0=", + "lastModified": 1778551011, + "narHash": "sha256-woJV7tJwwzjR0xWDNuGpwMENe/OEMAdSGg+nqWs9tUE=", "owner": "helix-editor", "repo": "helix", - "rev": "1ea9050a5e12a1bc3eeb4b81022f427688c5ffa9", + "rev": "8c41b11607924f7584b77c8a6e6b16439a2f559f", "type": "github" }, "original": { @@ -448,11 +448,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { @@ -480,16 +480,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1767634882, - "narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -534,11 +534,11 @@ ] }, "locked": { - "lastModified": 1740623427, - "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=", + "lastModified": 1775358767, + "narHash": "sha256-f2eC+WIfhjevCPQILuV08i/kmKZzYZpUvkom/33VxCA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab", + "rev": "20fd44bc663daa53a2575e01293e24e681d62244", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 438ec5c..f1d489d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "A simple NixOS flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; helix.url = "github:helix-editor/helix/master"; home-manager = { url = "github:nix-community/home-manager/release-25.11"; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index c8b28a4..5137732 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -52,7 +52,8 @@ "hid_apple.fnmode" = 2; "net.ipv4.ip_unprivileged_port_start" = 80; "kernel.split_lock_mitigate" = 0; - "fs.inotify.max_user_watches" = 524288; + "fs.inotify.max_user_watches" = 1048576; + "fs.inotify.max_user_instances" = 512; }; fileSystems."/" = { @@ -119,4 +120,6 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + hardware.nvidia-container-toolkit.enable = true; } diff --git a/modules/home/fish/aliases.nix b/modules/home/fish/aliases.nix index 6fa5f2f..9de328f 100644 --- a/modules/home/fish/aliases.nix +++ b/modules/home/fish/aliases.nix @@ -4,7 +4,7 @@ c = "clear"; rb = "sudo nixos-rebuild switch --flake ~/nixos-config#"; "boot-rb" = "sudo nixos-rebuild --install-bootloader boot --flake ~/nixos-config#"; - clc = "cloc . --exclude-dir=target,node_modules,.venv --exclude-ext=yml,yaml,csv -v"; + clc = "cloc . --vcs git -v"; "dry-rb" = "sudo nixos-rebuild dry-build --flake ~/nixos-config#"; devim = "NVIM_APPNAME=nvim-dev nvim"; win = "grub-reboot 'Windows Boot Manager (on /dev/sda2)' && reboot"; diff --git a/modules/home/fish/functions.nix b/modules/home/fish/functions.nix index 8dd5650..a76463b 100644 --- a/modules/home/fish/functions.nix +++ b/modules/home/fish/functions.nix @@ -21,5 +21,6 @@ end fish_add_path $HOME/.cargo/bin + fish_add_path /usr/bin ''; } diff --git a/modules/home/git.nix b/modules/home/git.nix index 053ce72..d7374e9 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -11,6 +11,8 @@ init.defaultBranch = "main"; core.editor = "nvim"; push.autoSetupRemote = true; + push.followTags = true; }; + lfs.enable = true; }; } diff --git a/modules/ld.nix b/modules/ld.nix index 7494a51..340f3c9 100644 --- a/modules/ld.nix +++ b/modules/ld.nix @@ -1,6 +1,7 @@ { pkgs }: -with pkgs; [ +with pkgs; +[ alsa-lib libgit2 at-spi2-atk @@ -46,24 +47,26 @@ with pkgs; [ pipewire systemd vulkan-loader - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.libxkbfile - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxcb + libxkbfile + libxshmfence zlib zlib.dev pkg-config haskellPackages.zlib stdenv.cc.cc imagemagick + + steam-unwrapped ] diff --git a/overlays/bambu-studio.nix b/overlays/bambu-studio.nix index e4485a7..4b5d66d 100644 --- a/overlays/bambu-studio.nix +++ b/overlays/bambu-studio.nix @@ -6,8 +6,8 @@ final: prev: { ubuntu_version = "24.04"; src = prev.fetchurl { - url = "https://github.com/bambulab/BambuStudio/releases/download/v02.07.00.55/BambuStudio_ubuntu-24.04-v02.07.00.55-20260514170313.AppImage"; - sha256 = "sha256-7zdTsLyw509iNPbt1VIDPL937E0aZYEJNftQGZcF5sY="; + url = "https://github.com/bambulab/BambuStudio/releases/download/v02.06.00.51/BambuStudio_ubuntu-24.04-v02.06.00.51-20260417160415.AppImage"; + sha256 = "sha256-CYePefJ7FXcAK+OXsIaNRHkml18BA7um4W2+f6l49zQ="; }; profile = '' diff --git a/pkgs/games.nix b/pkgs/games.nix index 3aefa12..18e6184 100644 --- a/pkgs/games.nix +++ b/pkgs/games.nix @@ -1,4 +1,7 @@ { pkgs, ... }: with pkgs; -[ flightgear ] +[ + flightgear + alvr +] diff --git a/pkgs/programming.nix b/pkgs/programming.nix index 39ca856..fb177a2 100644 --- a/pkgs/programming.nix +++ b/pkgs/programming.nix @@ -29,9 +29,11 @@ with pkgs; pynvim wand ipykernel + shapely + scipy + pip ] )) - python313Packages.pip nodejs go ninja diff --git a/pkgs/tools.nix b/pkgs/tools.nix index 56fdb48..4ea6065 100644 --- a/pkgs/tools.nix +++ b/pkgs/tools.nix @@ -8,6 +8,7 @@ with pkgs; google-chrome speed-cloudflare-cli ansible + ansible-lint vagrant gqrx libreoffice @@ -23,20 +24,20 @@ with pkgs; qbittorrent gmsh paraview - xorg.xcursorgen + xcursorgen imagemagick icoutils win2xcur waypaper - swww + awww sdrpp rofi hyprshot vesktop discordo distrobox - #kicad - youtube-music + kicad + pear-desktop thunderbird yt-dlp stellarium @@ -74,4 +75,8 @@ with pkgs; orca-slicer netbird-ui sonic-visualiser + + freecad + + lmms ] diff --git a/pkgs/unstable.nix b/pkgs/unstable.nix index 98293d0..913e538 100644 --- a/pkgs/unstable.nix +++ b/pkgs/unstable.nix @@ -4,5 +4,4 @@ with pkgs; [ - unstable.kicad ] diff --git a/pkgs/util.nix b/pkgs/util.nix index 8010d50..6d7fa8d 100644 --- a/pkgs/util.nix +++ b/pkgs/util.nix @@ -4,7 +4,7 @@ with pkgs; [ - neofetch + fastfetch nnn # terminal file manager nushell @@ -114,4 +114,38 @@ with pkgs; kdePackages.qt6ct kitty axel + stlink + sysdig + cilium-cli + + emacs + emacsPackages.doom + + nfs-utils + + openvswitch + virt-viewer + patchelf + + velero + + rpi-imager + + fluxcd-operator + + vault + + msitools + + age + + (llm.withPlugins { + llm-ollama = true; + }) + + python313Packages.huggingface-hub + python313Packages.markitdown + ipmitool + + kubevirt ] diff --git a/services/x.nix b/services/x.nix index 2564623..8815d66 100644 --- a/services/x.nix +++ b/services/x.nix @@ -30,6 +30,8 @@ services.picom.enable = true; + programs.niri.enable = true; + services.xserver.windowManager.xmonad = { enable = true; enableContribAndExtras = true;