diff --git a/flake.lock b/flake.lock index d331f7a..063077e 100644 --- a/flake.lock +++ b/flake.lock @@ -3,14 +3,15 @@ "agenix": { "inputs": { "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1682101079, - "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", + "lastModified": 1684153753, + "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=", "owner": "ryantm", "repo": "agenix", - "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", + "rev": "db5637d10f797bb251b94ef9040b237f4702cde3", "type": "github" }, "original": { @@ -48,11 +49,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1682063650, - "narHash": "sha256-VaDHh2z6xlnTHaONlNVHP7qEMcK5rZ8Js3sT6mKb2XY=", + "lastModified": 1683779844, + "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=", "owner": "serokell", "repo": "deploy-rs", - "rev": "c2ea4e642dc50fd44b537e9860ec95867af30d39", + "rev": "c80189917086e43d49eece2bd86f56813500a0eb", "type": "github" }, "original": { @@ -80,15 +81,36 @@ "home-manager": { "inputs": { "nixpkgs": [ + "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1682663009, - "narHash": "sha256-i5ZDuY5kUBDwbWFUludL2cm6PBb6oj245qTFXSpOkdo=", + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", "owner": "nix-community", "repo": "home-manager", - "rev": "43ba4489bd3f9f69519f5f7ebdb76d0455eccbbe", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1684824189, + "narHash": "sha256-k3nCkn5Qy67rCguuw6YkGuL6hOUNRKxQoKOjnapk5sU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "58eb968c21d309a6c2b020ea8d64e25c38ceebba", "type": "github" }, "original": { @@ -105,11 +127,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1682603803, - "narHash": "sha256-NY9nVAdB7UyInu2vPx/DIUVNZ83t4RdP16QY9DTIn4s=", + "lastModified": 1684844798, + "narHash": "sha256-ZrMXFoEA535jOZ+eDA3s+URZ5MkVRksBgL5qGnb6Ciw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f23455e592bca14e0abd9249de467cc71cd2850e", + "rev": "eb1f832fcec5838053c6b031b656e4f949ada57b", "type": "github" }, "original": { @@ -173,11 +195,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1682453498, - "narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=", + "lastModified": 1683014792, + "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f", + "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", "type": "github" }, "original": { @@ -189,11 +211,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1682526928, - "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", + "lastModified": 1684754342, + "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891", + "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", "type": "github" }, "original": { @@ -207,7 +229,7 @@ "inputs": { "agenix": "agenix", "deploy-rs": "deploy-rs", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hyprland": "hyprland", "nixpkgs": "nixpkgs_4" } diff --git a/home/features/coding/default.nix b/home/features/coding/default.nix index 98ecab5..c3074e6 100644 --- a/home/features/coding/default.nix +++ b/home/features/coding/default.nix @@ -5,5 +5,6 @@ [ python3 guile_3_0 + tinyscheme ]; } diff --git a/home/features/coding/emacs.nix b/home/features/coding/emacs.nix index 44f5eaf..fdaf0cf 100644 --- a/home/features/coding/emacs.nix +++ b/home/features/coding/emacs.nix @@ -39,6 +39,7 @@ epkgs.envrc epkgs.evil epkgs.evil-collection + epkgs.evil-lispy epkgs.evil-nerd-commenter epkgs.exec-path-from-shell epkgs.forge diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index e190203..3bb6eb6 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -3,7 +3,7 @@ imports = [ ./crypto.nix ./design.nix - #./espanso.nix + ./espanso.nix ./extrafonts.nix ./media.nix ./office.nix @@ -65,7 +65,6 @@ glib gsettings-desktop-schemas hyprpaper - nyxt pamixer pavucontrol picom diff --git a/home/features/desktop/espanso.nix b/home/features/desktop/espanso.nix index 4b1f119..1a0f753 100644 --- a/home/features/desktop/espanso.nix +++ b/home/features/desktop/espanso.nix @@ -1,9 +1 @@ -{ pkgs, outputs, ...}: -let - espanso = outputs.packages.x86_64-linux.espanso; -in -{ - home.packages = [ - espanso - ]; -} +{ pkgs, ... }: { home.packages = with pkgs; [ espanso-wayland ]; } diff --git a/home/users/m3tam3re/dotfiles/hyprland.nix b/home/users/m3tam3re/dotfiles/hyprland.nix index b39ae1b..0c7aad3 100644 --- a/home/users/m3tam3re/dotfiles/hyprland.nix +++ b/home/users/m3tam3re/dotfiles/hyprland.nix @@ -19,6 +19,7 @@ env = XCURSOR_SIZE,24 env = WLR_NO_HARDWARE_CURSORS,1 env = __NV_PRIME_RENDER_OFFLOAD,1 + env = GTK_THEME,Dracula # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { kb_layout = de,us diff --git a/hosts/m3-nix/default.nix b/hosts/m3-nix/default.nix index 5fde8c3..04bfc68 100644 --- a/hosts/m3-nix/default.nix +++ b/hosts/m3-nix/default.nix @@ -45,7 +45,6 @@ in { boot.loader.efi.efiSysMountPoint = "/boot/efi"; boot.loader.grub.enable = true; boot.loader.grub.efiSupport = true; - boot.loader.grub.version = 2; boot.loader.grub.device = "nodev"; boot.loader.grub.useOSProber = true; diff --git a/pkgs/default.nix b/pkgs/default.nix index 1988901..96cfff7 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,5 @@ { pkgs ? import { } }: { wofi-pass = pkgs.callPackage ./wofi-pass { }; - espanso = pkgs.callPackage ./espanso { }; } diff --git a/pkgs/espanso/default.nix b/pkgs/espanso/default.nix deleted file mode 100644 index 46bba88..0000000 --- a/pkgs/espanso/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, cargo-make -, pkg-config -, extra-cmake-modules -, dbus -, libX11 -, libXi -, libXtst -, libnotify -, libxkbcommon -, openssl -, xclip -, xdotool -, setxkbmap -, wl-clipboard -, wxGTK32 -, makeWrapper -, stdenv -#, AppKit -#, Cocoa -#, Foundation -, waylandSupport ? true, -}: - -rustPlatform.buildRustPackage rec { - pname = "espanso"; - version = "2.1.8"; - - src = fetchFromGitHub { - owner = "espanso"; - repo = pname; - rev = "v${version}"; - sha256 = "06wzrjdvssixgd9rnrv4cscbfiyvp5pjpnrih48r0ral3pj2hdg5"; - }; - - cargoSha256 = "sha256-U2ccF7DM16TtX3Kc4w4iNV4WsswHJ0FpO3+sWCL1Li8="; - - nativeBuildInputs = [ - extra-cmake-modules - pkg-config - makeWrapper - cargo-make - wxGTK32 - ]; - - env.NO_X11 = lib.boolToString waylandSupport; - - buildInputs = [ - libXi - libXtst - openssl - ] ++ lib.optionals stdenv.isLinux [ - dbus - libnotify - libX11 - libxkbcommon - xclip - xdotool - ] ++ lib.optionals stdenv.isDarwin [ -# AppKit -# Cocoa -# Foundation - ] ++ lib.optionals waylandSupport [ - wl-clipboard - ]; - - # Some tests require networking - doCheck = false; - - preBuild = lib.optionalString waylandSupport '' - export NO_X11=true - ''; - - postInstall = '' - wrapProgram $out/bin/espanso \ - --prefix PATH : ${lib.makeBinPath ([ - libnotify - setxkbmap - ] ++ lib.optionals waylandSupport [ - wl-clipboard - ] ++ lib.optionals (!waylandSupport) [ - xclip - ])} - ''; - - meta = with lib; { - description = "Cross-platform Text Expander written in Rust"; - homepage = "https://espanso.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ kimat thehedgeh0g ]; - platforms = platforms.unix; - - longDescription = '' - Espanso detects when you type a keyword and replaces it while you're typing. - ''; - }; -}