summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-06-19 10:59:10 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2022-06-19 10:59:10 +0200
commitdf69b2a47709c7c6d608e7e91f0130e431db00a5 (patch)
treec4ebc0337fb9d32352c32078c5490002953b655b
parent62f748a78fa5cbc52bb3e1432082a1b2b8250f2a (diff)
downloadnixos-df69b2a47709c7c6d608e7e91f0130e431db00a5.tar
nixos-df69b2a47709c7c6d608e7e91f0130e431db00a5.tar.gz
nixos-df69b2a47709c7c6d608e7e91f0130e431db00a5.tar.bz2
nixos-df69b2a47709c7c6d608e7e91f0130e431db00a5.tar.xz
nixos-df69b2a47709c7c6d608e7e91f0130e431db00a5.zip
...
-rw-r--r--accounts/gkleen@sif/autorandr-profiles/def.nix6
-rw-r--r--accounts/gkleen@sif/autorandr-profiles/wk.nix (renamed from accounts/gkleen@sif/autorandr-profiles/bstr.nix)6
-rw-r--r--accounts/gkleen@sif/default.nix27
-rw-r--r--accounts/gkleen@sif/emacs.el2
-rw-r--r--accounts/gkleen@sif/systemd.nix6
-rw-r--r--accounts/gkleen@sif/taffybar/gkleen-sif-taffybar.cabal1
-rw-r--r--accounts/gkleen@sif/taffybar/src/taffybar.hs11
-rw-r--r--accounts/gkleen@sif/wireplumber/bluetooth.lua.d/50-bluez-config.lua4
-rw-r--r--accounts/gkleen@sif/xmonad/xmonad.hs1
-rw-r--r--hosts/sif/default.nix1
-rw-r--r--overlays/worktime/default.nix5
-rw-r--r--user-profiles/mpv/default.nix2
12 files changed, 51 insertions, 21 deletions
diff --git a/accounts/gkleen@sif/autorandr-profiles/def.nix b/accounts/gkleen@sif/autorandr-profiles/def.nix
index 304b4afe..5733dbe7 100644
--- a/accounts/gkleen@sif/autorandr-profiles/def.nix
+++ b/accounts/gkleen@sif/autorandr-profiles/def.nix
@@ -1,3 +1,4 @@
1{ pkgs, ... }:
1{ 2{
2 fingerprint = { 3 fingerprint = {
3 eDP-1-1 = "00ffffffffffff004c83414100000000131d0104b5221378029491ae513eb7240b505400000001010101010101010101010101010101f0d40040f17018803020440058c21000001bf0d40040f17018803020440058c21000001b0000000f00ff093cff093c2c800000000000000000fe0041544e413536575230382d3020011502030f00e3058000e6060501736d0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab"; 4 eDP-1-1 = "00ffffffffffff004c83414100000000131d0104b5221378029491ae513eb7240b505400000001010101010101010101010101010101f0d40040f17018803020440058c21000001bf0d40040f17018803020440058c21000001b0000000f00ff093cff093c2c800000000000000000fe0041544e413536575230382d3020011502030f00e3058000e6060501736d0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab";
@@ -10,4 +11,9 @@
10 mode = "3840x2160"; 11 mode = "3840x2160";
11 }; 12 };
12 }; 13 };
14 hooks = {
15 postswitch = ''
16 ${pkgs.networkmanager}/nmcli radio wifi on
17 '';
18 };
13} 19}
diff --git a/accounts/gkleen@sif/autorandr-profiles/bstr.nix b/accounts/gkleen@sif/autorandr-profiles/wk.nix
index 527f8321..97fa14c9 100644
--- a/accounts/gkleen@sif/autorandr-profiles/bstr.nix
+++ b/accounts/gkleen@sif/autorandr-profiles/wk.nix
@@ -1,3 +1,4 @@
1{ pkgs, ... }:
1{ 2{
2 fingerprint = { 3 fingerprint = {
3 "eDP-1-1" = "00ffffffffffff004c83414100000000131d0104b5221378029491ae513eb7240b505400000001010101010101010101010101010101f0d40040f17018803020440058c21000001bf0d40040f17018803020440058c21000001b0000000f00ff093cff093c2c800000000000000000fe0041544e413536575230382d3020011502030f00e3058000e6060501736d0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab"; 4 "eDP-1-1" = "00ffffffffffff004c83414100000000131d0104b5221378029491ae513eb7240b505400000001010101010101010101010101010101f0d40040f17018803020440058c21000001bf0d40040f17018803020440058c21000001b0000000f00ff093cff093c2c800000000000000000fe0041544e413536575230382d3020011502030f00e3058000e6060501736d0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab";
@@ -18,4 +19,9 @@
18 mode = "3840x2160"; 19 mode = "3840x2160";
19 }; 20 };
20 }; 21 };
22 hooks = {
23 postswitch = ''
24 ${pkgs.networkmanager}/nmcli radio wifi off
25 '';
26 };
21} 27}
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 84b9e464..f28cf4e2 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -88,12 +88,13 @@ in {
88 emacs = { 88 emacs = {
89 enable = true; 89 enable = true;
90 extraPackages = epkgs: with epkgs; [ 90 extraPackages = epkgs: with epkgs; [
91 evil evil-dvorak undo-tree magit haskell-mode 91 evil evil-dvorak undo-tree magit haskell-mode nix-mode
92 nix-mode yaml-mode json-mode shakespeare-mode 92 yaml-mode json-mode shakespeare-mode smart-mode-line
93 smart-mode-line highlight-parentheses highlight-symbol 93 highlight-parentheses highlight-symbol ag sass-mode lua-mode
94 ag sass-mode lua-mode fira-code-mode use-package # notmuch 94 fira-code-mode use-package # notmuch
95 use-package-ensure-system-package git-gutter emacsScratch 95 use-package-ensure-system-package git-gutter emacsScratch
96 edit-server mediawiki editorconfig typescript-mode 96 edit-server mediawiki editorconfig typescript-mode
97 markdown-mode
97 ]; 98 ];
98 }; 99 };
99 firefox = { 100 firefox = {
@@ -123,14 +124,20 @@ in {
123 124
124 autorandr = { 125 autorandr = {
125 enable = true; 126 enable = true;
126 hooks.postswitch = { 127 hooks = {
127 # "restart-compton" = "${pkgs.systemd}/bin/systemctl --user try-restart picom"; 128 preswitch = {
128 "restart-trays" = '' 129 "stop-tray" = ''
129 ${pkgs.coreutils}/bin/sleep 5 130 ${pkgs.systemd}/bin/systemctl --user try-restart tray.target
130 ${pkgs.systemd}/bin/systemctl --user try-restart taffybar
131 ''; 131 '';
132 };
133 postswitch = {
134 # "restart-compton" = "${pkgs.systemd}/bin/systemctl --user try-restart picom";
135 "restart-tray" = ''
136 ${pkgs.systemd}/bin/systemctl --user try-restart tray.target
137 '';
138 };
132 }; 139 };
133 profiles = customUtils.nixImport { dir = ./autorandr-profiles; }; 140 profiles = customUtils.nixImport rec { dir = ./autorandr-profiles; _import = name: _base: import "${toString dir}/${name}" inputs; };
134 }; 141 };
135 142
136 zsh.initExtra = "source ${./zshrc}"; 143 zsh.initExtra = "source ${./zshrc}";
diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el
index 1a7cb863..8b7a4b45 100644
--- a/accounts/gkleen@sif/emacs.el
+++ b/accounts/gkleen@sif/emacs.el
@@ -148,7 +148,7 @@
148 148
149(setq direnv-enabled-hosts '("uni2work-dev1")) 149(setq direnv-enabled-hosts '("uni2work-dev1"))
150 150
151(setq auth-sources '("secrets:Login")) 151(setq auth-sources '())
152 152
153(defun tramp-sh-handle-start-file-process@my-direnv (args) 153(defun tramp-sh-handle-start-file-process@my-direnv (args)
154 "Enable Direnv for hosts in `direnv-enabled-hosts'." 154 "Enable Direnv for hosts in `direnv-enabled-hosts'."
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 1193723f..819c1ff6 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -148,6 +148,12 @@ in {
148 Environment = [ "XSECURELOCK_WANT_FIRST_KEYPRESS=1" ]; 148 Environment = [ "XSECURELOCK_WANT_FIRST_KEYPRESS=1" ];
149 }; 149 };
150 }; 150 };
151 mpris-proxy = {
152 Unit.Description = "Mpris proxy";
153 Unit.After = [ "network.target" "sound.target" ];
154 Service.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
155 Install.WantedBy = [ "default.target" ];
156 };
151 "autossh-socks@proxy.mathw0h:8119" = { 157 "autossh-socks@proxy.mathw0h:8119" = {
152 Service = { 158 Service = {
153 Type = "notify"; 159 Type = "notify";
diff --git a/accounts/gkleen@sif/taffybar/gkleen-sif-taffybar.cabal b/accounts/gkleen@sif/taffybar/gkleen-sif-taffybar.cabal
index 7f56dece..e32cb473 100644
--- a/accounts/gkleen@sif/taffybar/gkleen-sif-taffybar.cabal
+++ b/accounts/gkleen@sif/taffybar/gkleen-sif-taffybar.cabal
@@ -22,6 +22,7 @@ executable taffybar
22 , text 22 , text
23 , HStringTemplate 23 , HStringTemplate
24 , gtk-sni-tray 24 , gtk-sni-tray
25 , hslogger
25 other-modules: Paths_gkleen_sif_taffybar 26 other-modules: Paths_gkleen_sif_taffybar
26 , System.Taffybar.Widget.Clock 27 , System.Taffybar.Widget.Clock
27 , System.Taffybar.Widget.TooltipBattery 28 , System.Taffybar.Widget.TooltipBattery
diff --git a/accounts/gkleen@sif/taffybar/src/taffybar.hs b/accounts/gkleen@sif/taffybar/src/taffybar.hs
index 7dbb5c8e..13585c55 100644
--- a/accounts/gkleen@sif/taffybar/src/taffybar.hs
+++ b/accounts/gkleen@sif/taffybar/src/taffybar.hs
@@ -21,15 +21,20 @@ import Control.Monad.Trans.Reader (mapReaderT)
21 21
22import Paths_gkleen_sif_taffybar 22import Paths_gkleen_sif_taffybar
23 23
24import System.Log.Logger
25
24 26
25main :: IO () 27main :: IO ()
26main = do 28main = do
29 logger <- getLogger "System.Taffybar"
30 saveGlobalLogger $ setLevel INFO logger
31
27 myCssPath <- getDataFileName "taffybar.css" 32 myCssPath <- getDataFileName "taffybar.css"
28 startTaffybar exampleTaffybarConfig{ cssPath = Just myCssPath } 33 startTaffybar taffybarConfig{ cssPath = Just myCssPath }
29 34
30 35
31exampleTaffybarConfig :: TaffybarConfig 36taffybarConfig :: TaffybarConfig
32exampleTaffybarConfig = 37taffybarConfig =
33 let myWorkspacesConfig = 38 let myWorkspacesConfig =
34 defaultWorkspacesConfig 39 defaultWorkspacesConfig
35 { maxIcons = Just 0 40 { maxIcons = Just 0
diff --git a/accounts/gkleen@sif/wireplumber/bluetooth.lua.d/50-bluez-config.lua b/accounts/gkleen@sif/wireplumber/bluetooth.lua.d/50-bluez-config.lua
index 7934e392..b0f2b55b 100644
--- a/accounts/gkleen@sif/wireplumber/bluetooth.lua.d/50-bluez-config.lua
+++ b/accounts/gkleen@sif/wireplumber/bluetooth.lua.d/50-bluez-config.lua
@@ -5,7 +5,7 @@ rule = {
5 }, 5 },
6 }, 6 },
7 apply_properties = { 7 apply_properties = {
8 ["bluez5.auto-connect"] = "[ hfp_hf hsp_hs a2dp_sink ]", 8 -- ["bluez5.auto-connect"] = "[ hfp_hf hsp_hs a2dp_sink ]",
9 }, 9 },
10} 10}
11 11
@@ -15,6 +15,4 @@ bluez_monitor.properties = {
15 ["bluez5.enable-msbc"] = true, 15 ["bluez5.enable-msbc"] = true,
16 ["bluez5.enable-sbc-xq"] = true, 16 ["bluez5.enable-sbc-xq"] = true,
17 ["bluez5.enable-hw-volume"] = true, 17 ["bluez5.enable-hw-volume"] = true,
18 ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]",
19 ["bluez5.codecs"] = "[ sbc sbc_xq aac ldac aptx aptx_hd aptx_ll aptx_ll_duplex faststream faststream_duplex ]",
20} 18}
diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs
index 1b73b7a1..48fb4ab2 100644
--- a/accounts/gkleen@sif/xmonad/xmonad.hs
+++ b/accounts/gkleen@sif/xmonad/xmonad.hs
@@ -199,6 +199,7 @@ hostFromName h
199 , assign "monitor" $ className =? "Virt-viewer" 199 , assign "monitor" $ className =? "Virt-viewer"
200 , assign "monitor" $ (className =? "Alacritty" <&&> resource =? "htop") 200 , assign "monitor" $ (className =? "Alacritty" <&&> resource =? "htop")
201 , assign "monitor" $ (className =? "Alacritty" <&&> resource =? "monitor") 201 , assign "monitor" $ (className =? "Alacritty" <&&> resource =? "monitor")
202 , assign "monitor" $ className =? "xfreerdp"
202 , Just $ (className =? "Alacritty" <&&> resource =? "htop") -?> centerFloat 203 , Just $ (className =? "Alacritty" <&&> resource =? "htop") -?> centerFloat
203 , Just $ (className =? "Scp-dbus-service.py") -?> centerFloat 204 , Just $ (className =? "Scp-dbus-service.py") -?> centerFloat
204 , Just $ (className =? "Alacritty" <&&> resource =? "log") -?> centerFloat 205 , Just $ (className =? "Alacritty" <&&> resource =? "log") -?> centerFloat
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index a79cfaa7..c3f4bd41 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -22,6 +22,7 @@ in {
22 system = "x86_64-linux"; 22 system = "x86_64-linux";
23 config = { 23 config = {
24 allowUnfree = true; 24 allowUnfree = true;
25 pulseaudio = true;
25 }; 26 };
26 }; 27 };
27 28
diff --git a/overlays/worktime/default.nix b/overlays/worktime/default.nix
index 67be75ae..a8ee15e3 100644
--- a/overlays/worktime/default.nix
+++ b/overlays/worktime/default.nix
@@ -5,9 +5,8 @@
5 5
6 phases = [ "buildPhase" "checkPhase" "installPhase" ]; 6 phases = [ "buildPhase" "checkPhase" "installPhase" ];
7 7
8 buildInputs = [ 8 python = prev.python39.withPackages (ps: with ps; [pyxdg dateutil uritools requests configparser tabulate]);
9 (prev.python39.withPackages (ps: with ps; [pyxdg dateutil uritools requests configparser tabulate])) 9 buildInputs = [ python ];
10 ];
11 10
12 buildPhase = '' 11 buildPhase = ''
13 substituteAll $src worktime 12 substituteAll $src worktime
diff --git a/user-profiles/mpv/default.nix b/user-profiles/mpv/default.nix
index ec866af4..33b0ffaf 100644
--- a/user-profiles/mpv/default.nix
+++ b/user-profiles/mpv/default.nix
@@ -19,7 +19,7 @@
19 "deadzonesize=0.9" 19 "deadzonesize=0.9"
20 "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp" 20 "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp"
21 "chapterskip-skip=sponsor;intro;endcard" 21 "chapterskip-skip=sponsor;intro;endcard"
22 "chapterskip-categories=sponsor>%[SponsorBlock%]: .*Sponsor.*/intro>%[SponsorBlock%]: .*Intro Animation.*/endcard>%[SponsorBlock%]: .*Endcards.*" 22 "chapterskip-categories=sponsor>%[SponsorBlock%]: .*Sponsor.*;intro>%[SponsorBlock%]: .*Intro Animation.*;endcard>%[SponsorBlock%]: .*Endcards.*"
23 ]; 23 ];
24 }; 24 };
25 scripts = [ 25 scripts = [