From 82bed310d88cd019f1d19100adb0312eca05e656 Mon Sep 17 00:00:00 2001 From: xunuwu Date: Thu, 22 Aug 2024 17:07:44 +0200 Subject: [PATCH] some stuff ig --- flake.lock | 101 ++++++++------------- flake.nix | 6 +- home/editors/jetbrains/default.nix | 5 + home/profiles/default.nix | 1 + home/profiles/nixdesk/default.nix | 2 + home/programs/browsers/firefox/default.nix | 10 +- home/programs/games/roblox.nix | 10 ++ hosts/hopper/hardware.nix | 11 ++- pkgs/default.nix | 1 + pkgs/sobercookie/default.nix | 60 ++++++++++++ system/programs/tools.nix | 1 + system/services/syncthing.nix | 4 + 12 files changed, 144 insertions(+), 68 deletions(-) create mode 100644 home/editors/jetbrains/default.nix create mode 100644 home/programs/games/roblox.nix create mode 100644 pkgs/sobercookie/default.nix diff --git a/flake.lock b/flake.lock index 89a7950..4a84608 100644 --- a/flake.lock +++ b/flake.lock @@ -1,28 +1,5 @@ { "nodes": { - "firefox-addons": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "pkgs/firefox-addons", - "lastModified": 1722630583, - "narHash": "sha256-7E8CLXEgLB2ojPAG21jZmb4umNuAXXY9KrTc3h9RbKE=", - "owner": "rycee", - "repo": "nur-expressions", - "rev": "264e50f47b43a203208384e4577fe682b37b2d90", - "type": "gitlab" - }, - "original": { - "dir": "pkgs/firefox-addons", - "owner": "rycee", - "repo": "nur-expressions", - "type": "gitlab" - } - }, "flake-compat": { "flake": false, "locked": { @@ -136,21 +113,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1629284811, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -222,11 +184,11 @@ }, "hardware": { "locked": { - "lastModified": 1722332872, - "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", + "lastModified": 1723310128, + "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", + "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "type": "github" }, "original": { @@ -265,11 +227,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -327,11 +289,11 @@ ] }, "locked": { - "lastModified": 1722136042, - "narHash": "sha256-x3FmT4QSyK28itMiR5zfYhUrG5nY+2dv+AIcKfmSp5A=", + "lastModified": 1723352546, + "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "c0ca47e8523b578464014961059999d8eddd4aae", + "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", "type": "github" }, "original": { @@ -343,17 +305,17 @@ "nix-vscode-extensions": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1722562293, - "narHash": "sha256-JLhM5xSbx5Isjyfz8+WhCfJ9hgEJ4VYRivTOANYZVWM=", + "lastModified": 1723858043, + "narHash": "sha256-wOn9adhtjolHAOw+xY2mvp3m50mBVeQD3GxW9HJR+zc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "2056dac5adce82433b1dae711868b1c22e5ed07e", + "rev": "03d3171c94c36f43c10c46df6fbab127af314da6", "type": "github" }, "original": { @@ -364,29 +326,44 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1723586348, + "narHash": "sha256-mDVd0lc+V5Yw23xDxMvPnvfa1FiyiBCRpwtT4uujp0Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "f97145f837de6d635b7d6da9a9d5d42e323f8050", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "f97145f837de6d635b7d6da9a9d5d42e323f8050", + "type": "github" + } + }, + "nur": { + "locked": { + "lastModified": 1723905880, + "narHash": "sha256-j9xPPY4sVVmdt6n9q4/bH2IHYnzFJ96rWwBUVF9puPM=", + "owner": "nix-community", + "repo": "NUR", + "rev": "55a2281172b763189cfef53d02e843851cccc51a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", "type": "github" } }, "root": { "inputs": { - "firefox-addons": "firefox-addons", "flake-parts": "flake-parts", "hardware": "hardware", "home-manager": "home-manager", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", "nixpkgs": "nixpkgs", + "nur": "nur", "small-nvim": "small-nvim", "sops-nix": "sops-nix" } @@ -400,11 +377,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1722637066, - "narHash": "sha256-ouH0fXnsF2jij5+52+W04Mq6bHPEc6ROiX/VXTS8Spo=", + "lastModified": 1723538660, + "narHash": "sha256-5yaDrheWlj0aNYNO0kDZJUmp4psymtGaC3juxLwBFJg=", "owner": "xunuwu", "repo": "small-nvim", - "rev": "9538cd83df75102f7e274f283cef25e5cbc700ae", + "rev": "969fb6a3a30004df43220d32d4032f1cac70f2c4", "type": "github" }, "original": { @@ -423,11 +400,11 @@ ] }, "locked": { - "lastModified": 1722114803, - "narHash": "sha256-s6YhI8UHwQvO4cIFLwl1wZ1eS5Cuuw7ld2VzUchdFP0=", + "lastModified": 1723501126, + "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "eb34eb588132d653e4c4925d862f1e5a227cc2ab", + "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2766f59..401d0d0 100644 --- a/flake.nix +++ b/flake.nix @@ -34,13 +34,13 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/f97145f837de6d635b7d6da9a9d5d42e323f8050"; # TODO: switch back to nixos-unstable ASAP flake-parts.url = "github:hercules-ci/flake-parts"; hardware.url = "github:nixos/nixos-hardware"; home-manager.url = "github:nix-community/home-manager"; small-nvim.url = "github:xunuwu/small-nvim"; - firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + nur.url = "github:nix-community/NUR"; sops-nix.url = "github:Mic92/sops-nix"; nix-index-database.url = "github:Mic92/nix-index-database"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; @@ -52,8 +52,6 @@ small-nvim.inputs.nixpkgs.follows = "nixpkgs"; - firefox-addons.inputs.nixpkgs.follows = "nixpkgs"; - sops-nix.inputs = { nixpkgs.follows = "nixpkgs"; nixpkgs-stable.follows = "nixpkgs"; diff --git a/home/editors/jetbrains/default.nix b/home/editors/jetbrains/default.nix new file mode 100644 index 0000000..3bd9995 --- /dev/null +++ b/home/editors/jetbrains/default.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = with pkgs.jetbrains; [ + rider + ]; +} diff --git a/home/profiles/default.nix b/home/profiles/default.nix index c94bd9a..e1b1df3 100644 --- a/home/profiles/default.nix +++ b/home/profiles/default.nix @@ -12,6 +12,7 @@ ./nixdesk inputs.nix-index-database.hmModules.nix-index inputs.sops-nix.homeManagerModules.sops + inputs.nur.hmModules.nur { programs.nix-index = { enableBashIntegration = false; diff --git a/home/profiles/nixdesk/default.nix b/home/profiles/nixdesk/default.nix index bbb0bbd..994f205 100644 --- a/home/profiles/nixdesk/default.nix +++ b/home/profiles/nixdesk/default.nix @@ -13,6 +13,7 @@ ../../editors/nvim.nix ../../editors/emacs.nix ../../editors/vscode.nix + ../../editors/jetbrains ../../programs/browsers/firefox ../../programs/browsers/tor.nix ../../programs/browsers/chromium.nix @@ -46,6 +47,7 @@ ../../programs/media/jellyfin.nix # gaming ../../programs/games + ../../programs/games/roblox.nix #../../programs/games/ludusavi.nix # media services diff --git a/home/programs/browsers/firefox/default.nix b/home/programs/browsers/firefox/default.nix index caeac91..08c8263 100644 --- a/home/programs/browsers/firefox/default.nix +++ b/home/programs/browsers/firefox/default.nix @@ -27,7 +27,7 @@ ]; }; profiles.xun = { - extensions = with inputs.firefox-addons.packages.${pkgs.system}; [ + extensions = with config.nur.repos.rycee.firefox-addons; [ ublock-origin darkreader sponsorblock @@ -37,6 +37,14 @@ istilldontcareaboutcookies sidebery (lib.mkIf (builtins.elem pkgs.keepassxc config.home.packages) keepassxc-browser) + (buildFirefoxXpiAddon rec { + pname = "roseal"; + version = "1.3.44"; + addonId = "{f4f4223a-ff30-4961-b9c0-6a71b7a32aaf}"; + url = "https://addons.mozilla.org/firefox/downloads/file/4323142/roseal-${version}.xpi"; + sha256 = "sha256-Qvd/EUMsSqYCvwUuxjM/ejnn7/TRuhyD82/Azu0dAfE="; + meta = {}; + }) ]; bookmarks = {}; search = { diff --git a/home/programs/games/roblox.nix b/home/programs/games/roblox.nix new file mode 100644 index 0000000..54d6fe8 --- /dev/null +++ b/home/programs/games/roblox.nix @@ -0,0 +1,10 @@ +{ + self, + pkgs, + ... +}: { + # i have sober installed imperatively through flatpak + home.packages = [ + self.packages.${pkgs.system}.sobercookie + ]; +} diff --git a/hosts/hopper/hardware.nix b/hosts/hopper/hardware.nix index 482cda9..7922e34 100644 --- a/hosts/hopper/hardware.nix +++ b/hosts/hopper/hardware.nix @@ -10,8 +10,17 @@ #}; boot = { + blacklistedKernelModules = [ + "xhci_pci" # was causing issues (100% udevd cpu usage) + ]; initrd = { - availableKernelModules = ["ehci_pci" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; + availableKernelModules = [ + "ehci_pci" + "ahci" + "usb_storage" + "usbhid" + "sd_mod" + ]; kernelModules = []; }; kernelModules = ["kvm-intel"]; diff --git a/pkgs/default.nix b/pkgs/default.nix index e46e5d8..a4e292b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,4 +3,5 @@ gamesand = pkgs.callPackage ./gamesand {}; pince = pkgs.callPackage ./pince {}; binaryninja-personal = pkgs.qt6Packages.callPackage ./binaryninja-personal {}; + sobercookie = pkgs.callPackage ./sobercookie {}; } diff --git a/pkgs/sobercookie/default.nix b/pkgs/sobercookie/default.nix new file mode 100644 index 0000000..677c884 --- /dev/null +++ b/pkgs/sobercookie/default.nix @@ -0,0 +1,60 @@ +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + bash, + makeWrapper, + luajitPackages, + gobject-introspection, + gtk3, + wrapGAppsHook, + luajit, +}: +stdenv.mkDerivation rec { + pname = "sobercookie"; + src = fetchFromGitHub { + owner = "xunuwu"; + repo = "sobercookie"; + rev = "09b75ce925281a60a90281e9c5007720f50d48fb"; + sha256 = "sha256-FIGXxG9CCSq1MPPiC5nHVdKJMwpz1Apd00Ix53jtYwk="; + }; + version = "0.0.1"; + + buildInputs = [bash luajit]; + + nativeBuildInputs = [ + makeWrapper + pkg-config + wrapGAppsHook + gobject-introspection + ]; + + propagatedBuildInputs = [gtk3]; + lgi = luajitPackages.lgi; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp sobercookie $out/bin/sobercookie + cp launcher.lua $out/bin/sobercookie-launcher + + mkdir -p $out/share/applications + cp sobercookie-launcher.desktop $out/share/applications + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LUA_PATH : "./?.lua;${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/?/init.lua;${luajit}/share/lua/5.1/\?.lua;${luajit}/share/lua/5.1/?/init.lua" + --prefix LUA_CPATH : "./?.so;${lgi}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/loadall.so" + ) + ''; + + postFixup = '' + wrapProgram $out/bin/sobercookie \ + --prefix PATH : ${lib.makeBinPath [bash]} + ''; +} diff --git a/system/programs/tools.nix b/system/programs/tools.nix index b8d5dfa..abc79ca 100644 --- a/system/programs/tools.nix +++ b/system/programs/tools.nix @@ -14,6 +14,7 @@ parted busybox fd # find replacement + graphviz-nox ( if config.nixpkgs.config.allowUnfree then p7zip-rar diff --git a/system/services/syncthing.nix b/system/services/syncthing.nix index f3cbf5b..6636d44 100644 --- a/system/services/syncthing.nix +++ b/system/services/syncthing.nix @@ -22,6 +22,10 @@ id = "DK3RPET-ACMULD2-TLQS6YM-XWUMS3N-JRNDNME-YTM3H4X-P7QVUKB-N3PL5QF"; autoAcceptFolders = true; }; + "school-probook" = { + id = "ZYNRRWE-SIJLPMQ-5LJDWCY-BF5VMRM-FQRFEW4-L7PKA23-HVJADTV-FZYRSQM"; + autoAcceptFolders = true; + }; }; folders = { "~/secrets" = {