wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

[NixOS] Huge changes to a bunch of stuff (including taffybar) to be able to bump nixpkgs

Browse Source
This commit is contained in:
Ivan Malison 2022-05-30 14:25:07 -06:00
parent bf08731d1e
commit 139405f4e3
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
12 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dotfiles/config/taffybar/imalison-taffybar.cabal
View File

@ -18,7 +18,6 @@ executable taffybar
build-depends: base build-depends: base
, X11 , X11
, bytestring , bytestring
, coinbase-pro
, containers , containers
, directory , directory
, filepath , filepath

2
dotfiles/config/taffybar/taffybar

@ -1 +1 @@
Subproject commit 2f8b1aa745876846f67bc40504b5917157ccbec9 Subproject commit 945a08452660de603193da8d297d559fdca497d1

2
dotfiles/config/xmonad/xmonad

@ -1 +1 @@
Subproject commit a4fbe5a5557a51cb52a14593b0ca78154b086f91 Subproject commit 90c719148b21db6d42a62889ea72d952a8317bee

2
dotfiles/config/xmonad/xmonad-contrib

@ -1 +1 @@
Subproject commit fab8e2de73470b29e8d700f0820d44e397126521 Subproject commit 9cdc5398e524b3a3fd7810198867e21b85b613a3

4
dotfiles/config/xmonad/xmonad.hs
View File

@ -760,7 +760,7 @@ setFocusedScreen :: ScreenId -> WindowSet -> WindowSet
setFocusedScreen to ws = setFocusedScreen to ws =
maybe ws (`setFocusedScreen'` ws) $ find ((to ==) . W.screen) (W.visible ws) maybe ws (`setFocusedScreen'` ws) $ find ((to ==) . W.screen) (W.visible ws)
setFocusedScreen' to ws @ W.StackSet setFocusedScreen' to ws@W.StackSet
{ W.current = prevCurr { W.current = prevCurr
, W.visible = visible , W.visible = visible
} = ws { W.current = to } = ws { W.current = to
@ -769,7 +769,7 @@ setFocusedScreen' to ws @ W.StackSet
where screenEq a b = W.screen a == W.screen b where screenEq a b = W.screen a == W.screen b
nextScreen ws @ W.StackSet { W.visible = visible } = nextScreen ws@W.StackSet { W.visible = visible } =
case visible of case visible of
next:_ -> setFocusedScreen (W.screen next) ws next:_ -> setFocusedScreen (W.screen next) ws
_ -> ws _ -> ws

9
dotfiles/emacs.d/README.org
View File

@ -3907,15 +3907,6 @@ I've disabled magithub because it causes magit to be super slow
(interactive) (interactive)
(gitolite-clone-get-projects nil nil t)))) (gitolite-clone-get-projects nil nil t))))
#+END_SRC #+END_SRC
** gitconfig-mode
#+BEGIN_SRC emacs-lisp
(use-package gitconfig-mode
:mode "\\.?gitconfig.?.*\\'")
#+END_SRC
** gitignore-mode
#+BEGIN_SRC emacs-lisp
(use-package gitignore-mode
:mode "\\.?gitignore.?.*\\'")
#+END_SRC #+END_SRC
** github ** github
*** github-search *** github-search

5
nixos/all.nix
View File

@ -32,7 +32,7 @@
zoom-us zoom-us
# Appearance # Appearance
gnome-breeze libsForQt5.breeze-gtk
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
hicolor-icon-theme hicolor-icon-theme
materia-theme materia-theme
@ -79,8 +79,6 @@
pavucontrol pavucontrol
playerctl playerctl
# Tools # Tools
automake automake
bind bind
@ -89,7 +87,6 @@
dex dex
direnv direnv
dpkg dpkg
emacs27Packages.cask
fd fd
file file
gcc gcc

3
nixos/base.nix
View File

@ -32,6 +32,7 @@
# Disabling these waits disables the stuck on boot up issue # Disabling these waits disables the stuck on boot up issue
systemd.services.systemd-udev-settle.enable = false; systemd.services.systemd-udev-settle.enable = false;
systemd.services.NetworkManager-wait-online.enable = false; systemd.services.NetworkManager-wait-online.enable = false;
systemd.services.systemd-user-sessions.enable = false;
# Security # Security
programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
@ -46,7 +47,7 @@
networking.networkmanager = { networking.networkmanager = {
enable = true; enable = true;
enableStrongSwan = true; enableStrongSwan = true;
packages = [ pkgs.networkmanager-l2tp ]; plugins = [ pkgs.networkmanager-l2tp ];
extraConfig = '' extraConfig = ''
[main] [main]
rc-manager=resolvconf rc-manager=resolvconf

1
nixos/essential.nix
View File

@ -18,6 +18,7 @@ in
nixpkgs.overlays = [ nixpkgs.overlays = [
(import ../dotfiles/config/xmonad/overlay.nix) (import ../dotfiles/config/xmonad/overlay.nix)
]; ];
nixpkgs.config.allowBroken = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
python-with-my-packages python-with-my-packages

2
nixos/home-manager

@ -1 +1 @@
Subproject commit 9580f6c42af2535dc7890edb681ead090f5105f2 Subproject commit e66f0ff69a6c0698b35034b842c4b68814440778

2
nixos/home-manager.nix
View File

@ -55,7 +55,7 @@
services.random-background = { services.random-background = {
enable = true; enable = true;
display = "scale"; display = "center";
interval = "1h"; interval = "1h";
imageDirectory = "%h/Pictures/wallpaper/use"; imageDirectory = "%h/Pictures/wallpaper/use";
}; };

2
nixos/nixpkgs

@ -1 +1 @@
Subproject commit 778f7cea96f3227d7bdb8e1b63ecf7afaac50d24 Subproject commit 78bb57e8f79248989c940c49d39bf47a72ae7b5a