From d4c8f393f23f551f100710d293ff44d97ea52795 Mon Sep 17 00:00:00 2001 From: Akshay Date: Mon, 19 Sep 2022 16:13:36 +0530 Subject: pin nvim, add zoom, cmus-np --- flake.lock | 106 +++--------------------------------------- flake.nix | 5 +- home.nix | 2 + hosts/olive/configuration.nix | 6 ++- programs/htop.nix | 17 ++++++- programs/tmux.nix | 26 +++++++++-- theme/default.nix | 2 +- x/rxvt.nix | 6 +-- 8 files changed, 55 insertions(+), 115 deletions(-) diff --git a/flake.lock b/flake.lock index d98000d..cb196f6 100644 --- a/flake.lock +++ b/flake.lock @@ -44,37 +44,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -138,57 +107,13 @@ "type": "github" } }, - "neovim": { - "inputs": { - "flake-compat": "flake-compat", - "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660983413, - "narHash": "sha256-qy254SuW4aeKoCSDkHc94PvBbiWBwKE2rYCbg2YgByA=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "a8da96a656f22d5dfdd090a32293187159cb55ee", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "neovim", - "nixpkgs" - ] - }, - "locked": { - "dir": "contrib", - "lastModified": 1660982695, - "narHash": "sha256-LJrwB5xU5+9ym8HY0eEA1QfUDb+UF9PWMy23WChGXdY=", - "owner": "neovim", - "repo": "neovim", - "rev": "1cc4706e94489498b12c4844c1b3a2e9aa5cc921", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1660407119, - "narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=", + "lastModified": 1662714967, + "narHash": "sha256-IOTq5tAGGmBFj7tQbkcyLE261JUeTUucEE3p0WLZ4qM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1", + "rev": "1fec8fda86dac5701146c77d5f8a414b14ed1ff6", "type": "github" }, "original": { @@ -199,27 +124,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660819943, - "narHash": "sha256-TRZV/mlW1eYuojqDC3ueYWj7jsTKXJCtyMLNYX/Ybtw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8ea014acc33da95ea56c902229957d8225005163", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1660926553, - "narHash": "sha256-19Ib1b7Ny+yGhnxwnH1KhhB2hvALuNuqevA6XzqkQmo=", + "lastModified": 1662099760, + "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00e376e3f3c22d991052dfeaf154c42b09deeb29", + "rev": "67e45078141102f45eff1589a831aeaa3182b41e", "type": "github" }, "original": { @@ -254,9 +163,8 @@ "root": { "inputs": { "home-manager": "home-manager", - "neovim": "neovim", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "prompt": "prompt", "statix": "statix" } diff --git a/flake.nix b/flake.nix index ce35ce8..8293654 100644 --- a/flake.nix +++ b/flake.nix @@ -11,8 +11,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - neovim.url = "github:nix-community/neovim-nightly-overlay"; - statix = { url = "git+https://git.peppe.rs/languages/statix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -30,14 +28,12 @@ , nixpkgs , nixos-hardware , home-manager - , neovim , statix , prompt , ... } @ inputs: { overlays = { - nvim-nightly = neovim.overlay; statix = statix.overlay; prompt = prompt.overlay; }; @@ -46,6 +42,7 @@ olive = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ + ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; }) { imports = [ ./hosts/olive/configuration.nix ]; _module.args.self = self; diff --git a/home.nix b/home.nix index adeaace..92d6c81 100644 --- a/home.nix +++ b/home.nix @@ -59,6 +59,8 @@ rtorrent sxiv lftp + zoom-us + pavucontrol # meta nixpkgs-review diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix index c4e7f17..3d5d47f 100644 --- a/hosts/olive/configuration.nix +++ b/hosts/olive/configuration.nix @@ -51,10 +51,12 @@ ../../patches/st/ligatures.diff ]; }; + + # for zoom-us + allowUnfree = true; }; nixpkgs.overlays = with self.overlays; [ - nvim-nightly statix prompt ]; @@ -89,7 +91,7 @@ pulseaudio = { enable = true; package = pkgs.pulseaudioFull; - extraConfig = "load-module module-switch-on-connect"; + extraConfig = "load-module module-bluetooth-policy auto_switch=2"; }; bluetooth = { enable = true; diff --git a/programs/htop.nix b/programs/htop.nix index a48b70c..fca3487 100644 --- a/programs/htop.nix +++ b/programs/htop.nix @@ -6,6 +6,21 @@ { programs.htop = { enable = true; - settings.color_scheme = 1; # monochrome + settings = { + color_scheme = 1; # monochrome + show_program_path = 0; + fields = with config.lib.htop.fields; [ + PID + M_SIZE + M_RESIDENT + M_SHARE + STATE + PERCENT_CPU + PERCENT_MEM + TIME + COMM + ]; + + }; }; } diff --git a/programs/tmux.nix b/programs/tmux.nix index e5c5aa1..11efa39 100644 --- a/programs/tmux.nix +++ b/programs/tmux.nix @@ -3,6 +3,20 @@ , ... }: +let + cmus-np = pkgs.writeScriptBin "cmus-np" '' + ${pkgs.cmus}/bin/cmus-remote -Q | awk ' + /tag artist/ { $1=$2=""; artist = substr($0,3) } + /tag title/ { $1=$2=""; title = substr($0,3) } + END { printf "%s ยท %s\n", artist, title} + ' + ''; + + cmus-status = pkgs.writeScriptBin "cmus-status" '' + ${pkgs.cmus}/bin/cmus-remote -Q | awk '/status/ { print $2 }' + ''; + +in { programs.tmux = { enable = true; @@ -74,14 +88,16 @@ set -g status-style "bg=colour0" set -ag status-style "fg=colour7" - set -g status-right "#[fg=colour15]#(date +"%H%M") #[fg=colour8]hrs " - set -ag status-right "#[fg=colour15]#(date +"%d/%m")#[fg=colour8] #(date +"%Y") " - set -ag status-right "#[fg=colour7]#(bat -q)#[fg=colour12]" + set status-right-length 70 + set -g status-right "#[fg=colour15]#(${cmus-np}/bin/cmus-np) #[fg=colour8]#(${cmus-status}/bin/cmus-status) " + set -ag status-right "#[fg=colour15]#(date +"%H%M") #[fg=colour8]hrs " + set -ag status-right "#[fg=colour15]#(date +"%d/%m")#[fg=colour8] #(date +"%Y")" # status left - set -g status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd '#{pane_current_path}') " - set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt vcs '#{pane_current_path}')" set status-left-length 50 + set -g status-left "#[fg=colour7]#(bat -q) " + set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd '#{pane_current_path}') " + set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt vcs '#{pane_current_path}')" ''; }; } diff --git a/theme/default.nix b/theme/default.nix index b3af086..7c67057 100644 --- a/theme/default.nix +++ b/theme/default.nix @@ -3,4 +3,4 @@ let night = import ./night.nix; gruvbox = import ./gruvbox.nix; in -night +day diff --git a/x/rxvt.nix b/x/rxvt.nix index 3498bd0..5744bd0 100644 --- a/x/rxvt.nix +++ b/x/rxvt.nix @@ -33,9 +33,9 @@ with theme; "URxvt.font" = "xft:Nerd Input:size=11:style=Medium"; "URxvt.italicFont" = "xft:Nerd Input:size=11:style=Medium"; "URxvt.boldFont" = "xft:Nerd Input:size=11:style=Medium"; - "*font" = "Nerd Input:size=11:style=Regular"; - "*italicFont" = "Nerd Input:size=11:style=Italic"; - "*boldFont" = "Nerd Input:size=11:style=Bold"; + "*font" = "Berkeley Mono:size=11:style=Regular"; + "*italicFont" = "Berkeley Mono:size=11:style=Italic"; + "*boldFont" = "Berkeley Mono:size=11:style=Bold"; "URxvt.lineSpace" = 0; "URxvt.letterSpace" = 0; -- cgit v1.2.3