From 6391b25f71cedcdde658c255e550ddf47aff778d Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Sat, 29 Apr 2023 06:47:39 +0200 Subject: [PATCH] flake update, npm global --- flake.lock | 66 ++++++++++++------------------- flake.nix | 18 ++++----- home/features/cli/fish.nix | 4 ++ home/features/cli/tmux.nix | 2 +- home/features/coding/emacs.nix | 1 + home/features/coding/tools.nix | 1 - home/features/desktop/default.nix | 2 +- 7 files changed, 40 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 5f11eb3..d331f7a 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1680281360, - "narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=", + "lastModified": 1682101079, + "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", "owner": "ryantm", "repo": "agenix", - "rev": "e64961977f60388dd0b49572bb0fc453b871f896", + "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", "type": "github" }, "original": { @@ -48,11 +48,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674127017, - "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=", + "lastModified": 1682063650, + "narHash": "sha256-VaDHh2z6xlnTHaONlNVHP7qEMcK5rZ8Js3sT6mKb2XY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77", + "rev": "c2ea4e642dc50fd44b537e9860ec95867af30d39", "type": "github" }, "original": { @@ -81,15 +81,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils_2" + ] }, "locked": { - "lastModified": 1681250798, - "narHash": "sha256-fQMROyKzPFBPqJy9J4ffywm02ZuqAI0GW1O1QibVpdQ=", + "lastModified": 1682663009, + "narHash": "sha256-i5ZDuY5kUBDwbWFUludL2cm6PBb6oj245qTFXSpOkdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "28698126bd825aff21cae9ffd15cf83e169051b0", + "rev": "43ba4489bd3f9f69519f5f7ebdb76d0455eccbbe", "type": "github" }, "original": { @@ -106,11 +105,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1681303095, - "narHash": "sha256-0lj5ZGMhXdeYbbQQ5Y0fv0OcKe0zXfn4H2VOn31l/9o=", + "lastModified": 1682603803, + "narHash": "sha256-NY9nVAdB7UyInu2vPx/DIUVNZ83t4RdP16QY9DTIn4s=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "efee6a1cda278b8589bfe335c66d8fb272027bca", + "rev": "f23455e592bca14e0abd9249de467cc71cd2850e", "type": "github" }, "original": { @@ -174,11 +173,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1680669251, - "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", + "lastModified": 1682453498, + "narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e", + "rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f", "type": "github" }, "original": { @@ -190,11 +189,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1681217261, - "narHash": "sha256-RbxCHWN3Vhyv/WEsXcJlDwF7bpvZ9NxDjfSouQxXEKo=", + "lastModified": 1682526928, + "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3fb8eedc450286d5092e4953118212fa21091b3b", + "rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891", "type": "github" }, "original": { @@ -228,30 +227,15 @@ "type": "github" } }, - "utils_2": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1680810405, - "narHash": "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=", + "lastModified": 1682436395, + "narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=", "owner": "wlroots", "repo": "wlroots", - "rev": "7abda952d0000b72d240fe1d41457b9288f0b6e5", + "rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59", "type": "gitlab" }, "original": { @@ -273,11 +257,11 @@ ] }, "locked": { - "lastModified": 1681127512, - "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=", + "lastModified": 1682439384, + "narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97", + "rev": "c0e233955568fbea4e859336f6d3d14d51294d7c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 765caf9..fe2d5e2 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,7 @@ hyprland.url = "github:hyprwm/Hyprland"; }; - outputs = - { self, nixpkgs, home-manager, agenix, deploy-rs, ... }@inputs: + outputs = { self, nixpkgs, home-manager, agenix, deploy-rs, ... }@inputs: let inherit (self) outputs; lib = nixpkgs.lib; @@ -47,14 +46,13 @@ }; homeConfigurations = { # Laptop - "m3tam3re@m3-nix" = pkgs: - home-manager.lib.homeManagerConfiguration { - inherit pkgs; - extraSpecialArgs = { inherit inputs outputs; }; - modules = [ ./home/users/m3tam3re/m3-nix.nix allowUnfree ]; - }; - "m3tam3re@lkk-nix-1" = pkgs: home-manager.lib.homeManagerConfiguration { - inherit pkgs; + "m3tam3re@m3-nix" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages."x86_64-linux"; + extraSpecialArgs = { inherit inputs outputs; }; + modules = [ ./home/users/m3tam3re/m3-nix.nix allowUnfree ]; + }; + "m3tam3re@lkk-nix-1" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages."x86_64-linux"; extraSpecialArgs = { # pass things to t }; modules = [ ./home/users/m3tam3re/lkk-nix-1.nix ]; diff --git a/home/features/cli/fish.nix b/home/features/cli/fish.nix index 5cbe1f5..4a72ba8 100644 --- a/home/features/cli/fish.nix +++ b/home/features/cli/fish.nix @@ -25,6 +25,10 @@ in { set -x EDITOR emacsclient set -x VISUAL emacsclient set -x XDG_DATA_HOME $HOME/.local/share + set -x FZF_ALT_C_COMMAND fd --type d --exclude .git --follow --hidden + set -x FZF_DEFAULT_COMMAND fd --type f --exclude .git --follow --hidden + set -x FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND" + if test (tty) = "/dev/tty1" exec Hyprland &> /dev/null end diff --git a/home/features/cli/tmux.nix b/home/features/cli/tmux.nix index 70fe81b..a6cf94d 100644 --- a/home/features/cli/tmux.nix +++ b/home/features/cli/tmux.nix @@ -28,7 +28,7 @@ in { unbind % bind-key r source-file ~/.tmux.conf \; display-message "Konfiguration neu geladen" - +set -g @plugin 'sainnhe/tmux-fzf' # status bar theme set -g status-bg 'colour235' #set -g message-command-fg 'colour222' diff --git a/home/features/coding/emacs.nix b/home/features/coding/emacs.nix index 4ed528b..8bc1f0b 100644 --- a/home/features/coding/emacs.nix +++ b/home/features/coding/emacs.nix @@ -91,6 +91,7 @@ epkgs.restclient epkgs.rustic epkgs.smartparens + epkgs.sqlite3 epkgs.svelte-mode epkgs.todoist epkgs.typescript-mode diff --git a/home/features/coding/tools.nix b/home/features/coding/tools.nix index d17e431..5f84bc4 100644 --- a/home/features/coding/tools.nix +++ b/home/features/coding/tools.nix @@ -4,6 +4,5 @@ direnv insomnia hugo - shopify-cli ]; } diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index c7528d4..ba7c2a1 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -28,7 +28,7 @@ XDG_BIN_HOME = "\${HOME}/.local/bin"; XDG_DATA_HOME = "\${HOME}/.local/share"; }; - home.sessionPath = [ "\${XDG_BIN_HOME}" "\${HOME}/.cargo/bin" ]; + home.sessionPath = [ "\${XDG_BIN_HOME}" "\${HOME}/.cargo/bin" "\$HOME/.npm-global/bin"]; fonts.fontconfig.enable = true;