From 82befc8adfdbd48b7d1052c82ebd8efe5c8a8449 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 24 Jul 2021 00:05:39 -0600 Subject: [PATCH 1/6] [NixOS] Install numix-icon-them-circle by default --- nixos/appearance.nix | 12 ------------ nixos/base.nix | 1 - nixos/essential.nix | 2 ++ 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 nixos/appearance.nix diff --git a/nixos/appearance.nix b/nixos/appearance.nix deleted file mode 100644 index 9cff6e51..00000000 --- a/nixos/appearance.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - # Appearance - gnome-breeze - gnome3.adwaita-icon-theme - hicolor-icon-theme - materia-theme - numix-icon-theme-circle - papirus-icon-theme - ]; -} diff --git a/nixos/base.nix b/nixos/base.nix index b4d32fb0..4dd8975d 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -8,7 +8,6 @@ nixpkgs.overlays = [ (import ../dotfiles/config/xmonad/overlay.nix) - (import ../dotfiles/config/taffybar/overlay.nix) ]; # Allow all the things diff --git a/nixos/essential.nix b/nixos/essential.nix index def250bc..c91f9046 100644 --- a/nixos/essential.nix +++ b/nixos/essential.nix @@ -27,6 +27,8 @@ in element-desktop # Appearance + numix-icon-theme-circle + papirus-icon-theme hicolor-icon-theme # XOrg From 545ec85489b53cc64024f822574bed9bd29165fa Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 24 Jul 2021 03:09:43 -0600 Subject: [PATCH 2/6] [XMonad] Fix EWMH support for _NET_ACTIVE_WINDOW --- dotfiles/config/xmonad/xmonad.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs index 160358a8..6101475c 100644 --- a/dotfiles/config/xmonad/xmonad.hs +++ b/dotfiles/config/xmonad/xmonad.hs @@ -91,7 +91,7 @@ myConfig = def , logHook = updatePointer (0.5, 0.5) (0, 0) +++ toggleFadeInactiveLogHook 0.9 +++ workspaceHistoryHook +++ - setWorkspaceNames + setWorkspaceNames +++ activateLogHook (reader W.focusWindow >>= doF) <+> logHook def , handleEventHook = fullscreenEventHook +++ followIfNoMagicFocus +++ minimizeEventHook , startupHook = myStartup From 9478b96b969a045fe58932e92ae24d1bbb2db71c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 24 Jul 2021 03:10:33 -0600 Subject: [PATCH 3/6] Remove brewfile --- Brewfile | 1 - 1 file changed, 1 deletion(-) delete mode 120000 Brewfile diff --git a/Brewfile b/Brewfile deleted file mode 120000 index 1e600268..00000000 --- a/Brewfile +++ /dev/null @@ -1 +0,0 @@ -tasks/brewfiles/essential \ No newline at end of file From 3bbf98fdbd5e2a4d57889ead221363e5f557ce71 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 24 Jul 2021 03:10:46 -0600 Subject: [PATCH 4/6] [taffybar] Make nix develop for both taffybar and my config --- dotfiles/config/taffybar/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix index e5fbb813..d067d0bb 100644 --- a/dotfiles/config/taffybar/flake.nix +++ b/dotfiles/config/taffybar/flake.nix @@ -28,7 +28,7 @@ in rec { devShell = pkgs.haskellPackages.shellFor { - packages = p: [ p.imalison-taffybar ]; + packages = p: [ p.imalison-taffybar p.taffybar ]; }; defaultPackage = pkgs.haskellPackages.imalison-taffybar; }) // { inherit overlay overlays; } ; From 613a8a9ab8e71481bd2aa9e6591bd6abb0d34538 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 24 Jul 2021 18:16:19 -0600 Subject: [PATCH 5/6] [NixOS] Fix taffybar overlay --- dotfiles/config/taffybar/flake.nix | 20 ++------------------ dotfiles/config/taffybar/overlay.nix | 19 +++++++++++++++++++ nixos/flake.nix | 4 ++-- 3 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 dotfiles/config/taffybar/overlay.nix diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix index d067d0bb..2b8dcb2b 100644 --- a/dotfiles/config/taffybar/flake.nix +++ b/dotfiles/config/taffybar/flake.nix @@ -2,26 +2,10 @@ inputs = { taffybar.url = path:./taffybar; flake-utils.url = github:numtide/flake-utils; - git-ignore-nix.url = github:IvanMalison/gitignore.nix/master; }; - outputs = { self, flake-utils, taffybar, git-ignore-nix, nixpkgs }: + outputs = { self, flake-utils, taffybar, nixpkgs }: let - overlay = final: prev: { - haskellPackages = prev.haskellPackages.override (old: { - overrides = prev.lib.composeExtensions (old.overrides or (_: _: {})) - (hself: hsuper: { - imalison-taffybar = hself.callCabal2nix "imalison-taffybar" - (git-ignore-nix.gitIgnoreSource ./.) - { }; - coinbase-pro = hself.callCabal2nix "coinbase-pro" (final.fetchFromGitHub { - owner = "IvanMalison"; - repo = "coinbase-pro"; - rev = "8ac93b7905150c8cbd6957102a730ecceb8b4dba"; - sha256 = "0v0xw593xczvvalh24bz37v2zbfz92dhz71f04m08abgphqmjvxq"; - }) { }; - }); - }); - }; + overlay = import ./overlay.nix; overlays = taffybar.overlays ++ [ overlay ]; in flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system overlays; config.allowBroken = true; }; diff --git a/dotfiles/config/taffybar/overlay.nix b/dotfiles/config/taffybar/overlay.nix new file mode 100644 index 00000000..3de900f3 --- /dev/null +++ b/dotfiles/config/taffybar/overlay.nix @@ -0,0 +1,19 @@ +final: prev: { + haskellPackages = prev.haskellPackages.override (old: { + overrides = prev.lib.composeExtensions (old.overrides or (_: _: {})) + (hself: hsuper: { + imalison-taffybar = hself.callCabal2nix "imalison-taffybar" + ( + final.lib.sourceByRegex ./. + ["taffybar.hs" "imalison-taffybar.cabal"] + ) + { }; + coinbase-pro = hself.callCabal2nix "coinbase-pro" (final.fetchFromGitHub { + owner = "IvanMalison"; + repo = "coinbase-pro"; + rev = "8ac93b7905150c8cbd6957102a730ecceb8b4dba"; + sha256 = "0v0xw593xczvvalh24bz37v2zbfz92dhz71f04m08abgphqmjvxq"; + }) { }; + }); + }); +} diff --git a/nixos/flake.nix b/nixos/flake.nix index fcb7a87f..ae207387 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -21,7 +21,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; taffybar = { - url = path:../dotfiles/config/taffybar; + url = path:../dotfiles/config/taffybar/taffybar; inputs.nixpkgs.follows = "nixpkgs"; }; notifications-tray-icon = { @@ -41,7 +41,7 @@ }; nixpkgs.overlays = [ nix.overlay xmonad.overlay xmonad-contrib.overlay - notifications-tray-icon.overlay + notifications-tray-icon.overlay (import ../dotfiles/config/taffybar/overlay.nix) ] ++ taffybar.overlays; imports = [ home-manager.nixosModule From 08774bd1802688d2a906a01c5bf5c7937901397a Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 24 Jul 2021 20:24:58 -0600 Subject: [PATCH 6/6] [NixOS] Configure zsh in NixOS configuration --- nixos/base.nix | 15 +++++++++++++-- nixos/nixpkgs | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/base.nix b/nixos/base.nix index 4dd8975d..14b39c9a 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -40,8 +40,6 @@ ''; }; - programs.zsh.enable = true; - services.avahi = { enable = true; nssmdns = true; @@ -73,6 +71,19 @@ # TODO: Add a comment explaining what this does. services.gnome.at-spi2-core.enable = true; + # Shell configuration + programs.zsh = { + enable = true; + syntaxHighlighting = { + enable = true; + }; + ohMyZsh = { + enable = true; + plugins = [ "git" "sudo" "pip" ]; + }; + spaceship-prompt.enable = true; + }; + services.openssh.enable = true; services.autorandr.enable = true; diff --git a/nixos/nixpkgs b/nixos/nixpkgs index 8d947495..fe2bcc77 160000 --- a/nixos/nixpkgs +++ b/nixos/nixpkgs @@ -1 +1 @@ -Subproject commit 8d94749561763f58b8bdc3bc354d1803b1a31d31 +Subproject commit fe2bcc776a68b5d831c67cc78c6398729f8dca35