From aa9aacf494b039b7b907b76fee3eb643b5dd13a2 Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Wed, 13 May 2020 12:34:15 +0300 Subject: [PATCH] feat: neofetch, some clis and stuff --- RustLab/hello-world/main.rs | 3 +++ modules/applications/misc.nix | 5 ++++- modules/applications/shells/common.nix | 4 ++++ modules/applications/shells/fish.nix | 9 ++++----- modules/dev/default.nix | 3 ++- nix/sources.json | 12 ++++++------ 6 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 RustLab/hello-world/main.rs create mode 100644 modules/applications/shells/common.nix diff --git a/RustLab/hello-world/main.rs b/RustLab/hello-world/main.rs new file mode 100644 index 0000000..fbedd92 --- /dev/null +++ b/RustLab/hello-world/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} \ No newline at end of file diff --git a/modules/applications/misc.nix b/modules/applications/misc.nix index d47d2a9..3ebdba2 100644 --- a/modules/applications/misc.nix +++ b/modules/applications/misc.nix @@ -5,7 +5,10 @@ exa # ls replacement mkpasswd # hash passwords gnupg - typespeed + typespeed # speed typing game + unixtools.xxd # to dump binary stuff into a text file (used it for a ctf) + youtube-dl # download from youtube + neofetch # display system information # editors vscodium diff --git a/modules/applications/shells/common.nix b/modules/applications/shells/common.nix new file mode 100644 index 0000000..ac77309 --- /dev/null +++ b/modules/applications/shells/common.nix @@ -0,0 +1,4 @@ +{ + shellInit = + "neofetch --package_managers on --cpu_brand on --cpu_cores on --memory_percent on --memory_display infobar --os_arch on"; +} diff --git a/modules/applications/shells/fish.nix b/modules/applications/shells/fish.nix index f712e7e..7f4082a 100644 --- a/modules/applications/shells/fish.nix +++ b/modules/applications/shells/fish.nix @@ -1,13 +1,12 @@ { pkgs, ... }: -let shellAliases = import ./aliases.nix; +let + shellAliases = import ./aliases.nix; + common = import ./common.nix; in { home-manager.users.adrielus.programs.fish = { inherit shellAliases; + shellInit = common.shellInit; enable = true; - # plugins = [{ - # name = "agnoster"; - # src = pkgs.agnoster; - # }]; }; } diff --git a/modules/dev/default.nix b/modules/dev/default.nix index 1b18092..580daa4 100644 --- a/modules/dev/default.nix +++ b/modules/dev/default.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ pkgs, ... }: { + home-manager.users.adrielus.home.packages = with pkgs; [ gcc ]; imports = [ ./nix.nix ./purescript.nix ./javascript.nix ./rust.nix ./haskell ]; } diff --git a/nix/sources.json b/nix/sources.json index 0e92827..8ef1c9f 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "nix-community", "repo": "NUR", - "rev": "66432256212d9532e8df9dfc207a545e3c2b35fd", - "sha256": "06piqg32cvkrk6g9z46j3xvzpc8r323qic8976wpzr43smpqndq8", + "rev": "363eb0959236e9ee69af19cdb311fc5ebabd8542", + "sha256": "0rl5zi5kzd298mk3rrkvwwqfs2xwfzsc2y8ch61f0jqf2xp8jslq", "type": "tarball", - "url": "https://github.com/nix-community/NUR/archive/66432256212d9532e8df9dfc207a545e3c2b35fd.tar.gz", + "url": "https://github.com/nix-community/NUR/archive/363eb0959236e9ee69af19cdb311fc5ebabd8542.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "agnoster": { @@ -89,10 +89,10 @@ "homepage": "https://github.com/NixOS/nixpkgs", "owner": "NixOS", "repo": "nixpkgs-channels", - "rev": "d6c1b566b770cf4cf0c6d4a693da6bdf28c2c3b0", - "sha256": "00vm9shmpywx9dzaj0c7vap1ldimdsr7lw2n8p70qza87nmp9dai", + "rev": "14dd961b8d5a2d2d3b2cf6526d47cbe5c3e97039", + "sha256": "07nc06mff31hwg6d7spnabfbipxjxhg856z1gcwbyr1cx299y996", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/d6c1b566b770cf4cf0c6d4a693da6bdf28c2c3b0.tar.gz", + "url": "https://github.com/NixOS/nixpkgs-channels/archive/14dd961b8d5a2d2d3b2cf6526d47cbe5c3e97039.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-unstable": {