From 2ff030ce73ad045b77103f03d615e543489e548a Mon Sep 17 00:00:00 2001 From: Jurn Wubben Date: Tue, 6 May 2025 15:06:41 +0200 Subject: [PATCH] Fixed errors with flake. and added kagi search engine --- flake.lock | 66 +++++++++++++++++++-------------------- home/default.nix | 9 +++++- home/programs/firefox.nix | 33 +++++++++++++++++--- home/programs/neovim.nix | 2 +- home/programs/nixcord.nix | 8 +---- home/style/default.nix | 12 ++----- home/wayland/mako.nix | 2 +- hosts/laptop/default.nix | 1 + secrets/default.nix | 7 +++-- 9 files changed, 80 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 1a1b419..a7d6fb3 100644 --- a/flake.lock +++ b/flake.lock @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1745858959, - "narHash": "sha256-B1FQwPCFLL3cbHc2nxT3/UI1uprHp2h1EA6M2JVe0oQ=", + "lastModified": 1746413188, + "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0d9d0a1454d5a0200693570618084d80a8b336c", + "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "type": "github" }, "original": { @@ -419,11 +419,11 @@ ] }, "locked": { - "lastModified": 1745439012, - "narHash": "sha256-TwbdiH28QK7Da2JQTqFHdb+UCJq6QbF2mtf+RxHVzEA=", + "lastModified": 1746369725, + "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", "owner": "nix-community", "repo": "home-manager", - "rev": "d31710fb2cd536b1966fee2af74e99a0816a61a8", + "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", "type": "github" }, "original": { @@ -434,11 +434,11 @@ }, "mnw": { "locked": { - "lastModified": 1745705214, - "narHash": "sha256-XGfaHbFI4vvDuaoVO3IFYZKezXIO8rhUaMCGcjY71Ac=", + "lastModified": 1746338991, + "narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=", "owner": "Gerg-L", "repo": "mnw", - "rev": "c1f4587db4c53dcefa432c46c7a899a116d8e924", + "rev": "c65407ee9387ef75985dad3e30f58c822c766ec1", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745757380, - "narHash": "sha256-MfA53mffVwGd1uZlFmUHwrGFSdggXfGzTuOH1DP+vY4=", + "lastModified": 1746495601, + "narHash": "sha256-t13mwTToJdJhbaW4oVZBMXc6kbwXk9u/qy9RlBKjn3Y=", "owner": "kaylorben", "repo": "nixcord", - "rev": "ab84b94df09d4ec856a89083cc8f629db5a2d8d9", + "rev": "07170d72636e7259e1309e5b494ac6d5c5a1ba81", "type": "github" }, "original": { @@ -560,11 +560,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1745788595, - "narHash": "sha256-XTtT/LzX+mUqRsnuHtzygWfG9HXnOVBQC2vMfpT5AYc=", + "lastModified": 1746481231, + "narHash": "sha256-U3VKPi5D2oLBFzaMI0jJLJp8J64ZLjz+EwodUS//QWc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "66d3e172fa7bc69432a540ffd04825d0b358b04d", + "rev": "c6aca34d2ca2ce9e20b722f54e684cda64b275c2", "type": "github" }, "original": { @@ -576,11 +576,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -621,11 +621,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1745234285, - "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { @@ -645,11 +645,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1745459908, - "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=", + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "owner": "nix-community", "repo": "NUR", - "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "type": "github" }, "original": { @@ -670,11 +670,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1745819184, - "narHash": "sha256-+v+MOVFYDQCJdP67gLrIdrLGKqBUp37KGhvcqd9ZFqA=", + "lastModified": 1746522393, + "narHash": "sha256-gZTKsH5440Yu4R5lPpjkeyyMl8mX+T4iiNKlZL3izBk=", "owner": "notashelf", "repo": "nvf", - "rev": "efa859381f60132db976d2501bfdb4e6f8d5a8c5", + "rev": "f07468e13a994b04ec3b9cd41777429942cdc8b1", "type": "github" }, "original": { @@ -726,11 +726,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1745864947, - "narHash": "sha256-0Hx9YIOMD4rsn2pWF+Z8St4v2JEtuxCGd9LVrcbC7Zk=", + "lastModified": 1746534525, + "narHash": "sha256-cRBGbtxOEoy1M3umByFdySS+KL9RJfmbJZo/08zUYNc=", "owner": "jsw08", "repo": "somcli", - "rev": "5c6f8fe0fddef66073cb2d49148602973c2edb6e", + "rev": "37648a230219a9f0f99a917cf7cff2944d9a90bd", "type": "github" }, "original": { @@ -761,11 +761,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1745618823, - "narHash": "sha256-WGKSI0+CY3Ep2YnRASmBRU8oMIvTW4ngFyjA0dVcKgQ=", + "lastModified": 1746519367, + "narHash": "sha256-bdCCX84HW4CecAgokOi0BgRBR3JSPeGFlusWAGIh3fE=", "owner": "danth", "repo": "stylix", - "rev": "11ceb2fde1901dc227421bbbef2d0800339f5126", + "rev": "a2b80b900647f28658a2c9456d9a10ab4aa3b250", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 0df622a..1a7a26e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,5 +1,12 @@ -{osConfig, ...}: { +{ + osConfig, + inputs, + ... +}: { imports = [ + inputs.stylix.homeManagerModules.stylix + inputs.nixcord.homeModules.nixcord + ./wayland ./shell ./style diff --git a/home/programs/firefox.nix b/home/programs/firefox.nix index 20cc63c..80b2f31 100644 --- a/home/programs/firefox.nix +++ b/home/programs/firefox.nix @@ -3,7 +3,9 @@ pkgs, lib, ... -}: { +}: let + profileName = "jsw.nixos-default"; +in { programs.firefox = { enable = osConfig.niksos.desktop; package = pkgs.wrapFirefox pkgs.firefox-unwrapped { @@ -59,18 +61,37 @@ }; }; - profiles."jsw.nixos-default" = { + profiles.${profileName} = { id = 0; name = "nixos-default"; isDefault = true; search = { force = true; - default = "DuckDuckGo"; + default = "kagi"; order = [ - "DuckDuckGo" - "Google" + "kagi" + "ddg" ]; + + engines = { + "kagi" = { + icon = "https://kagi.com/favicon.ico"; + updateInterval = 24 * 60 * 60 * 1000; + definedAliases = ["@k"]; + urls = [ + { + template = "https://kagi.com/search"; + params = [ + { + name = "q"; + value = "{searchTerms}"; + } + ]; + } + ]; + }; + }; }; settings = { @@ -91,4 +112,6 @@ type = "stdio"; allowed_extensions = ["ff2mpv@yossarian.net"]; }; + + stylix.targets.firefox.profileNames = [profileName]; } diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix index 3e16981..fe0afee 100644 --- a/home/programs/neovim.nix +++ b/home/programs/neovim.nix @@ -44,7 +44,6 @@ }; options.shiftwidth = 2; languages = { - enableLSP = true; # Thses options enable the things automatically for every language. enableFormat = true; #You can also manually overwrite each language. enableTreesitter = true; @@ -60,6 +59,7 @@ python.enable = true; }; lsp = { + enable = true; formatOnSave = true; lspkind.enable = true; # Autocomplete icons lightbulb.enable = true; # Lightbulb icon when lsp is available diff --git a/home/programs/nixcord.nix b/home/programs/nixcord.nix index f7e630e..01883e1 100644 --- a/home/programs/nixcord.nix +++ b/home/programs/nixcord.nix @@ -1,10 +1,4 @@ -{ - inputs, - osConfig, - ... -}: { - imports = [inputs.nixcord.homeManagerModules.nixcord]; - +{osConfig, ...}: { programs.nixcord = { enable = osConfig.niksos.neovim; diff --git a/home/style/default.nix b/home/style/default.nix index caf6110..6a7d5ce 100644 --- a/home/style/default.nix +++ b/home/style/default.nix @@ -1,14 +1,9 @@ { osConfig, - inputs, pkgs, lib, ... }: { - imports = [ - inputs.stylix.homeManagerModules.stylix - ]; - stylix = { enable = osConfig.niksos.desktop; autoEnable = lib.mkDefault true; @@ -32,11 +27,8 @@ light = "Tela-dark"; }; - targets = { - gnome-text-editor.enable = false; # Creates an overlay in home-manager land which isn't allowed with globalPkgs. - nvf.enable = false; # I'd like to be able to read my code, thank you. - }; - + targets.nvf.enable = false; # I'd like to be able to read my code, thank you. + overlays.enable = false; # Should be set automatically but it isn't for some reason... # base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-frappe.yaml"; }; } diff --git a/home/wayland/mako.nix b/home/wayland/mako.nix index 6683488..cb26363 100644 --- a/home/wayland/mako.nix +++ b/home/wayland/mako.nix @@ -1,6 +1,6 @@ {osConfig, ...}: { services.mako = { enable = osConfig.niksos.desktop; - defaultTimeout = 5000; + settings.defaultTimeout = 5000; }; } diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 1f9b655..458ca15 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -33,6 +33,7 @@ in { }; services = { + usbmuxd.enable = true; joycond.enable = true; udev.extraRules = '' # Ethernet expansion card support diff --git a/secrets/default.nix b/secrets/default.nix index 457129c..517f7bc 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -1,4 +1,4 @@ -{ +{config, ...}: { age.secrets = { transferSh = { file = ./transfer-sh.age; @@ -6,7 +6,10 @@ }; dcbot = { file = ./dcbot.age; - owner = "dcbot"; + owner = + if config.niksos.server + then "dcbot" # "dcbot" doesn't exist on e.g laptop. + else "root"; }; password.file = ./password.age; };