summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradikro <adikro@disroot.org>2026-03-23 16:12:29 +0100
committeradikro <adikro@disroot.org>2026-03-23 16:12:29 +0100
commit1d40f7be90fa740ce34d7c0873b4acf205bca06a (patch)
tree99aa7a59039b655dbb03e0e8508c3070daaf2fce
parent08e25c159d9d948a66488b807d9f30712ef9d2b6 (diff)
thinkpad stuff
-rw-r--r--flake.lock136
-rw-r--r--flake.nix8
-rw-r--r--hm/editors/nixvim/nixvim.nix2
-rw-r--r--hm/env/cursor.nix2
-rw-r--r--hm/soft/browser.nix2
-rw-r--r--hosts/thinkpad/configuration.nix4
-rw-r--r--os/srv/compat.nix5
-rw-r--r--os/srv/omnisearch.nix4
8 files changed, 106 insertions, 57 deletions
diff --git a/flake.lock b/flake.lock
index 67c538e..559f44a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,6 +22,24 @@
"type": "github"
}
},
+ "beaker-src": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1773884524,
+ "narHash": "sha256-1dnlofWaxI/YRID+WPz2jHZNDyloBubDt/bAQk9ePLU=",
+ "ref": "refs/heads/master",
+ "rev": "abc598baf15d6f8a4de395a27ba34b1e769558e1",
+ "revCount": 21,
+ "shallow": false,
+ "type": "git",
+ "url": "https://git.bwaaa.monster/beaker"
+ },
+ "original": {
+ "shallow": false,
+ "type": "git",
+ "url": "https://git.bwaaa.monster/beaker"
+ }
+ },
"disko": {
"inputs": {
"nixpkgs": [
@@ -335,11 +353,11 @@
]
},
"locked": {
- "lastModified": 1774007980,
- "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=",
+ "lastModified": 1774274572,
+ "narHash": "sha256-YtpNRYSv0CQn+MjhHHqFcIR5L0Urex2tTwS42kP6nuc=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "9670de2921812bc4e0452f6e3efd8c859696c183",
+ "rev": "90913f831383a599c556cba59eac8cae9b5195a9",
"type": "github"
},
"original": {
@@ -435,11 +453,11 @@
]
},
"locked": {
- "lastModified": 1773965157,
- "narHash": "sha256-u6Ceko/AQ30asd/P68Y7gD0x3LtsjiPwC31TlwVnsac=",
+ "lastModified": 1774224385,
+ "narHash": "sha256-VQPMdAUOhDqb6AUAn6oQYPvU2DVGHIc3iRdAHlDhSHQ=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "7e711c5abd3b0ca9c0038606edeee6bcf09b055c",
+ "rev": "701c0a6174fde5de4b9424c0d1e5a4306b73baac",
"type": "github"
},
"original": {
@@ -451,11 +469,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1773942472,
- "narHash": "sha256-VRtGTA4WWgrVrjZg+XrnRgMcbAa0EkYkWV5Wcn76/0g=",
+ "lastModified": 1774221289,
+ "narHash": "sha256-nxFkSVa268w237r0i0xxCpzyIVtfXocm1xI+vsjJlgo=",
"owner": "neovim",
"repo": "neovim",
- "rev": "06befe1e348bf540bb04a8c0cafe116616e71715",
+ "rev": "6cd1fe9a66947511f59226d51dd70197d80513e5",
"type": "github"
},
"original": {
@@ -476,11 +494,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1773889880,
- "narHash": "sha256-cu23CGP+mD2wKPKaoGM7evZ1dXfjd+cjryqqqx2HloE=",
+ "lastModified": 1774253924,
+ "narHash": "sha256-5Zi+RYoRvax1gATaNC80MYR+6uBJ3F+uUZ2KL3HyTWg=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "63767d4572eb2e3da5e68f68de77d8f2cdeca8dd",
+ "rev": "36f3b7b93efde38c4c40daeaee80a62afb550812",
"type": "github"
},
"original": {
@@ -532,11 +550,11 @@
"nixpkgs-nixcord": "nixpkgs-nixcord"
},
"locked": {
- "lastModified": 1773994878,
- "narHash": "sha256-vA7ZUmJ2CvW0utYZaJoAPrUbK4JzykBXu1lcBNc67AQ=",
+ "lastModified": 1774085563,
+ "narHash": "sha256-u12oksXYS8YNphdTsCTgCQcKuVNvCX/CKVjg7ki74YA=",
"owner": "KaylorBen",
"repo": "nixcord",
- "rev": "148c632f3ba29e32695225631a1e7d255136f749",
+ "rev": "5bc81fedc7df61c80f5480610ff7e35192d8e1d4",
"type": "github"
},
"original": {
@@ -547,11 +565,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1773533765,
- "narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=",
+ "lastModified": 1774018263,
+ "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "f8e82243fd601afb9f59ad230958bd073795cbfe",
+ "rev": "2d4b4717b2534fad5c715968c1cece04a172b365",
"type": "github"
},
"original": {
@@ -625,11 +643,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1773814637,
- "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=",
+ "lastModified": 1773964973,
+ "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96",
+ "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25",
"type": "github"
},
"original": {
@@ -641,11 +659,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1773821835,
- "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+ "lastModified": 1774106199,
+ "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+ "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
"type": "github"
},
"original": {
@@ -657,11 +675,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1773821835,
- "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+ "lastModified": 1774106199,
+ "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+ "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
"type": "github"
},
"original": {
@@ -715,11 +733,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1774012500,
- "narHash": "sha256-/ew0Oey3Bb9Qp8Xl4ND3xZFpa4ud/aRdV9i5TaQjI6Q=",
+ "lastModified": 1774274362,
+ "narHash": "sha256-3D3d8NqjZ9bKccsvQoL9YU7Atnb9oUAEZPmSPHbVI+M=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "79310255aa4116a2e7097cc9fde070c215950a88",
+ "rev": "d2117bdc8b008e5baf07610f8784da9818528140",
"type": "github"
},
"original": {
@@ -740,11 +758,11 @@
"systems": "systems_3"
},
"locked": {
- "lastModified": 1773970322,
- "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=",
+ "lastModified": 1774224548,
+ "narHash": "sha256-g45WZAZHNc7wJBkK4IdB5dq0Bh0JE7G0gcY2H5DFi44=",
"owner": "NotAShelf",
"repo": "nvf",
- "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec",
+ "rev": "edfb73fa4ced576f587d259a70a513b4152f8cea",
"type": "github"
},
"original": {
@@ -753,6 +771,27 @@
"type": "github"
}
},
+ "omnisearch": {
+ "inputs": {
+ "beaker-src": "beaker-src",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1774184185,
+ "narHash": "sha256-uxvwbXjpJUpWgXLi3Oadd+PqR3UV5MC7B/lm45oluLc=",
+ "ref": "refs/heads/master",
+ "rev": "bcee71cbbb0282d84841ba9b8908773ab56decf2",
+ "revCount": 66,
+ "type": "git",
+ "url": "https://git.bwaaa.monster/omnisearch"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://git.bwaaa.monster/omnisearch"
+ }
+ },
"otter-launcher": {
"inputs": {
"flake-parts": "flake-parts_6",
@@ -816,6 +855,7 @@
"nixvim": "nixvim",
"nur": "nur",
"nvf": "nvf",
+ "omnisearch": "omnisearch",
"otter-launcher": "otter-launcher",
"satty": "satty",
"sops-nix": "sops-nix",
@@ -888,11 +928,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1773664537,
- "narHash": "sha256-w2gLQV8jKZVX7yXqOhMJaKJ2kujYfrL99rNhjKST7ac=",
+ "lastModified": 1774256511,
+ "narHash": "sha256-AqMFO1jkDlilT0gsxfVwQEqyafUqqear9dni8zNDbmM=",
"owner": "gabm",
"repo": "Satty",
- "rev": "e2d8880745df2491010ce1b897d4a5dbdf59bbba",
+ "rev": "c6470f7a7fd6fbdea6061d9ee7082d2d9dce64aa",
"type": "github"
},
"original": {
@@ -908,11 +948,11 @@
]
},
"locked": {
- "lastModified": 1773889674,
- "narHash": "sha256-+ycaiVAk3MEshJTg35cBTUa0MizGiS+bgpYw/f8ohkg=",
+ "lastModified": 1774154798,
+ "narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "29b6519f3e0780452bca0ac0be4584f04ac16cc5",
+ "rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170",
"type": "github"
},
"original": {
@@ -929,11 +969,11 @@
"systems": "systems_5"
},
"locked": {
- "lastModified": 1773619901,
- "narHash": "sha256-Br8CQy4ht+a2OxyzaRwuP5+oIFfoRvCxYgsmdrgid40=",
+ "lastModified": 1774157037,
+ "narHash": "sha256-kJpgEIF0sxMW0vx543m3AwyqptJOxPoOJY1DfJ4jQas=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
- "rev": "6f06ff05cd536b790b7662550a10b61a1ac4619e",
+ "rev": "2e2234c2932a3aff5f845cda33cb1972a9e889aa",
"type": "github"
},
"original": {
@@ -1040,11 +1080,11 @@
]
},
"locked": {
- "lastModified": 1773910498,
- "narHash": "sha256-JwXYw4phtJ/PljzxX46NQROcaUqoloBlXOZ7PxFoYsg=",
+ "lastModified": 1774268739,
+ "narHash": "sha256-/29w8LNrD8MvW598zTkCrLZ5zQxuJMyeO86/rjXb8Zc=",
"owner": "Alexays",
"repo": "Waybar",
- "rev": "6cb68737e64a851797a26566c7859b53eb2fd8bc",
+ "rev": "be2ad4a8587b41f111e2214db2a92cb6e744fc48",
"type": "github"
},
"original": {
@@ -1095,11 +1135,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
- "lastModified": 1773926350,
- "narHash": "sha256-3ruS1oO1hkJa0lBNfRFZavU8G3uhPLzKu14MAhwizxk=",
+ "lastModified": 1774260364,
+ "narHash": "sha256-YRLjv6RDUB+7MZNeEgSdxCR+S7z4O+6dANdOWaa9P8I=",
"owner": "sxyazi",
"repo": "yazi",
- "rev": "a246e9c7c06de188341aa7945077aac1255f3e03",
+ "rev": "5c05350d52cbbb490a353e2df192f36dd9d73218",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index dcddee3..8130a60 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,10 +8,10 @@
nur.url = "github:nix-community/NUR";
- # omnisearch = {
- # url = "git+https://git.bwaaa.monster/omnisearch";
- # inputs.nixpkgs.follows = "nixpkgs";
- # };
+ omnisearch = {
+ url = "git+https://git.bwaaa.monster/omnisearch";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
arkenfox = {
url = "github:dwarfmaster/arkenfox-nixos";
diff --git a/hm/editors/nixvim/nixvim.nix b/hm/editors/nixvim/nixvim.nix
index 835556a..b623f75 100644
--- a/hm/editors/nixvim/nixvim.nix
+++ b/hm/editors/nixvim/nixvim.nix
@@ -144,7 +144,7 @@ in
plugins = {
overseer.enable = true;
- neotest.enable = true;
+ # neotest.enable = true;
tiny-inline-diagnostic = {
enable = true;
diff --git a/hm/env/cursor.nix b/hm/env/cursor.nix
index 7b09f43..eda8f55 100644
--- a/hm/env/cursor.nix
+++ b/hm/env/cursor.nix
@@ -10,7 +10,7 @@ let
miyabi-src = pkgs.fetchgit {
url = "https://codeberg.org/adikro/nixos-resources.git";
rev = "refs/heads/main";
- sha256 = "sha256-4VxeajQFrZivYbJQ1ERPm18Isnf91tiCK5SAJydHfQc=";
+ sha256 = "sha256-5kIAyW/dQ2qrqrP6ekwFfpV7a1kBa+YvPGMWj2HWYhE=";
fetchLFS = true;
};
diff --git a/hm/soft/browser.nix b/hm/soft/browser.nix
index c5184fe..7223b27 100644
--- a/hm/soft/browser.nix
+++ b/hm/soft/browser.nix
@@ -47,7 +47,7 @@ in
"OmniSearch" = {
urls = [ { template = "http://omnisearch.local:8087/search?q={searchTerms}"; } ];
- definedAliases = [ "@omni" ];
+ definedAliases = [ "@o" ];
};
"SearXNG" = {
urls = [ { template = "https://sxng.violets-purgatory.dev/search?q={searchTerms}"; } ];
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index dd507af..62adf1b 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -51,6 +51,7 @@
users.enable = true;
};
srv = {
+ omnisearch.enable = true;
bluetooth.enable = true;
i2p.enable = true;
yggdrasil.enable = true;
@@ -76,5 +77,8 @@
niri.enable = true;
};
};
+ nixpkgs.config.permittedInsecurePackages = [
+ "electron-38.8.4"
+ ];
# boot.kernelParams = [ "iomem=relaxed" ];
}
diff --git a/os/srv/compat.nix b/os/srv/compat.nix
index 721fab1..1ea6105 100644
--- a/os/srv/compat.nix
+++ b/os/srv/compat.nix
@@ -15,6 +15,11 @@ in
package = pkgs.xwayland-satellite;
};
+ environment.systemPackages = with pkgs; [
+ wineWow64Packages.stagingFull
+ winetricks
+ ];
+
environment.sessionVariables = {
NIXOS_OZONE_WL = "1";
ELECTRON_ENABLE_WAYLAND = "1";
diff --git a/os/srv/omnisearch.nix b/os/srv/omnisearch.nix
index dbc398c..dea0490 100644
--- a/os/srv/omnisearch.nix
+++ b/os/srv/omnisearch.nix
@@ -9,10 +9,10 @@ let
in
{
options.os.srv.omnisearch.enable = lib.mkEnableOption "enables omnisearch";
- # imports = [ inputs.omnisearch.nixosModules.default ];
+ imports = [ inputs.omnisearch.nixosModules.default ];
config = lib.mkIf cfg.enable {
- # services.omnisearch.enable = true;
+ services.omnisearch.enable = true;
networking.hosts."127.0.0.1" = [ "omnisearch.local" ];
};
}