From 86916bf54a49da588f84ca2a94c2448564d52e52 Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:57:27 -0400 Subject: [PATCH] 20000 things --- common/pinned.nix | 24 +++-- common/pkgs.nix | 24 ++++- common/programs/default.nix | 0 common/programs/java.nix | 0 common/programs/wireshark.nix | 12 +++ common/programs/zoxide.nix | 0 common/shell.nix | 1 + .../users/homeModules/jetbrains/default.nix | 5 + .../jetbrains/ja-netfilter/base.nix | 55 +++++++++++ .../jetbrains/ja-netfilter/default.nix | 22 +++++ .../jetbrains/ja-netfilter/packages.nix | 69 +++++++++++++ .../users/homeModules/jetbrains/overlays.nix | 96 +++++++++++++++++++ common/users/homeModules/notion.nix | 22 +++++ common/users/meyer/home.nix | 2 + customPackages/default.nix | 12 ++- flake.lock | 48 +++++----- flake.nix | 1 + 17 files changed, 358 insertions(+), 35 deletions(-) delete mode 100644 common/programs/default.nix delete mode 100644 common/programs/java.nix delete mode 100644 common/programs/zoxide.nix create mode 100644 common/users/homeModules/jetbrains/default.nix create mode 100644 common/users/homeModules/jetbrains/ja-netfilter/base.nix create mode 100644 common/users/homeModules/jetbrains/ja-netfilter/default.nix create mode 100644 common/users/homeModules/jetbrains/ja-netfilter/packages.nix create mode 100644 common/users/homeModules/jetbrains/overlays.nix create mode 100644 common/users/homeModules/notion.nix diff --git a/common/pinned.nix b/common/pinned.nix index 5e672f8..5b3fbc1 100644 --- a/common/pinned.nix +++ b/common/pinned.nix @@ -1,8 +1,8 @@ # https://lazamar.co.uk/nix-versions/ { pkgs, config }: -let +{ # 1.89.1 - vsc_pkgs = import + vscode = (import (builtins.fetchGit { # Descriptive name to make the store path easier to identify name = "my-old-revision"; @@ -15,9 +15,19 @@ let config = { allowUnfree = true; }; - }; - a = vsc_pkgs.vscode; -in -{ - vscode = a; + }).vscode; + etcher = (import + (builtins.fetchGit { + # Descriptive name to make the store path easier to identify + name = "my-old-revision"; + url = "https://github.com/NixOS/nixpkgs/"; + ref = "refs/heads/nixpkgs-unstable"; + rev = "336eda0d07dc5e2be1f923990ad9fdb6bc8e28e3"; + }) + { + system = pkgs.system; + config = { + permittedInsecurePackages = [ "electron-19.1.9" ]; + }; + }).etcher; } diff --git a/common/pkgs.nix b/common/pkgs.nix index 47738d9..bdecc9d 100644 --- a/common/pkgs.nix +++ b/common/pkgs.nix @@ -5,10 +5,13 @@ let in { dev = with pkgs;[ + meson + deno + rustup + android-studio-tools vscode-langservers-extracted cmake nodePackages_latest.typescript-language-server - cargo lua go eslint_d @@ -30,7 +33,13 @@ in gh glib glibc - (python39.withPackages (ps: with ps;[ + (python312.withPackages (ps: with ps;[ + pytesseract + pillow + pyzbar + pygobject3 + nanoid + loguru evdev setuptools xlib @@ -38,8 +47,16 @@ in nodejs_22 ]; gui = with pkgs;[ + cpkg.frog + legcord + obsidian + bottles + parsec-bin + jadx + android-studio wireshark pinned.vscode + pinned.etcher insomnia teamviewer davinci-resolve @@ -73,7 +90,7 @@ in pulseaudioFull pavucontrol # jetbrains.pycharm-community - jetbrains.idea-community-bin + jbeap.idea-ultimate google-chrome bitwarden nerdfonts @@ -90,6 +107,7 @@ in ]; general = with pkgs; [ imagemagick + onefetch p7zip dig bat diff --git a/common/programs/default.nix b/common/programs/default.nix deleted file mode 100644 index e69de29..0000000 diff --git a/common/programs/java.nix b/common/programs/java.nix deleted file mode 100644 index e69de29..0000000 diff --git a/common/programs/wireshark.nix b/common/programs/wireshark.nix index 32ae4bd..d848355 100644 --- a/common/programs/wireshark.nix +++ b/common/programs/wireshark.nix @@ -4,6 +4,18 @@ enable = true; }; }; + boot = { + kernelModules = [ + "usbmon" + ]; + }; + services = { + udev = { + extraRules = '' + SUBSYSTEM=="usbmon", GROUP="wireshark", MODE="640" + ''; + }; + }; users = { users = { "${NAME}" = { diff --git a/common/programs/zoxide.nix b/common/programs/zoxide.nix deleted file mode 100644 index e69de29..0000000 diff --git a/common/shell.nix b/common/shell.nix index 21d2efe..2910e58 100644 --- a/common/shell.nix +++ b/common/shell.nix @@ -10,6 +10,7 @@ ]; aliases = common.aliases // { lg = "lazygit"; + sd = ''lsusb | grep Elgato | grep --perl-regexp "(?<=Device 0{0,10})[1-9]+" --only-matching | xargs printf "usb.device_address eq %s" | copy''; }; }; common = { diff --git a/common/users/homeModules/jetbrains/default.nix b/common/users/homeModules/jetbrains/default.nix new file mode 100644 index 0000000..87f9ee5 --- /dev/null +++ b/common/users/homeModules/jetbrains/default.nix @@ -0,0 +1,5 @@ +{...}: { + imports = [ + ./overlays.nix + ]; +} diff --git a/common/users/homeModules/jetbrains/ja-netfilter/base.nix b/common/users/homeModules/jetbrains/ja-netfilter/base.nix new file mode 100644 index 0000000..ea83af2 --- /dev/null +++ b/common/users/homeModules/jetbrains/ja-netfilter/base.nix @@ -0,0 +1,55 @@ +# use the source luke +# +# +{ pname, version, src, depsHash, targetJar, renameJar, }: +{ lib, stdenv, callPackage, maven, jdk8, buildMaven, }: +let + inherit pname version src; + + mavenDeps = stdenv.mkDerivation { + name = "${pname}-${version}-deps"; + inherit src; + + nativeBuildInputs = [ jdk8 maven ]; + buildPhase = '' + mvn package \ + -Dmaven.test.skip=true \ + -Dmaven.repo.local=$out \ + -Dmaven.wagon.rto=5000 + ''; + + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside + installPhase = '' + find $out -type f \ + -name \*.lastUpdated -or \ + -name resolver-status.properties -or \ + -name _remote.repositories \ + -delete + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = depsHash; + + doCheck = false; + }; +in stdenv.mkDerivation { + inherit pname version src; + + buildInputs = [ jdk8 maven ]; + buildPhase = '' + runHook preBuild + + mvn package --offline \ + -Dmaven.test.skip=true \ + -Dmaven.repo.local=${mavenDeps.outPath} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm644 target/${targetJar} $out/${renameJar} + runHook postInstall + ''; +} diff --git a/common/users/homeModules/jetbrains/ja-netfilter/default.nix b/common/users/homeModules/jetbrains/ja-netfilter/default.nix new file mode 100644 index 0000000..9ce5d9c --- /dev/null +++ b/common/users/homeModules/jetbrains/ja-netfilter/default.nix @@ -0,0 +1,22 @@ +{ lib, writeTextDir, callPackage, symlinkJoin, programName ? null +, enabledPlugins ? null, pluginConfigs ? null, }: +let + packages = callPackage ./packages.nix { }; + ja-netfilter = callPackage packages.ja-netfilter { }; + callPlugin = name: callPackage packages."plugin-${name}" { }; + pluginPackages = + lib.optionals (enabledPlugins != null) (map callPlugin enabledPlugins); + configFiles = lib.optionals (pluginConfigs != null) (lib.mapAttrsToList + (name: value: writeTextDir "share/ja-netfilter/config/${name}.conf" value) + pluginConfigs); +in symlinkJoin { + name = if programName == null then + "ja-netfilter" + else + "ja-netfilter-${programName}"; + paths = [ ja-netfilter ] ++ pluginPackages ++ configFiles; + postBuild = lib.optionalString (programName != null) '' + mv $out/share/ja-netfilter/plugins $out/share/ja-netfilter/plugins-${programName} + mv $out/share/ja-netfilter/config $out/share/ja-netfilter/config-${programName} + ''; +} diff --git a/common/users/homeModules/jetbrains/ja-netfilter/packages.nix b/common/users/homeModules/jetbrains/ja-netfilter/packages.nix new file mode 100644 index 0000000..e9c8973 --- /dev/null +++ b/common/users/homeModules/jetbrains/ja-netfilter/packages.nix @@ -0,0 +1,69 @@ +{ fetchgit, }: +let + repoOwner = "ja-netfilter"; + baseName = "ja-netfilter"; + + packageBase = import ./base.nix; + pluginBase = { name, version, srcHash, depsHash, }: + packageBase { + pname = "${baseName}-plugin-${name}"; + src = fetchgit { + url = "https://gitee.com/${repoOwner}/plugin-${name}.git"; + rev = version; + sha256 = srcHash; + }; + # maven outputs the jar name with an extra `v` in the version segment + targetJar = "${name}-v${version}-jar-with-dependencies.jar"; + renameJar = "share/${baseName}/plugins/${name}.jar"; + inherit version depsHash; + }; +in { + ja-netfilter = packageBase rec { + pname = baseName; + version = "2022.2.0"; + src = fetchgit { + url = "https://gitee.com/${repoOwner}/ja-netfilter.git"; + rev = version; + sha256 = "sha256-jlRJ2r9EnbaqG7tGhJduFCchORdraZL3aTBa1btgMIU="; + }; + depsHash = "sha256-wwcPeTi1J6L+PCIpxR8oe5cXozAmT/phc1BeqXV94EQ="; + targetJar = "ja-netfilter-jar-with-dependencies.jar"; + renameJar = "share/${baseName}/ja-netfilter.jar"; + }; + plugin-dns = pluginBase { + name = "dns"; + version = "v1.1.0"; + srcHash = "sha256-JSBGjQY7KmO7pcrATY5Ql9eg+hQUHqy9869uINLz+Fo="; + depsHash = "sha256-wwcPeTi1J6L+PCIpxR8oe5cXozAmT/phc1BeqXV94EQ="; + }; + plugin-url = pluginBase { + name = "url"; + version = "v1.1.0"; + srcHash = "sha256-7YiiPDjQr6vN933svHwz1yK3PdWTsY2SeJsw+PBv+zY="; + depsHash = "sha256-wwcPeTi1J6L+PCIpxR8oe5cXozAmT/phc1BeqXV94EQ="; + }; + plugin-hideme = pluginBase { + name = "hideme"; + version = "v1.1.0"; + srcHash = "sha256-tGAesHIGmdlp2PCTfX5zrikqjD9ZiQ+0tLsJFGiWwPQ="; + depsHash = "sha256-wwcPeTi1J6L+PCIpxR8oe5cXozAmT/phc1BeqXV94EQ="; + }; + plugin-dump = pluginBase { + name = "dump"; + version = "v1.0.1"; + srcHash = ""; + depsHash = ""; + }; + plugin-native = pluginBase { + name = "native"; + version = "v1.0.0"; + srcHash = ""; + depsHash = ""; + }; + plugin-power = pluginBase { + name = "power"; + version = "v1.1.0"; + srcHash = "sha256-sTjHvpQYF6soRIDhPspCdLYqLfZwPCjERq1EhIvX9z0="; + depsHash = "sha256-Szem5aDq5n8927tnin9XnXraqEJVHCuczg3N1D4PHAU="; + }; +} diff --git a/common/users/homeModules/jetbrains/overlays.nix b/common/users/homeModules/jetbrains/overlays.nix new file mode 100644 index 0000000..bf172a9 --- /dev/null +++ b/common/users/homeModules/jetbrains/overlays.nix @@ -0,0 +1,96 @@ +{ config, lib, ... }: { + nixpkgs.overlays = [ + (pkgs: _: { + ja-netfilter = pkgs.callPackage ./ja-netfilter { inherit lib; }; + }) + (final: pkgs: + let + inherit (pkgs) jetbrains; + globalPlugins = [ + "164" + "17718" + ]; + ja-netfilter = pkgs.ja-netfilter.override { + programName = "jetbrains"; + enabledPlugins = [ "dns" "url" "hideme" "power" ]; + pluginConfigs = { + dns = '' + [DNS] + EQUAL,jetbrains.com + EQUAL,plugin.obroom.com + ''; + url = '' + [URL] + PREFIX,https://account.jetbrains.com/lservice/rpc/validateKey.action + ''; + power = '' + [Result] + ; Suit 230914 + EQUAL,75888623192465772084955377951198306702135327313062315225563718470653661793801719178647553532410237467495550800187973529202133466238825354135988657390766050197160093050945611087414688022502220060564716139142356429494315004946432334067127515081383336664162877126600357077796107641437507844835265792365885264118815924123978949395829736969354441202826225673948313261585644898954777409621857150971668073862687253868141869122469331021430401371289707681211947592819675200121184556360932201089199282211738120006888533563163642302207579745484728384486428222208213812291528007428530070242454238203928550683105421062331094750845145505608972009635176965215115688208740845303355991059521804735078574469432870400787428253602342729300042328170420659062588195293985517003844343989763104027328569042852690996233875190439074960872926324787157115483523118473430609411096400697894536993294915535905449630056538884982426205451557516203033628658808550799424730131437543420952769712793044255279152357141856290356977839447381244929084411487482957782888343837193520146442780899122074573307925429597225835206724304378622338028349953089952976438255759582568115277066791679931555627913314296216846420738487344812850701846117667234235837952975099539950423673283,65537,860106576952879101192782278876319243486072481962999610484027161162448933268423045647258145695082284265933019120714643752088997312766689988016808929265129401027490891810902278465065056686129972085119605237470899952751915070244375173428976413406363879128531449407795115913715863867259163957682164040613505040314747660800424242248055421184038777878268502955477482203711835548014501087778959157112423823275878824729132393281517778742463067583320091009916141454657614089600126948087954465055321987012989937065785013284988096504657892738536613208311013047138019418152103262155848541574327484510025594166239784429845180875774012229784878903603491426732347994359380330103328705981064044872334790365894924494923595382470094461546336020961505275530597716457288511366082299255537762891238136381924520749228412559219346777184174219999640906007205260040707839706131662149325151230558316068068139406816080119906833578907759960298749494098180107991752250725928647349597506532778539709852254478061194098069801549845163358315116260915270480057699929968468068015735162890213859113563672040630687357054902747438421559817252127187138838514773245413540030800888215961904267348727206110582505606182944023582459006406137831940959195566364811905585377246353->31872219281407242025505148642475109331663948030010491344733687844358944945421064967310388547820970408352359213697487269225694990179009814674781374751323403257628081559561462351695605167675284372388551941279783515209238245831229026662363729380633136520288327292047232179909791526492877475417113579821717193807584807644097527647305469671333646868883650312280989663788656507661713409911267085806708237966730821529702498972114194166091819277582149433578383639532136271637219758962252614390071122773223025154710411681628917523557526099053858210363406122853294409830276270946292893988830514538950951686480580886602618927728470029090747400687617046511462665469446846624685614084264191213318074804549715573780408305977947238915527798680393538207482620648181504876534152430149355791756374642327623133843473947861771150672096834149014464956451480803326284417202116346454345929350148770746553056995922154382822307758515805142704373984019252210715650875853634697920708113806880196144197384637328982263167395073688501517286678083973976140696077590122053014085412828620051470085033364773099146103525313018873319293728800442101520384088109603555959893639842091339193857485407672132882577840295039058621747654642202620767068924079813640067442975 + EQUAL,4567779103874449240239662079205755693310005494862953689035396528991239683757589293624793159086473078120525402705628668311011890736316009197336637618610678228335893871114776326732074651573599517183986646340269857646364268233297330841971478101796167577290403903951299979151237090006996215332833149647379173998334898565513245453314930221017432024042566544774579402202436449192695033949441775713989000390069186056155554036916655795953904286792217740042538667425813361568996822385856479840230242261144865693876294228019553278637298651584820286962308928945030622629481823105481646878879253938847572671471342492590603058305,65537,24156627931985958051017183040835577271803742470193804806479316178045088981962804168393398987646446251087541768081971475544151551235525470790716604369379805327668466429966167642117961353233058515180243264560201783520956161510523416923017697354365782825500659342029196527776056976223174394946371372849906309277537461992299774200098515526818746947230488275456663264920440977381968978227273889068919338259949793686590492904029279861913225794809675826299753284990778166519152326723946780528965868736869495336993456735232755342913885746267768375682771655854436236934171901662660193080235109535758464079136573948168636773471->986236757547332986472011617696226561292849812918563355472727826767720188564083584387121625107510786855734801053524719833194566624465665316622563244215340671405971599343902468620306327831715457360719532421388780770165778156818229863337344187575566725786793391480600129482653072861971002459947277805295727097226389568776499707662505334062639449916265137796823793276300221537201727072401742985542559596685092673521228140822200236743113743661549252453726123450722876929538747702356573783116366629850199080495560991841329893037291900147497007197055572787780928474439121910577036698817920238800419515637284683828672110 + + [Args] + EQUAL,65537,24773058818499217187577663886010908531303294206336895556072197892590450942803807164562754911175164262596715237551312004078542654996496301487027034803410086499747369353221485073240039340641397198525027728751956658900801359887190562885573922317930300068615009483578963467556425525328780085523172495307229112069939166202511721671904748968934606589702999279663332403655662225374084460291376706916679151764149324177444374590606643838366605181996272409014933080082205048098737253668016260658830645459388519595314928290853199112791333551144805347785109465401055719331231478162870216035573012645710763533896540021550083104281->3,24773058818499217187577663886010908531303294206336895556072197892590450942803807164562754911175164262596715237551312004078542654996496301487027034803410086499747369353221485073240039340641397198525027728751956658900801359887190562885573922317930300068615009483578963467556425525328780085523172495307229112069939166202511721671904748968934606589702999279663332403655662225374084460291376706916679151764149324177444374590606643838366605181996272409014933080082205048098737253668016260658830645459388519595314928290853199112791333551144805347785109465401055719331231478162870216035573012645710763533896540021550083104281 + ''; + }; + }; + + overrides = { + idea-ultimate = rec { + version = "243.19420.21"; + url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; + sha256 = "1771e66c234eeae868b220129c5694e8c1eb73d4095c023d3e59b25089ea6ae7"; + }; + }; + + srcOverrideFn = name: { version + , url + , sha256 + , plugins ? [ ] + , + }: + let + versionChangedPkg = jetbrains.${name}.overrideAttrs + (_: old: rec { + inherit version; + src = pkgs.fetchurl { + inherit url sha256; + }; + buildInputs = old.buildInputs ++ (with pkgs; [ xorg.libX11 libGL fontconfig ]); + }); + in + versionChangedPkg; + srcPatched = builtins.mapAttrs srcOverrideFn overrides; + javaAgentJar = "${ja-netfilter}/share/ja-netfilter/ja-netfilter.jar"; + vmopts = '' + --add-opens=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED + --add-opens=java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED + -javaagent:${javaAgentJar}=jetbrains + ''; + forkingWrapper = package: wrapperName: + let + exe = lib.getExe package; + wrapperExe = pkgs.writeShellScriptBin wrapperName '' + ${exe} "$@" >/dev/null 2>&1 & + ''; + in + pkgs.symlinkJoin { + name = package.name; + paths = [ package wrapperExe ]; + postBuild = '' + ln -s ${exe} $out/bin/${wrapperName}-unwrapped + ''; + }; + wrapJetBrains = package: name: + forkingWrapper (package.override { inherit vmopts; }) name; + netOverrideFn = name: _: + wrapJetBrains srcPatched.${name} name; + netPatched = builtins.mapAttrs netOverrideFn overrides; + in + { + jbeap = netPatched; + }) + + + ]; +} diff --git a/common/users/homeModules/notion.nix b/common/users/homeModules/notion.nix new file mode 100644 index 0000000..0092c18 --- /dev/null +++ b/common/users/homeModules/notion.nix @@ -0,0 +1,22 @@ +{pkgs, ...}: +let + unwrap = (pkgs.writeShellScriptBin "unwrap-notion-uri" '' + ARGS=$(echo "$*" | ${pkgs.python3}/bin/python3 -c "import sys; from urllib.parse import unquote;print(unquote(sys.stdin.read()))") + bottles-cli run -b Notion -e 'C:\windows\system32\cmd.exe' -- "/c %LOCALAPPDATA%/programs/notion/notion.exe \"$ARGS\"" + + ''); +in +{ + xdg = { + desktopEntries = { + notionProtoWrapper = { + type = "Application"; + name = "Notion-Protocol"; + terminal = false; + categories = ["Application"]; + exec = "${unwrap}/bin/unwrap-notion-uri %u"; + mimeType = [ "x-scheme-handler/notion" ]; + }; + }; + }; +} diff --git a/common/users/meyer/home.nix b/common/users/meyer/home.nix index 7967982..f12654e 100644 --- a/common/users/meyer/home.nix +++ b/common/users/meyer/home.nix @@ -15,6 +15,8 @@ in ../homeModules/zsh.nix ../homeModules/desktopEntries.nix ../homeModules/java.nix + ../homeModules/jetbrains + ../homeModules/notion.nix ./sops.nix ./git.nix ]; diff --git a/customPackages/default.nix b/customPackages/default.nix index 3c4b2f5..a8197b0 100644 --- a/customPackages/default.nix +++ b/customPackages/default.nix @@ -1,6 +1,16 @@ -{ pkgs }: rec{ +{ pkgs }: +let + src_frog = ( pkgs.fetchFromGitHub { + owner = "sadan4"; + repo = "frog"; + rev = "2f2cc11ce7866e9b4bd0f6c52ba0cef25e95a468"; + hash = "sha256-KkoNi8Rx0Q6MIzgzvpCJhGI82tDWuflBQO2dFS0h8ig="; + }); +in +rec{ # discord = nixpkgs.callPackage ./discord { }; discord = pkgs.callPackage ./discord/default.nix { }; vesktop = pkgs.callPackage ./vesktop/default.nix { inherit vencord; }; vencord = pkgs.callPackage ./vencord/package.nix { }; + frog = pkgs.callPackage (import src_frog) {}; } diff --git a/flake.lock b/flake.lock index 7f7b5cb..99f939a 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1727658919, - "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1727693804, - "narHash": "sha256-Qwd+BzauhSXdtiL172wkp8JYJhe2BXyXkyWqPexytME=", + "lastModified": 1729717678, + "narHash": "sha256-XEfYT1D+4KT9c0mMwsmZdWS2JgKsboAZbnuJvrjBQKg=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "acb21a72156c5b6e1aa607b9adcbac592bd60862", + "rev": "5a965cb108fb1f30b29a26dbc29b473f49e80b41", "type": "github" }, "original": { @@ -96,11 +96,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727540905, - "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", + "lastModified": 1729181673, + "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", + "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "type": "github" }, "original": { @@ -112,11 +112,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -128,11 +128,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1725534445, - "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", + "lastModified": 1729951556, + "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", + "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", "type": "github" }, "original": { @@ -173,11 +173,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1727734513, - "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3198a242e547939c5e659353551b0668ec150268", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 00eec00..8022265 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,7 @@ }; nix-desktop-evo4b5 = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; + system = "x86_64-linux"; modules = [ ./boxes/desktop/configuration.nix inputs.home-manager.nixosModules.default