From 5683ef172fe19d37777fff9a859a7b090eee22b3 Mon Sep 17 00:00:00 2001 From: alyx Date: Sat, 7 Feb 2026 19:23:04 +0000 Subject: [PATCH] flake updates - calufrax addition - possibly not being updated more because i am not planning to use nixos for much longer but keeping this here for the poss i do --- base/absolution/configuration.nix | 3 +- base/calufrax/configuration.nix | 227 +++++++++++++++++ base/calufrax/default.nix | 9 + base/calufrax/hardware-configuration.nix | 33 +++ base/overrides.nix | 18 +- flake.lock | 297 +++++++++++++---------- flake.nix | 37 ++- home/default.nix | 4 +- home/packages.nix | 6 +- 9 files changed, 485 insertions(+), 149 deletions(-) create mode 100644 base/calufrax/configuration.nix create mode 100644 base/calufrax/default.nix create mode 100644 base/calufrax/hardware-configuration.nix diff --git a/base/absolution/configuration.nix b/base/absolution/configuration.nix index a768923..038b4a2 100644 --- a/base/absolution/configuration.nix +++ b/base/absolution/configuration.nix @@ -285,8 +285,7 @@ vulkan-tools r2modman index_camera_passthrough - wayvr-dashboard - wlx-overlay-s + wayvr r2mod_cli git lact diff --git a/base/calufrax/configuration.nix b/base/calufrax/configuration.nix new file mode 100644 index 0000000..7b8e4ab --- /dev/null +++ b/base/calufrax/configuration.nix @@ -0,0 +1,227 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, lib, inputs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + programs.nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + flake = "/home/alyx/.config/nixos"; + }; + + programs.firejail = { + enable = true; + wrappedBinaries = { + packettracer9 = { + executable = lib.getExe pkgs.ciscoPacketTracer9; + + # Will still want a .desktop entry as the package is not directly added + desktop = "${pkgs.ciscoPacketTracer9}/share/applications/cisco-packet-tracer-9.desktop"; + + extraArgs = [ + # This should make it run in isolated netns, preventing internet access + "--net=none" + + # firejail is only needed for network isolation so no futher profile is needed + "--noprofile" + + # Packet tracer doesn't play nice with dark QT themes so this + # should unset the theme. Uncomment if you have this issue. + ''--env=QT_STYLE_OVERRIDE=""'' + ]; + }; + }; + }; + + programs.bash.shellAliases = { + nano = "nvim"; + }; + + nixpkgs.config.rocmSupport = true; + + services = { + asusd = { + enable = true; + enableUserService = true; + }; + }; + + + nix.package = pkgs.lix; + + nix.settings.auto-optimise-store = true; + + services.desktopManager.plasma6.enable = true; + services.displayManager.sddm.enable = true; + + environment.pathsToLink = [ "/share/xdg-desktop-portal" ]; + + programs = { + #niri = { + # enable = true; + # package = inputs.niri.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable; + #}; + flashrom.enable = true; + mango.enable = true; + nix-ld.enable = true; + nix-ld.libraries = with pkgs; [xorg.libxcb libao xorg.libX11 libusb1 cargo rustc pkg-config cacert]; + }; + + services.journald.extraConfig = '' + SystemMaxUse=2G + ''; + + services.tailscale = { + enable = true; + useRoutingFeatures = "both"; + }; + + boot.supportedFilesystems = ["exfat" "ntfs" "xfs"]; + boot.loader.limine.enable = true; + boot.loader.limine.style.wallpapers = []; + boot.loader.limine.additionalFiles = { + "efi/memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi"; + "efi/shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi"; + }; + boot.loader.limine.extraEntries = '' + /memtest86 + protocol: efi + path: boot():/limine/efi/memtest86/memtest86.efi + /shell + protocol: efi + path: boot():/limine/efi/shell.efi + ''; + boot.loader.efi.canTouchEfiVariables = true; + boot.initrd.systemd.enable = true; + boot.loader.efi.efiSysMountPoint = "/boot/"; + boot.kernelParams = [ "i915.force_probe=!7d51" "xe.force_probe=7d51" ]; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest; + + boot.initrd.luks.devices = { + crypted = { + device = "/dev/disk/by-partuuid/766fb1bb-e9a0-4b72-b261-83edab61c560"; + allowDiscards = true; # Used if primary device is a SSD + preLVM = true; + }; + }; + + networking.hostName = "calufrax"; # Define your hostname. + + powerManagement.cpuFreqGovernor = "performance"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + hardware.graphics = { + enable = true; + enable32Bit = true; + extraPackages = with pkgs; [vpl-gpu-rt mesa.opencl libvdpau-va-gl intel-media-driver intel-vaapi-driver libva-vdpau-driver vulkan-validation-layers]; + extraPackages32 = with pkgs; [driversi686Linux.mesa.opencl]; + }; + + hardware.bluetooth.enable = true; + services.blueman.enable = true; + + networking.networkmanager = { + enable = true; + # wifi.backend = "iwd"; + }; + + # Set your time zone. + time.timeZone = "Europe/London"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_GB.UTF-8"; + + services.udisks2.enable = true; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_GB.UTF-8"; + LC_IDENTIFICATION = "en_GB.UTF-8"; + LC_MEASUREMENT = "en_GB.UTF-8"; + LC_MONETARY = "en_GB.UTF-8"; + LC_NAME = "en_GB.UTF-8"; + LC_NUMERIC = "en_GB.UTF-8"; + LC_PAPER = "en_GB.UTF-8"; + LC_TELEPHONE = "en_GB.UTF-8"; + LC_TIME = "en_GB.UTF-8"; + }; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # Enable the X11 windowing system. + programs.dconf.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "gb"; + variant = "colemak"; + }; + + console.useXkbConfig = true; + console.earlySetup = true; + + # Enable CUPS to print documents. + services.printing.enable = true; + services.printing.drivers = [pkgs.gutenprint]; + + security = { + rtkit.enable = true; + }; + + # Enable sound with pipewire. + services.pulseaudio.enable = false; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + jack.enable = true; + }; + + # Define a user account. Don't forget to set a password with ‘passwd’. + + users.users.alyx = { + isNormalUser = true; + description = "Alyx"; + extraGroups = [ "networkmanager" "wheel" "camera" "pipewire" ]; + packages = with pkgs; [ + ]; + }; + + services.libinput.enable = true; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + environment.systemPackages = with pkgs; [ + wget + ciscoPacketTracer9 + neovim + cbfstool + git + #inputs.niri.packages.${pkgs.stdenv.hostPlatform.system}.xwayland-satellite-stable + pulseaudio + winetricks + p7zip + cabextract + unzip + wineWowPackages.stable + (pkgs.python3.withPackages (ps: with ps; [tkinter])) + ]; + + system.stateVersion = "24.11"; # Did you read the comment? + +} + diff --git a/base/calufrax/default.nix b/base/calufrax/default.nix new file mode 100644 index 0000000..54a1411 --- /dev/null +++ b/base/calufrax/default.nix @@ -0,0 +1,9 @@ +{config, pkgs, ...}:{ + imports = [ + ./configuration.nix + ../overrides.nix + ../ssh.nix + ../substituters.nix + ../fonts.nix + ]; +} diff --git a/base/calufrax/hardware-configuration.nix b/base/calufrax/hardware-configuration.nix new file mode 100644 index 0000000..22daae1 --- /dev/null +++ b/base/calufrax/hardware-configuration.nix @@ -0,0 +1,33 @@ +# 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, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/mapper/vg-nixos"; + fsType = "xfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/51FA-C615"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = + [ { device = "/dev/mapper/vg-swap"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/base/overrides.nix b/base/overrides.nix index 70123af..7309aeb 100644 --- a/base/overrides.nix +++ b/base/overrides.nix @@ -66,23 +66,8 @@ gamescopeSession.enable = true; protontricks.enable = true; extraPackages = with pkgs; [ - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXScrnSaver - xorg.libxcb - libpng - libpulseaudio - libvorbis - stdenv.cc.cc.lib - libkrb5 - keyutils gamemode - procps - usbutils - ] ++ config.fonts.packages; - extraCompatPackages = with pkgs; [ - steamtinkerlaunch + libpulseaudio ]; remotePlay.openFirewall = true; # Open ports in the fire> dedicatedServer.openFirewall = true; # Open ports in the> @@ -92,7 +77,6 @@ nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" "libsoup-2.74.3" - "intel-media-sdk-23.2.2" ]; } diff --git a/flake.lock b/flake.lock index 284b335..ecebbb9 100644 --- a/flake.lock +++ b/flake.lock @@ -15,6 +15,24 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -22,11 +40,11 @@ ] }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -56,24 +74,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1763228015, - "narHash": "sha256-1rYieMVUyZ3kK/cBIr8mOusxrOEJ1/+2MsOg0oJ7b3A=", + "lastModified": 1769978395, + "narHash": "sha256-gj1yP3spUb1vGtaF5qPhshd2j0cg4xf51pklDsIm19Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "96156a9e86281c4bfc451236bc2ddfe4317e6f39", + "rev": "984708c34d3495a518e6ab6b8633469bbca2f77a", "type": "github" }, "original": { @@ -94,45 +94,17 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763223001, - "narHash": "sha256-Hi6XxTJJjKsDrO+D0fYXS88ehCYzQkZlp9qxX1zoM1s=", + "lastModified": 1769857393, + "narHash": "sha256-3sgdsShDEyA/Jd+VKS8cI2GYHfkS482zH80QcXBF77E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "68a1bcc019378272e601558719f82005a80ddab0", + "rev": "91d6a007c918d3e862ec2418babfe271a4f7bfaa", "type": "github" }, "original": { @@ -141,6 +113,28 @@ "type": "github" } }, + "mango": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "scenefx": "scenefx" + }, + "locked": { + "lastModified": 1770084942, + "narHash": "sha256-wrGWA4PV4DsS4lKEgB+0ymUNyCSouvNa/OOSMsSPzB8=", + "owner": "DreamMaoMao", + "repo": "mango", + "rev": "50b67ac539e65f68ae177de258c7f2fca59bc350", + "type": "github" + }, + "original": { + "owner": "DreamMaoMao", + "repo": "mango", + "type": "github" + } + }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -151,11 +145,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763126448, - "narHash": "sha256-LVYJJObvkWwR8QB/Srr6Rks+Fw2lYvnRNOH0etV9DM8=", + "lastModified": 1770095660, + "narHash": "sha256-fWm0lhe+ebOUOKLsuk0r+XcNTd60RR5HaujSIvdT4zc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "add7bcf2925547e180cc2fe6d5f4b5e7c579d086", + "rev": "a0db8b047eb7132f6175d15cc5bc73135d8d0a98", "type": "github" }, "original": { @@ -184,11 +178,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763014447, - "narHash": "sha256-nmu7S8J9IJKLQyIkSU8QWYHygrfw76NHGTkcr+bXMX0=", + "lastModified": 1770092965, + "narHash": "sha256-++K1ftjwPqMJzIO8t2GsdkYQzC2LLA5A1w21Uo+SLz4=", "owner": "YaLTeR", "repo": "niri", - "rev": "a52df533c4694b5ed0a04140af60fd26146df911", + "rev": "189917c93329c86ac2ddd89f459c26a028d590ba", "type": "github" }, "original": { @@ -226,11 +220,11 @@ ] }, "locked": { - "lastModified": 1763265660, - "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "469ef53571ea80890c9497952787920c79c1ee6e", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -241,11 +235,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -255,18 +249,33 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1770056022, + "narHash": "sha256-yvCz+Qmci1bVucXEyac3TdoSPMtjqVJmVy5wro6j/70=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "d04d8548aed39902419f14a8537006426dc1e4fa", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -276,15 +285,16 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_4", + "nvfetcher": "nvfetcher", "systems": "systems", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1763257269, - "narHash": "sha256-L7hobkC7G7rxNatvxgz5RbMQaIVwObj7l1Pz3utx4Pk=", + "lastModified": 1770084921, + "narHash": "sha256-BfbUL69IOa+LnnAaxt2/ylbC/KhMGr3soe8n11avJME=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "d80a797b330a98df365cd25fd8350afbe5a5da83", + "rev": "88eabef1f8415752a0a3ea537e4c62a62b353205", "type": "github" }, "original": { @@ -295,11 +305,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1770019141, + "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", "type": "github" }, "original": { @@ -311,11 +321,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763187301, - "narHash": "sha256-VgArs7MjFH0XRjZ/dWrUA1bDiJTld9Q824HQdLD3eFU=", + "lastModified": 1770069191, + "narHash": "sha256-AQViNPaTmklcKsR4gKOYCpDOBgrK14zUECvG5AcmhOM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66d930cb8792aea66f1bb2562f26f08d2ce8c3db", + "rev": "8593781d9013d8ed248ff9d6bfa0b530464e4efb", "type": "github" }, "original": { @@ -327,11 +337,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1770019141, + "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", "type": "github" }, "original": { @@ -343,11 +353,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1762943920, - "narHash": "sha256-ITeH8GBpQTw9457ICZBddQEBjlXMmilML067q0e6vqY=", + "lastModified": 1768875095, + "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91c9a64ce2a84e648d0cf9671274bb9c2fb9ba60", + "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0", "type": "github" }, "original": { @@ -359,17 +369,16 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_5", - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1763212728, - "narHash": "sha256-XVK0A+Le5vDSwAiwpNTRLM50HbwjpPVWnYelCUhAkjI=", + "lastModified": 1770025103, + "narHash": "sha256-Qlb19PP0n6s+v1MywVjROV5XwsCvA58XXiXHk0Govb4=", "owner": "nix-community", "repo": "nixvim", - "rev": "074c68468cc4751efa9ac3f65b2e63e4ad409b7a", + "rev": "31c3b3687dc85e3fbbf5c44728a5ee231608f8a9", "type": "github" }, "original": { @@ -378,26 +387,33 @@ "type": "github" } }, - "nuschtosSearch": { + "nvfetcher": { "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx", + "flake-compat": [ + "nixpkgs-xr", + "flake-compat" + ], + "flake-utils": [ + "nixpkgs-xr", + "flake-utils" + ], "nixpkgs": [ - "nixvim", + "nixpkgs-xr", "nixpkgs" ] }, "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", + "lastModified": 1766178214, + "narHash": "sha256-tKDXreDwrRkdjvfot5fr1++ed6oOq3+/hW/Dj8WfTgs=", + "owner": "Red-M", + "repo": "nvfetcher", + "rev": "a84b3ce67f1d7acd85b3aa2b9967ab91ed6e7a71", "type": "github" }, "original": { - "owner": "NuschtOS", - "repo": "search", + "owner": "Red-M", + "repo": "nvfetcher", + "rev": "a84b3ce67f1d7acd85b3aa2b9967ab91ed6e7a71", "type": "github" } }, @@ -405,11 +421,34 @@ "inputs": { "home-manager": "home-manager", "jovian": "jovian", + "mango": "mango", "niri": "niri", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_3", "nixpkgs-xr": "nixpkgs-xr", - "nixvim": "nixvim" + "nixvim": "nixvim", + "zen-browser": "zen-browser" + } + }, + "scenefx": { + "inputs": { + "nixpkgs": [ + "mango", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750785057, + "narHash": "sha256-tGX6j4W91rcb+glXJo43sjPI9zQvPotonknG1BdihR4=", + "owner": "wlrfx", + "repo": "scenefx", + "rev": "3a6cfb12e4ba97b43326357d14f7b3e40897adfc", + "type": "github" + }, + "original": { + "owner": "wlrfx", + "repo": "scenefx", + "type": "github" } }, "systems": { @@ -442,21 +481,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -465,11 +489,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1769691507, + "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b", "type": "github" }, "original": { @@ -498,11 +522,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762747449, - "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", + "lastModified": 1770083504, + "narHash": "sha256-1CB57EPNjZOAjMeFzkG5wbzjuLuKT317alEK6JUf9sc=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "6338574bc5c036487486acde264f38f39ea15fad", + "rev": "75c9f5e77573b36b8d341c28c0d32e9c9a0a2309", "type": "github" }, "original": { @@ -510,6 +534,29 @@ "repo": "xwayland-satellite", "type": "github" } + }, + "zen-browser": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770097899, + "narHash": "sha256-FKRpvwWR96VDW4bdsxIrZgIAXvdXqsCTaV1HghCJBoQ=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "615a27db86f3fddd0f096b5e9ea832795a4608d1", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e6d82f2..fca6b46 100644 --- a/flake.nix +++ b/flake.nix @@ -8,12 +8,23 @@ nixpkgs-xr.url = "github:nix-community/nixpkgs-xr"; nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + zen-browser = { + url = "github:0xc000022070/zen-browser-flake"; + inputs = { + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + }; + }; nixvim.url = "github:nix-community/nixvim"; niri.url = "github:sodiboo/niri-flake"; jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; + mango = { + url = "github:DreamMaoMao/mango"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = inputs@{ self, nixpkgs, home-manager, niri, nixpkgs-xr, jovian, ...}:{ + outputs = inputs@{ self, nixpkgs, home-manager, niri, nixpkgs-xr, jovian, mango, ...}:{ nixosConfigurations."absolution" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; @@ -38,6 +49,30 @@ } ]; }; + nixosConfigurations."calufrax" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + ./base/calufrax + mango.nixosModules.mango + home-manager.nixosModules.home-manager { + home-manager.extraSpecialArgs = { + inherit inputs; + vars = { + isNixOS = true; + isBritish = true; + useSyncthing = false; + class = "desktop"; + user = "alyx"; + }; + }; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.sharedModules = [{ imports = with inputs; [ mango.hmModules.mango nix-index-database.homeModules.nix-index nixvim.homeModules.nixvim niri.homeModules.niri ];}]; + home-manager.users.alyx = ./home; + } + ]; + }; nixosConfigurations."patio" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; diff --git a/home/default.nix b/home/default.nix index 6f2700f..7416edf 100644 --- a/home/default.nix +++ b/home/default.nix @@ -3,7 +3,7 @@ #aux files to make finding specific things easier # ./theming.nix ./nixvim - ./niri.nix +# ./niri.nix ./packages.nix #general user packages not managed by home-manager but i want to install via hm anyways ]; home = rec { @@ -46,6 +46,8 @@ services.mpd-discord-rpc.enable = true; + wayland.windowManager.mango.enable = true; + programs.waybar = { enable = true; }; diff --git a/home/packages.nix b/home/packages.nix index 764b9c5..31ebdb5 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -1,5 +1,6 @@ -{pkgs, vars, ...}:{ +{pkgs, vars, inputs, ...}:{ home.packages = with pkgs; [ + android-tools blender brightnessctl bs-manager @@ -12,11 +13,11 @@ grayjay hyfetch inkscape + inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default kanshi libnotify mpc nemo - nextcloud-client pavucontrol playerctl prismlauncher @@ -31,7 +32,6 @@ wl-clipboard wlr-randr wttrbar - wlx-overlay-s ]; }