diff options
| -rw-r--r-- | flake.lock | 60 | ||||
| -rw-r--r-- | modules/basic-tools.nix | 12 | ||||
| -rw-r--r-- | modules/graphical.nix | 5 | ||||
| -rw-r--r-- | modules/radio.nix | 2 | ||||
| -rw-r--r-- | modules/virtualization.nix | 2 | ||||
| -rw-r--r-- | pkgs/slick.nix | 21 |
6 files changed, 70 insertions, 32 deletions
@@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1664001220, - "narHash": "sha256-vf9TQTHR0xmo/6ww0+n8iDp4lpuX4R1MYm4Ph95iIr8=", + "lastModified": 1664348222, + "narHash": "sha256-RUxH2nHN5qtOERk/eMovdr309gCBiCH+WVrph+VQ8uc=", "owner": "nix-community", "repo": "fenix", - "rev": "53b4f15ef5a34ad736824d12f3c8d95f9db4657c", + "rev": "764789d59da80f64ead606d2c2d05d7cabf51f2a", "type": "github" }, "original": { @@ -36,19 +36,34 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "microvm": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1663954761, - "narHash": "sha256-7H+tq/o2A6TUf/Vc1dac0u2qlkXZnblYsURhpCbLvmc=", + "lastModified": 1664382008, + "narHash": "sha256-qqUsNfUaqdk6TA0O+mVAW4oUwA5lYwL3eb8iQP7nrMw=", "owner": "astro", "repo": "microvm.nix", - "rev": "4d940ef81e920c2f185b30f9b7107d52dd0c4cd5", + "rev": "b868f5d3e154cdfe0eade41983bfdb5c183b940c", "type": "github" }, "original": { @@ -59,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1663855239, - "narHash": "sha256-A2B7rlFKmBikRwz/cmayWcTAhyIOdp2whjVCDGhg9Xw=", + "lastModified": 1664231666, + "narHash": "sha256-5M/40aTCNC34lSPqZIS7zlldRa7n/yNKI1SrpSGAB34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcc68429a50c4ac051920c72c60e417202c19d79", + "rev": "82379884b2e9cf1ba65f5b14bbcb9d1438abb745", "type": "github" }, "original": { @@ -75,11 +90,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1663433994, - "narHash": "sha256-Bpthhv1PdZRrIFct8KbHACNvOu9bsYAMEaqoH83cvqM=", + "lastModified": 1664201777, + "narHash": "sha256-cUW9DqELUNi1jNMwVSbfq4yl5YGyOfeu+UHUUImbby0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17989edb05615c4f61803b9c427d80b84c289c6b", + "rev": "00f877f4927b6f7d7b75731b5a1e2ae7324eaf14", "type": "github" }, "original": { @@ -91,11 +106,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1663850217, - "narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=", + "lastModified": 1664281702, + "narHash": "sha256-haixZ4TJLu1Dciow54wrHrHvlGDVr5sW6MTeAV/ZLuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90", + "rev": "7e52b35fe98481a279d89f9c145f8076d049d2b9", "type": "github" }, "original": { @@ -108,6 +123,7 @@ "root": { "inputs": { "fenix": "fenix", + "flake-utils": "flake-utils", "microvm": "microvm", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", @@ -117,11 +133,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1663971575, - "narHash": "sha256-B0VM+uer/eyvq4wEgyXABnkNo+3c5WRgViIXEgBfq2M=", + "lastModified": 1664184959, + "narHash": "sha256-Eb8L/wkV1HfZwcewAKrZRiwxTUluapFNVvf5vRdqsKg=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "14400785acd92d6f1b8ec52179a23839dfe542a9", + "rev": "1a24003eb6bc8377e76cd9f70bf6700bc842e99b", "type": "github" }, "original": { @@ -139,11 +155,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1663475375, - "narHash": "sha256-uIhMyLFkU8Tp0uxLd7tKn++G/yHsB9r7YRvsBdoGvsk=", + "lastModified": 1664204020, + "narHash": "sha256-LAey3hr8b9EAt3n304Wt9Vm4uQFd8pSRtLX8leuYFDs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "bae718a9d1e31ec478ddfcb75149f66e9625a825", + "rev": "912f9ff41fd9353dec1f783170793699789fe9aa", "type": "github" }, "original": { diff --git a/modules/basic-tools.nix b/modules/basic-tools.nix index 05fd298..69312f3 100644 --- a/modules/basic-tools.nix +++ b/modules/basic-tools.nix @@ -3,7 +3,6 @@ { environment.systemPackages = with pkgs; [ bat - lsd fd file fzf @@ -16,6 +15,7 @@ ripgrep tealdeer traceroute + tcpdump tree liquidprompt (aspellWithDicts (ps: with ps; [ en en-science en-computers ru de ])) @@ -49,11 +49,11 @@ }; environment.shellAliases = { - ls = "lsd"; - l = "lsd -l"; - la = "lsd -la"; - ll = "lsd -lah"; - lt = "lsd --tree"; + ls = "ls --color=auto"; + l = "ls -l"; + la = "ls -la"; + ll = "ls -lah"; + lt = "ls --tree"; vim = "nvim"; vf = "$EDITOR $(fzf)"; vff = "$EDITOR $(ls|fzf)"; diff --git a/modules/graphical.nix b/modules/graphical.nix index 3aeb97e..6a6aa1f 100644 --- a/modules/graphical.nix +++ b/modules/graphical.nix @@ -8,6 +8,7 @@ screen-message qbittorrent dino + gajim imv mpv zathura @@ -80,7 +81,7 @@ hardware.bluetooth = { enable = true; - package = pkgs.bluezFull; + package = pkgs.bluez; }; programs.zsh.vteIntegration = true; @@ -113,7 +114,7 @@ rofi-wayland grim slurp - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme i3status-rust ]; }; diff --git a/modules/radio.nix b/modules/radio.nix index 21772bc..2a82cc3 100644 --- a/modules/radio.nix +++ b/modules/radio.nix @@ -6,7 +6,7 @@ gqrx cubicsdr - libusb + libusb1 rtl-sdr hackrf soapyhackrf diff --git a/modules/virtualization.nix b/modules/virtualization.nix index 52ab671..bf33cc9 100644 --- a/modules/virtualization.nix +++ b/modules/virtualization.nix @@ -2,7 +2,7 @@ { environment.systemPackages = with pkgs; [ - virtmanager + virt-manager ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; diff --git a/pkgs/slick.nix b/pkgs/slick.nix new file mode 100644 index 0000000..8db0f48 --- /dev/null +++ b/pkgs/slick.nix @@ -0,0 +1,21 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "slick"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "nbari"; + repo = pname; + rev = version; + sha256 = "033ecd2696bfd59fd959eb95f66875a45e5aec54"; + }; + + cargoSha256 = lib.fakeSha256; + + meta = with lib; { + description = "Async ZSH prompt"; + homepage = "https://github.com/nbari/slick"; + license = licenses.bsd3; + }; +} |