aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiran Bastaja <miran.bastaja04@gmail.com>2024-04-25 17:56:15 +0200
committerMiran Bastaja <miran.bastaja04@gmail.com>2024-04-25 17:56:15 +0200
commit3cadbb989c649b534c71cfdc7df7726212a7966c (patch)
tree4d39db549d798be7fcf910f258d7fc8360568720
parent88154d64372e6ca2b234e74be5dbf7f1eecc5838 (diff)
chore: update flake.lock
Removed tofi module because a compatible one was added to home-manager.
-rw-r--r--flake.lock48
-rw-r--r--share/cfg/tofi.nix4
-rw-r--r--share/hm-modules/default.nix1
-rw-r--r--share/hm-modules/tofi.nix57
4 files changed, 24 insertions, 86 deletions
diff --git a/flake.lock b/flake.lock
index fdcd58d..c64bcb6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
]
},
"locked": {
- "lastModified": 1713195852,
- "narHash": "sha256-MEb4Hx/Aw7pcsmcHXBuldFsrVTfl9Q9dz1JSlxUanmE=",
+ "lastModified": 1713532798,
+ "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
"owner": "numtide",
"repo": "devshell",
- "rev": "2c8e04e5c29299bec53c2e5a73da0f9afa8dabb5",
+ "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
"type": "github"
},
"original": {
@@ -28,11 +28,11 @@
]
},
"locked": {
- "lastModified": 1713406758,
- "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=",
+ "lastModified": 1714043827,
+ "narHash": "sha256-PJbmbf+5z924b/wq7jzEFCUtrOc7s1J+8qRZu3fVAQc=",
"owner": "nix-community",
"repo": "disko",
- "rev": "1efd500e9805a9efbce401ed5999006d397b9f11",
+ "rev": "a816daa384dd754b7586f51157fc2e1a44e76073",
"type": "github"
},
"original": {
@@ -195,11 +195,11 @@
]
},
"locked": {
- "lastModified": 1713391096,
- "narHash": "sha256-5xkzsy+ILgQlmvDDipL5xqAehnjWBenAQXV4/NLg2dE=",
+ "lastModified": 1714042918,
+ "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "f46814ec7cbef9c2aef18ca1cbe89f2bb1e8c394",
+ "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db",
"type": "github"
},
"original": {
@@ -210,11 +210,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1713248628,
- "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
+ "lastModified": 1713895582,
+ "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
+ "rev": "572af610f6151fd41c212f897c71f7056e3fb518",
"type": "github"
},
"original": {
@@ -260,11 +260,11 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1713434076,
- "narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=",
+ "lastModified": 1713638189,
+ "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c",
+ "rev": "74574c38577914733b4f7a775dd77d24245081dd",
"type": "github"
},
"original": {
@@ -301,11 +301,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1712897695,
- "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
+ "lastModified": 1713954846,
+ "narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
+ "rev": "6fb82e44254d6a0ece014ec423cb62d92435336f",
"type": "github"
},
"original": {
@@ -360,11 +360,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
- "lastModified": 1713449966,
- "narHash": "sha256-fD1nT5yPp2ZsUZ+F+jQvE6z+dsWUZfWMVIQM+y7nBlk=",
+ "lastModified": 1713892811,
+ "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "6b259336bd009e8a056ea740e75e6ac95e0f0c1f",
+ "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd",
"type": "github"
},
"original": {
@@ -455,11 +455,11 @@
]
},
"locked": {
- "lastModified": 1711963903,
- "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
+ "lastModified": 1714058656,
+ "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
+ "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
"type": "github"
},
"original": {
diff --git a/share/cfg/tofi.nix b/share/cfg/tofi.nix
index 5c008b6..998b6dc 100644
--- a/share/cfg/tofi.nix
+++ b/share/cfg/tofi.nix
@@ -1,8 +1,4 @@
-# IMPORTANT: this is the config for a custom module that's located at
-# /share/hm-modules/tofi.nix. In order to use this config you have to also
-# import that module.
{ lib, config, ... }: {
-
# Tofi's cache seems to get messed up sometimes, so we regenerate it when
# building the system.
# https://github.com/philj56/tofi/issues/115#issuecomment-1701748297
diff --git a/share/hm-modules/default.nix b/share/hm-modules/default.nix
index 834d9ea..695f3fe 100644
--- a/share/hm-modules/default.nix
+++ b/share/hm-modules/default.nix
@@ -1,7 +1,6 @@
{ ... }: {
imports = [
./hyprdesktop.nix
- ./tofi.nix
./wpaperd.nix
];
}
diff --git a/share/hm-modules/tofi.nix b/share/hm-modules/tofi.nix
deleted file mode 100644
index 4d6dbee..0000000
--- a/share/hm-modules/tofi.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-let
- cfg = config.programs.tofi;
-
- format = pkgs.formats.keyValue {
- mkKeyValue = generators.mkKeyValueDefault
- {
- mkValueString = v:
- if builtins.isBool v then
- if v then "true" else "false"
- else if builtins.isString v then
- ''"${v}"''
- else generators.mkValueStringDefault { } v;
- } "=";
- };
-
- configFile = format.generate "config" cfg.settings;
-in
-{
- options.programs.tofi = {
- enable = mkEnableOption
- "tofi - An extremely fast and simple dmenu/rofi.";
-
- package = mkOption {
- default = pkgs.tofi;
- defaultText = literalExpression "pkgs.tofi";
- type = types.package;
- example = literalExpression "pkgs.tofi";
- description = "The package to use for the tofi binaries.";
- };
-
- settings = mkOption {
- inherit (format) type;
- default = { };
- description = lib.mdDoc ''
- Tofi configuration. Refer to tofi(5) for supported values.
- '';
- example = {
- font = "Fira Code";
- font-size = "22";
-
- width = "1920";
- terminal = "kitty";
- };
- };
- };
-
- config = mkIf cfg.enable {
- home.packages = [ cfg.package ];
- xdg.configFile.tofi-config = {
- enable = true;
- target = "tofi/config";
- source = configFile;
- };
- };
-}