Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

l: use the same font everywhere

Browse Source
This commit is contained in:
lassulus 2017-09-19 11:45:33 +02:00
parent ca89d9a176
commit 79c5b96355
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lass/2configs/baseX.nix
View File

@ -27,6 +27,12 @@ in {
lass ALL= (root) NOPASSWD:SETENV: ${pkgs.sshuttle}/bin/.sshuttle-wrapped lass ALL= (root) NOPASSWD:SETENV: ${pkgs.sshuttle}/bin/.sshuttle-wrapped
''; '';
} }
{ #font magic
options.lass.myFont = mkOption {
type = types.str;
default = "-schumacher-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
};
}
]; ];
users.extraUsers.mainUser.extraGroups = [ "audio" "video" ]; users.extraUsers.mainUser.extraGroups = [ "audio" "video" ];

4
lass/2configs/xresources.nix
View File

@ -8,8 +8,8 @@ let
URxvt*scrollBar: false URxvt*scrollBar: false
URxvt*urgentOnBell: true URxvt*urgentOnBell: true
URxvt*SaveLines: 4096 URxvt*SaveLines: 4096
URxvt*font: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1 URxvt*font: ${config.lass.myFont}
URxvt*boldFont: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1 URxvt*boldFont: ${config.lass.myFont}
! ref https://github.com/muennich/urxvt-perls ! ref https://github.com/muennich/urxvt-perls
URxvt.perl-lib: ${pkgs.urxvt_perls}/lib/urxvt/perl URxvt.perl-lib: ${pkgs.urxvt_perls}/lib/urxvt/perl

4
lass/5pkgs/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }@args: { config, pkgs, ... }@args:
{ {
nixpkgs.config.packageOverrides = rec { nixpkgs.config.packageOverrides = rec {
@ -20,7 +20,7 @@
rs = pkgs.callPackage ./rs/default.nix {}; rs = pkgs.callPackage ./rs/default.nix {};
urban = pkgs.callPackage ./urban/default.nix {}; urban = pkgs.callPackage ./urban/default.nix {};
xml2json = pkgs.callPackage ./xml2json/default.nix {}; xml2json = pkgs.callPackage ./xml2json/default.nix {};
xmonad-lass = import ./xmonad-lass.nix { inherit pkgs; }; xmonad-lass = import ./xmonad-lass.nix { inherit config pkgs; };
yt-next = pkgs.callPackage ./yt-next/default.nix {}; yt-next = pkgs.callPackage ./yt-next/default.nix {};
}; };
} }

17
lass/5pkgs/xmonad-lass.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }: { config, pkgs, ... }:
pkgs.writeHaskell "xmonad-lass" { pkgs.writeHaskell "xmonad-lass" {
executables.xmonad = { executables.xmonad = {
extra-depends = [ extra-depends = [
@ -40,7 +40,7 @@ import XMonad.Hooks.UrgencyHook (SpawnUrgencyHook(..), withUrgencyHook)
import XMonad.Layout.FixedColumn (FixedColumn(..)) import XMonad.Layout.FixedColumn (FixedColumn(..))
import XMonad.Layout.Minimize (minimize, minimizeWindow, MinimizeMsg(RestoreNextMinimizedWin)) import XMonad.Layout.Minimize (minimize, minimizeWindow, MinimizeMsg(RestoreNextMinimizedWin))
import XMonad.Layout.NoBorders (smartBorders) import XMonad.Layout.NoBorders (smartBorders)
import XMonad.Prompt (autoComplete, searchPredicate, XPConfig) import XMonad.Prompt (autoComplete, font, searchPredicate, XPConfig)
import XMonad.Prompt.Window (windowPromptGoto, windowPromptBringCopy) import XMonad.Prompt.Window (windowPromptGoto, windowPromptBringCopy)
import XMonad.Util.EZConfig (additionalKeysP) import XMonad.Util.EZConfig (additionalKeysP)
import XMonad.Layout.SimpleFloat (simpleFloat) import XMonad.Layout.SimpleFloat (simpleFloat)
@ -51,7 +51,7 @@ urxvtcPath :: FilePath
urxvtcPath = "${pkgs.rxvt_unicode}/bin/urxvtc" urxvtcPath = "${pkgs.rxvt_unicode}/bin/urxvtc"
myFont :: String myFont :: String
myFont = "-schumacher-*-*-*-*-*-*-*-*-*-*-*-iso10646-*" myFont = "${config.lass.myFont}"
main :: IO () main :: IO ()
main = getArgs >>= \case main = getArgs >>= \case
@ -107,8 +107,8 @@ myKeyMap =
, ("M4-C-k", spawn "${pkgs.xorg.xkill}/bin/xkill") , ("M4-C-k", spawn "${pkgs.xorg.xkill}/bin/xkill")
, ("M4-a", focusUrgent) , ("M4-a", focusUrgent)
, ("M4-S-r", renameWorkspace def) , ("M4-S-r", renameWorkspace myXPConfig)
, ("M4-S-a", addWorkspacePrompt def) , ("M4-S-a", addWorkspacePrompt myXPConfig)
, ("M4-S-<Backspace>", removeEmptyWorkspace) , ("M4-S-<Backspace>", removeEmptyWorkspace)
, ("M4-S-c", kill1) , ("M4-S-c", kill1)
, ("M4-<Esc>", toggleWS) , ("M4-<Esc>", toggleWS)
@ -141,8 +141,13 @@ forkFile :: FilePath -> [String] -> Maybe [(String, String)] -> X ()
forkFile path args env = forkFile path args env =
xfork (executeFile path False args env) >> return () xfork (executeFile path False args env) >> return ()
myXPConfig :: XPConfig
myXPConfig = def
{ font = myFont
}
autoXPConfig :: XPConfig autoXPConfig :: XPConfig
autoXPConfig = def autoXPConfig = myXPConfig
{ autoComplete = Just 5000 { autoComplete = Just 5000
} }