forked from colonelpanic/dotfiles
Merge branch 'master' of github.com:IvanMalison/dotfiles
This commit is contained in:
commit
00281d089d
@ -2,33 +2,17 @@
|
||||
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; };
|
||||
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; } ;
|
||||
|
19
dotfiles/config/taffybar/overlay.nix
Normal file
19
dotfiles/config/taffybar/overlay.nix
Normal file
@ -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";
|
||||
}) { };
|
||||
});
|
||||
});
|
||||
}
|
@ -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
|
||||
|
@ -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
|
||||
];
|
||||
}
|
@ -8,7 +8,6 @@
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(import ../dotfiles/config/xmonad/overlay.nix)
|
||||
(import ../dotfiles/config/taffybar/overlay.nix)
|
||||
];
|
||||
|
||||
# Allow all the things
|
||||
@ -41,8 +40,6 @@
|
||||
'';
|
||||
};
|
||||
|
||||
programs.zsh.enable = true;
|
||||
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
nssmdns = true;
|
||||
@ -74,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;
|
||||
|
@ -27,6 +27,8 @@ in
|
||||
element-desktop
|
||||
|
||||
# Appearance
|
||||
numix-icon-theme-circle
|
||||
papirus-icon-theme
|
||||
hicolor-icon-theme
|
||||
|
||||
# XOrg
|
||||
|
@ -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
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 8d94749561763f58b8bdc3bc354d1803b1a31d31
|
||||
Subproject commit fe2bcc776a68b5d831c67cc78c6398729f8dca35
|
Loading…
Reference in New Issue
Block a user