diff --git a/.gitignore b/.gitignore index 22a3bf8..1f8011a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ .session -modules/chataigne/squashfs-root diff --git a/configs/common.nix b/configs/common.nix deleted file mode 100644 index c8938f9..0000000 --- a/configs/common.nix +++ /dev/null @@ -1,332 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: { - imports = [ - /etc/nixos/hardware-configuration.nix - ]; - - # Nix settings - ## Limit Cores on rebuild and enable Flakes - nix = { - registry = { - voidarc = { - from = { - id = "voidarc"; - type = "indirect"; - }; - to = { - type = "git"; - url = "https://git.voidarc.co.uk/voidarc/flakes.git"; - }; - }; - }; - settings = { - cores = 6; - download-buffer-size = 524288000; - experimental-features = [ - "nix-command" - "flakes" - ]; - }; - }; - - ## Allow unfree packages and add pkgs.unstable - nixpkgs = { - config = { - allowUnfree = true; - packageOverrides = pkgs: { - unstable = import inputs.nixpkgs-unstable { - config = { - allowUnfree = true; - }; - }; - }; - }; - }; - - # Set correctly - nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; - - ## Optimise Nix store on rebuild and collect garbage as a service - nix.optimise.automatic = true; - nix.gc = { - automatic = true; - dates = "daily"; - options = "--delete-older-than 5d"; - }; - - # Bootloader theming and plymouth - boot = { - loader = { - timeout = 2; - efi = { - canTouchEfiVariables = true; - }; - grub = { - efiSupport = true; - device = "nodev"; - theme = pkgs.catppuccin-grub; - }; - }; - plymouth = { - enable = true; - theme = "catppuccin-mocha"; - themePackages = with pkgs; [ - # By default we would install all themes - (catppuccin-plymouth.override { - variant = "mocha"; - }) - ]; - }; - }; - - ## Use latest kernel - boot.kernelPackages = pkgs.linuxPackages_latest; - - # Bluetooth and Networking - hardware.bluetooth.enable = true; - hardware.xpadneo.enable = true; - - networking.networkmanager.enable = true; - networking.networkmanager.dns = "none"; - networking.nameservers = [ - "1.1.1.1" - "8.8.8.8" - ]; - - # Locale - time.timeZone = "Europe/London"; - i18n.defaultLocale = "en_GB.UTF-8"; - 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"; - }; - - # Userspace Stuff - ## Keymap - services.xserver.xkb = { - layout = "gb"; - variant = ""; - }; - console.keyMap = "uk"; - - ## Desktop - services.xserver.enable = true; - programs.hyprland = { - enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default; - }; - security.polkit.enable = true; - - ## Audio Server - services.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - }; - - # Local User - ## User config - users.users.user01 = { - isNormalUser = true; - shell = pkgs.zsh; - description = "user01"; - extraGroups = [ - "input" - "root" - "plugdev" - "bluetooth" - "networkmanager" - "docker" - "wheel" - ]; - packages = with pkgs; let - input = { - package, - output ? "default", - }: - inputs.${package}.packages.${pkgs.stdenv.hostPlatform.system}.${output}; - wrap = { - name, - pkg, - modules, - }: - pkgs.symlinkJoin { - inherit name; - paths = [pkg]; - nativeBuildInputs = [pkgs.makeWrapper]; - postBuild = '' - wrapProgram $out/bin/${name} \ - --prefix PATH : ${pkgs.lib.makeBinPath modules} - ''; - }; - in [ - # Ricing - ## Desktop - bibata-cursors - catppuccin-gtk - unstable.waybar - hyprlock - dunst - wlogout - wpaperd - quickshell - - ## Desktop Utilities - grimblast - gsettings-desktop-schemas - wl-clipboard - (wrap { - name = "otter-launcher"; - pkg = ( - input { - package = "otter-launcher"; - } - ); - modules = [ - chafa - jq - ]; - }) - (input {package = "fsel";}) - - # Terminal - ## Styling / Functionality - oh-my-posh - carapace - zsh-autocomplete - bat - - ## Tools - lazygit - p7zip-rar - any-nix-shell - bluetui - fzf - ripgrep - wget - htop - playerctl - git - lsd - (input { - package = "doot"; - }) - - ## Other CLI Apps - nodejs - fastfetch - opencode - tailscale - syncthing - jellyfin-tui - devenv - nix-output-monitor - - # Apps - ## Actual Useful Stuff - nemo - kitty - firefox - gotify-desktop - pavucontrol - mpv - input-remapper - - ## Other Nonsense - tor-browser - techmino - prismlauncher - delfin - ]; - }; - - ## Zsh - programs.zsh = { - enable = true; - enableCompletion = true; - enableBashCompletion = true; - autosuggestions.enable = true; - syntaxHighlighting.enable = true; - histSize = 10000; - ohMyZsh = { - enable = true; - plugins = [ - "git" - "dirhistory" - "history" - ]; - }; - }; - users.defaultUserShell = pkgs.zsh; - - ## User programs - programs = { - dconf.enable = true; - xfconf.enable = true; - gdk-pixbuf.modulePackages = [pkgs.librsvg]; # For wlogout svgs - }; - - ## User Services - services = { - gvfs.enable = true; - input-remapper.enable = true; - tailscale.enable = true; - printing.enable = true; - upower.enable = true; - openssh.enable = true; - avahi.enable = true; - }; - - ## Fonts - fonts.packages = with pkgs; [ - nerd-fonts.fira-mono - ]; - fonts.fontconfig.defaultFonts.serif = ["Fira Mono Nerd Font"]; - - # System Packages - environment.systemPackages = with pkgs; [ - # Utilities - inputs.nvim-wrapped.packages.${stdenv.hostPlatform.system}.default - vim - unzip - python315 - usbutils - curlWithGnuTls - - # System - mesa - pkg-config - vulkan-tools - gvfs - wayvnc - clang - xdg-desktop-portal - xdg-desktop-portal-hyprland - glib - gnutls - liblzf - librsvg - appimage-run - libnotify - gsettings-desktop-schemas - ]; - - # The comment - system.stateVersion = "25.05"; # Did you read the comment? -} diff --git a/configs/configuration-laptop.nix b/configs/configuration-laptop.nix deleted file mode 100644 index 72fe0c3..0000000 --- a/configs/configuration-laptop.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: { - networking.hostName = "mobile02"; # Define your hostname. - - # Opengl and vulkan - hardware.graphics = { - enable = true; - extraPackages = with pkgs; [ - intel-vaapi-driver - libva-vdpau-driver - ]; - }; - - services.displayManager.sddm = { - enable = true; - theme = "catppuccin-mocha-mauve"; - package = pkgs.kdePackages.sddm; - }; - - environment.systemPackages = with pkgs; [ - # Catppuccin sddm theme - (pkgs.catppuccin-sddm.override { - flavor = "mocha"; - font = "Fira Mono Nerd Font"; - fontSize = "11"; - background = null; - }) - ]; - - # Local User - users.users.user01 = { - extraGroups = []; - packages = with pkgs; [ - # Ricing - inputs.way-edges.packages.${stdenv.hostPlatform.system}.way-edges - inputs.chataigne.packages.${stdenv.hostPlatform.system}.default - - # Terminal - # Apps - ]; - }; - - programs.steam.enable = true; -} diff --git a/configs/configuration-pc.nix b/configs/configuration-pc.nix deleted file mode 100644 index fded34b..0000000 --- a/configs/configuration-pc.nix +++ /dev/null @@ -1,190 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: { - networking.hostName = "HACKSTATION"; - - # Enable nix-ld to run unpatched binaries - programs.nix-ld.enable = true; - programs.nix-ld.libraries = with pkgs; [ - stdenv.cc.cc - zlib - libusb1 - ]; - - # Add Samsung USB udev rules - services.udev.extraRules = '' - SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", GROUP="plugdev" - ''; - - hardware.amdgpu.initrd.enable = true; - - # Opengl and vulkan - hardware.graphics = { - enable = true; - extraPackages = with pkgs; [ - libva-vdpau-driver - libvdpau-va-gl - rocmPackages.clr.icd - ]; - enable32Bit = true; - }; - - # For rOCM - systemd.tmpfiles.rules = [ - "L+ /opt/rocm - - - - ${pkgs.rocmPackages.clr}" - ]; - - hardware.amdgpu.opencl.enable = true; - - boot.kernelParams = [ - "amdgpu.ppfeaturemask=0xffffffff" - ]; - - # Wake on Lan - networking.interfaces.enp5s0.wakeOnLan.enable = true; - networking.firewall.enable = false; - - systemd.services.NetworkManager-wait-online.enable = false; - - services.displayManager = { - autoLogin.enable = true; - autoLogin.user = "user01"; - sddm = { - enable = true; - }; - }; - - # Pipewire stuff - services.pipewire.extraConfig.pipewire."97-null-sink" = { - "context.objects" = [ - { - factory = "adapter"; - args = { - "factory.name" = "support.null-audio-sink"; - "node.name" = "Null-Sink"; - "node.description" = "Null Sink"; - "media.class" = "Audio/Sink"; - "audio.position" = "FL,FR"; - }; - } - { - factory = "adapter"; - args = { - "factory.name" = "support.null-audio-sink"; - "node.name" = "Null-Source"; - "node.description" = "Null Source"; - "media.class" = "Audio/Source"; - "audio.position" = "FL,FR"; - }; - } - ]; - }; - services.pipewire.extraConfig.pipewire."98-virtual-mic" = { - "context.modules" = [ - { - name = "libpipewire-module-loopback"; - args = { - "audio.position" = "FL,FR"; - "node.description" = "Mumble as Microphone"; - "capture.props" = { - # Mumble's output node name. - "node.target" = "Mumble"; - "node.passive" = true; - }; - "playback.props" = { - "node.name" = "Virtual-Mumble-Microphone"; - "media.class" = "Audio/Source"; - }; - }; - } - ]; - }; - - # Mumble server - services.murmur = { - enable = true; - bandwidth = 540000; - bonjour = true; - password = "mumblepass"; - autobanTime = 0; - }; - - # Local User - users.users.user01 = { - extraGroups = [ - "docker" - "input" - "udev" - "wheel" - ]; - packages = with pkgs; [ - bottles - mumble - gajim - ferdium - delfin - docker - orca-slicer - ffmpeg - inputs.norgolith.packages.${pkgs.stdenv.hostPlatform.system}.default - inputs.cracked-davinci.packages.${pkgs.stdenv.hostPlatform.system}.default - inputs.woomer.packages.${pkgs.stdenv.hostPlatform.system}.default - - # wine - wineWow64Packages.stable - winetricks - wine - wine64 - freetype - ]; - }; - - environment.systemPackages = [ - inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.wrapped - ]; - - programs.obs-studio = { - enable = true; - }; - - programs.wshowkeys = { - enable = true; - package = inputs.wshowkeys.packages.${pkgs.stdenv.hostPlatform.system}.default; - }; - - programs.steam = { - enable = true; - protontricks.enable = true; - extraCompatPackages = with pkgs; [ - proton-ge-bin - ]; - package = pkgs.steam.override { - extraEnv = { - LD_AUDIT = "${ - inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam - }/library-inject.so:${ - inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam - }/SLSsteam.so"; - }; - }; - }; - - services.unbound = { - enable = true; - }; - - services.wivrn = { - enable = true; - package = pkgs.unstable.wivrn; - openFirewall = true; - }; - - virtualisation.docker = { - enable = true; - enableOnBoot = false; - }; -} diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 7f2a3b7..0000000 --- a/flake.lock +++ /dev/null @@ -1,1243 +0,0 @@ -{ - "nodes": { - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1780756231, - "narHash": "sha256-tXQxKdG5716uB9/LIkLQqQwHKf5mRSpHoZhz3lyI2Cg=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "6ecde03f47172753fe5a2f334f9d3facfb7e6784", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, - "beaker-src": { - "flake": false, - "locked": { - "lastModified": 1780436704, - "narHash": "sha256-3aMH1YblnpiXKdkQVMRLmMZ5/8G7vB4HAfLg7+izyHg=", - "ref": "refs/heads/master", - "rev": "360d6271e1a20d128430e52637d5d35f4c706ca5", - "revCount": 34, - "shallow": false, - "type": "git", - "url": "https://git.bwaaa.monster/beaker" - }, - "original": { - "shallow": false, - "type": "git", - "url": "https://git.bwaaa.monster/beaker" - } - }, - "chataigne": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "path": "./modules/chataigne", - "type": "path" - }, - "original": { - "path": "./modules/chataigne", - "type": "path" - }, - "parent": [] - }, - "cracked-davinci": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "nixpkgs-pinned": "nixpkgs-pinned" - }, - "locked": { - "lastModified": 1782405315, - "narHash": "sha256-pZKG7KOr1NPtWwzfEnRZvAi7Uvndd4LiC0OVHjf5IPE=", - "ref": "refs/heads/main", - "rev": "c9859df9bd3781c63d838a1a90d22129885a910b", - "revCount": 5, - "type": "git", - "url": "https://git.voidarc.co.uk/voidarc/nixos.davinci" - }, - "original": { - "type": "git", - "url": "https://git.voidarc.co.uk/voidarc/nixos.davinci" - } - }, - "crane": { - "locked": { - "lastModified": 1781825982, - "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "doot": { - "inputs": { - "doot-src": "doot-src", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1767536004, - "narHash": "sha256-jvKYKYVUF+jQoWR5umYSaAk9IGFkV3j1n+tiOgupZjw=", - "owner": "voidarclabs", - "repo": "nixos.doot", - "rev": "78898e11478aad96df7d462d8d5deed99974be80", - "type": "github" - }, - "original": { - "owner": "voidarclabs", - "repo": "nixos.doot", - "type": "github" - } - }, - "doot-src": { - "flake": false, - "locked": { - "lastModified": 1760873580, - "narHash": "sha256-h7JNd6748vUpDw7wriMyN9jLV9m/BE2yan2VCQzar1Q=", - "owner": "pol-rivero", - "repo": "doot", - "rev": "05b1036d3457bbf49169ac161e7b62c8eb031684", - "type": "github" - }, - "original": { - "owner": "pol-rivero", - "repo": "doot", - "type": "github" - } - }, - "fenix": { - "inputs": { - "nixpkgs": [ - "fsel", - "naersk", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1752475459, - "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "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" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_4" - }, - "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" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_6" - }, - "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" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_7" - }, - "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" - } - }, - "fsel": { - "inputs": { - "flake-utils": "flake-utils", - "naersk": "naersk", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1779043781, - "narHash": "sha256-7YoRc6jOuQUI0yv3qBHFhc60G/RG0LwVsKkN90UkPn4=", - "owner": "Mjoyufull", - "repo": "fsel", - "rev": "6b6ae52e3a2c254007e8a2c332a8d5de99428ba5", - "type": "github" - }, - "original": { - "owner": "Mjoyufull", - "repo": "fsel", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "otter-launcher", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769638001, - "narHash": "sha256-hGwdJ/+oo+IRo2TiWV/V8BWWptQihcdFV/olTONaHqg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "bd9f031efc634be4b80c5090b9171cc3a9f8e49c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776511930, - "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "39435900785d0c560c6ae8777d29f28617d031ef", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776426399, - "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-guiutils": "hyprland-guiutils", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_4", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_3", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1781453652, - "narHash": "sha256-BHkT6VFjkjO80YoheG0m9YuAMy3S78Ipr27vAbvZEIw=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "179c2bce0355289c60271fb00b89f2d5511618d5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-guiutils": { - "inputs": { - "aquamarine": [ - "hyprland", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprtoolkit": "hyprtoolkit", - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776426575, - "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "rev": "a968d211048e3ed538e47b84cb3649299578f19d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1772460177, - "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1777320127, - "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprtoolkit": { - "inputs": { - "aquamarine": [ - "hyprland", - "hyprland-guiutils", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprland-guiutils", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprland-guiutils", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-guiutils", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland-guiutils", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "hyprland-guiutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-guiutils", - "systems" - ] - }, - "locked": { - "lastModified": 1772462885, - "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", - "owner": "hyprwm", - "repo": "hyprtoolkit", - "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprtoolkit", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1780251518, - "narHash": "sha256-fG9xbb1SOAAJ+2kJRakp3ch+BmA/3dEg/K3PoAZTKkw=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "40ede2e7bdec80ba5d4c443160d905e9f841ae5f", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1777159683, - "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwire": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1778410714, - "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=", - "owner": "hyprwm", - "repo": "hyprwire", - "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwire", - "type": "github" - } - }, - "naersk": { - "inputs": { - "fenix": "fenix", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1776200608, - "narHash": "sha256-broZ6RFQr4Fv0wT73gGmzNX14A43TmTFF8g4wDKlNss=", - "owner": "nix-community", - "repo": "naersk", - "rev": "8b23250ab45c2a38cd91031aee26478ca4d0a28e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1780952837, - "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-pinned": { - "locked": { - "lastModified": 1772567409, - "narHash": "sha256-qspxGige37s/66q9sptyG5VA/l2IOmMMZVJ4Xhta2wU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e4ec59bc1152b09a4843702e4a49381194f065a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e4ec59bc1152b09a4843702e4a49381194f065a2", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1782233679, - "narHash": "sha256-QyuGP5+QOtmXpy4i2X4DhBVBaySBdDKQEhqKcphcp34=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "667d5cf1c59585031d743c78b394b0a647537c35", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1752077645, - "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1780749050, - "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1781216227, - "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1782467914, - "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1769170682, - "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c5296fdd05cfa2c187990dd909864da9658df755", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "norgolith": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1781412130, - "narHash": "sha256-TqXOX3N+tLVa+rjdppBpQSLwVVjSlqpQOrGTgKxur5M=", - "owner": "NTBBloodbath", - "repo": "norgolith", - "rev": "a7d8e257b75f03448ae8d19265fa033afe45fd74", - "type": "github" - }, - "original": { - "owner": "NTBBloodbath", - "repo": "norgolith", - "type": "github" - } - }, - "nvim-wrapped": { - "inputs": { - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1782650144, - "narHash": "sha256-E6SKjvY6Vz2mRok6ml8Dm4lMgUyfgtwHgwLlo93SLpI=", - "ref": "refs/heads/main", - "rev": "45739fc4cf0ba3cdefab6593a0d629b637bb341a", - "revCount": 88, - "type": "git", - "url": "file:///home/user01/.dotfiles/.config/nvim" - }, - "original": { - "type": "git", - "url": "file:///home/user01/.dotfiles/.config/nvim" - } - }, - "omnisearch": { - "inputs": { - "beaker-src": "beaker-src", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1780508528, - "narHash": "sha256-0OkItQH4D8KcS+mIxgrzGHTHMl7Eb6ZHzTN3UmZbtWI=", - "ref": "refs/heads/master", - "rev": "e48c6366d07e0357afa379dff7b73328589164e5", - "revCount": 131, - "type": "git", - "url": "https://git.voidarc.co.uk/voidarc/omnisearch" - }, - "original": { - "type": "git", - "url": "https://git.voidarc.co.uk/voidarc/omnisearch" - } - }, - "otter-launcher": { - "inputs": { - "flake-parts": "flake-parts", - "home-manager": "home-manager", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_5" - }, - "locked": { - "lastModified": 1780973227, - "narHash": "sha256-vlNT2248Oxg3++bk8ZkozsU4wDbxOkh6dl3GeoBmmXE=", - "owner": "kuokuo123", - "repo": "otter-launcher", - "rev": "764a38d1de308da3268222692652a0a85bb71eee", - "type": "github" - }, - "original": { - "owner": "kuokuo123", - "repo": "otter-launcher", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1778507602, - "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "chataigne": "chataigne", - "cracked-davinci": "cracked-davinci", - "doot": "doot", - "fsel": "fsel", - "hyprland": "hyprland", - "nixpkgs": "nixpkgs_5", - "nixpkgs-unstable": "nixpkgs-unstable", - "norgolith": "norgolith", - "nvim-wrapped": "nvim-wrapped", - "omnisearch": "omnisearch", - "otter-launcher": "otter-launcher", - "sls-steam": "sls-steam", - "way-edges": "way-edges", - "woomer": "woomer", - "wshowkeys": "wshowkeys" - } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1752428706, - "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "way-edges", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761878277, - "narHash": "sha256-6fCtyVdTzoQejwoextAu7dCLoy5fyD3WVh+Qm7t2Nhg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "6604534e44090c917db714faa58d47861657690c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "sls-steam": { - "inputs": { - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1781157498, - "narHash": "sha256-gDNHztsHGFAmbbj7Gcu8vWcFU5+4c1EeGU4lhb7Hnqo=", - "owner": "AceSLS", - "repo": "SLSsteam", - "rev": "981da676e76f72b1ed3c387f192509ac9a1b91e4", - "type": "github" - }, - "original": { - "owner": "AceSLS", - "repo": "SLSsteam", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems" - }, - "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" - } - }, - "way-edges": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1777079101, - "narHash": "sha256-FwJ+4YgLncn0iG7dSB5Ax++24DNbxyIBDE7uqr/n80U=", - "owner": "way-edges", - "repo": "way-edges", - "rev": "b7c582094d8999b1a83d6738ec7d7abf1464cf54", - "type": "github" - }, - "original": { - "owner": "way-edges", - "repo": "way-edges", - "type": "github" - } - }, - "woomer": { - "inputs": { - "crane": "crane", - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1782507996, - "narHash": "sha256-hO+SIA6Q41hiwZBFGHBjkOsRQFUcO0SbJqmYeyy2sfM=", - "owner": "voidarclabs", - "repo": "woomer", - "rev": "572844bdae8dded0bbad9e23ca354dcd857f6b98", - "type": "github" - }, - "original": { - "owner": "voidarclabs", - "repo": "woomer", - "type": "github" - } - }, - "wshowkeys": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1781708685, - "narHash": "sha256-NH5b736WoI9LodJKPlonO1X+Lxg8URMLLRkT5to61Zg=", - "owner": "voidarclabs", - "repo": "wshowkeys", - "rev": "47dfb7a0237acbf847ca28cbb88000b33929f50a", - "type": "github" - }, - "original": { - "owner": "voidarclabs", - "repo": "wshowkeys", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1780133819, - "narHash": "sha256-0YPKIY3dlnR7SPq7Z8ekFVvzFsfeiAtEj+QUI3KHrlI=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "4a170c0ba96fd37374f93d8f91c9ed91814828ac", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix index 46aaa7e..345b16f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,86 +4,10 @@ inputs = { # System nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - nvim-wrapped.url = "git+file:///home/user01/.dotfiles/.config/nvim"; - hyprland.url = "github:hyprwm/Hyprland"; - # Apps - sls-steam.url = "github:AceSLS/SLSsteam"; - woomer = { - url = "github:voidarclabs/woomer"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - chataigne.url = "./modules/chataigne"; - norgolith = { - url = "github:NTBBloodbath/norgolith"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - wshowkeys = { - url = "github:voidarclabs/wshowkeys"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # Utils - doot = { - url = "github:voidarclabs/nixos.doot"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - way-edges = { - url = "github:way-edges/way-edges"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - otter-launcher = { - url = "github:kuokuo123/otter-launcher"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - fsel = { - url = "github:Mjoyufull/fsel"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # Davinci-resolve - cracked-davinci.url = "git+https://git.voidarc.co.uk/voidarc/nixos.davinci"; - - omnisearch = { - url = "git+https://git.voidarc.co.uk/voidarc/omnisearch"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + flake-parts.url = "github:hercules-ci/flake-parts"; + import-tree.url = "github:vic/import-tree"; }; - outputs = { - self, - nixpkgs, - ... - } @ inputs: let - system = "x86_64-linux"; - - hardwareConfig = import /etc/nixos/hardware-configuration.nix; - common = import ./configs/common.nix; - - mkSystem = extraModules: - nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = - [ - common - hardwareConfig - ] - ++ extraModules; - }; - in { - nixosConfigurations = { - mobile02 = mkSystem [./configs/configuration-laptop.nix]; - hackstation = mkSystem [ - ./configs/configuration-pc.nix - # ./modules/davinci/davinci.nix - ./modules/i3/i3.nix - inputs.omnisearch.nixosModules.default - { - services.omnisearch.enable = true; - } - ]; - }; - }; + outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules); } diff --git a/modules/chataigne/Chataigne-linux-x64-1.10.3.AppImage b/modules/chataigne/Chataigne-linux-x64-1.10.3.AppImage deleted file mode 100755 index 04c4965..0000000 Binary files a/modules/chataigne/Chataigne-linux-x64-1.10.3.AppImage and /dev/null differ diff --git a/modules/chataigne/flake.lock b/modules/chataigne/flake.lock deleted file mode 100644 index 0f6d111..0000000 --- a/modules/chataigne/flake.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1780952837, - "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/modules/chataigne/flake.nix b/modules/chataigne/flake.nix deleted file mode 100644 index d8c5d2e..0000000 --- a/modules/chataigne/flake.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - description = "Local wrapper for Chataigne AppImage"; - - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; - }; - - outputs = { - self, - nixpkgs, - }: let - system = "x86_64-linux"; - pkgs = import nixpkgs {inherit system;}; - - # The libraries you requested - deps = with pkgs; [ - curlFull - gnutls - libxrandr - alsa-lib - freetype - avahi - libglvnd - curl - SDL2 - hidapi - libpulseaudio - lz4 - openssl - libcap - libxcrypt - libgcrypt - libbsd - zlib - glib - ]; - - # Wrap the local AppImage file - chataigne-bin = pkgs.appimageTools.wrapType2 { - pname = "chataigne"; - version = "1.10.3"; - # This points to the file in the same directory as flake.nix - src = ./Chataigne-linux-x64-1.10.3.AppImage; - extraPkgs = pkgs: deps; - }; - - # Create the Desktop Entry - chataigne-desktop = pkgs.makeDesktopItem { - name = "chataigne"; - exec = "chataigne"; - icon = "chataigne"; - comment = "Modular machine for art and technology"; - desktopName = "Chataigne"; - categories = [ - "AudioVideo" - "Development" - ]; - }; - in { - # packages.${system}.default = chataigne-bin; - - devShells.${system}.default = pkgs.mkShell { - # Packages you want available in your shell - buildInputs = [ - chataigne-bin - ]; - - # Environmental variables or shell hooks - shellHook = '' - echo "something" - ''; - }; - # This allows you to run 'nix run' or install it via system config - packages.${system}.default = pkgs.symlinkJoin { - name = "chataigne"; - paths = [ - chataigne-bin - chataigne-desktop - ]; - }; - }; -} diff --git a/modules/hosts/HACKSTATION/default.nix b/modules/hosts/HACKSTATION/default.nix new file mode 100644 index 0000000..4b7efc0 --- /dev/null +++ b/modules/hosts/HACKSTATION/default.nix @@ -0,0 +1,11 @@ +{ + self, + inputs, + ... +}: { + flake.nixosConfigurations.desktop = inputs.nixpkgs.lib.nixosSystem { + modules = [ + self.nixosModules.desktopConfiguration + ]; + }; +} diff --git a/modules/i3/i3.nix b/modules/i3/i3.nix deleted file mode 100644 index 01e1d0d..0000000 --- a/modules/i3/i3.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: { - services.libinput.enable = true; - - services.displayManager.defaultSession = "hyprland"; - services.xserver = { - enable = true; - - desktopManager = { - xterm.enable = false; - }; - - windowManager.i3 = { - enable = true; - extraPackages = with pkgs; [ - dmenu # application launcher most people use - i3status # gives you the default i3 status bar - xinit - ]; - }; - }; -}