diff options
-rw-r--r-- | machines/dnyarri.nix | 14 | ||||
-rw-r--r-- | machines/mmrnmhrm.nix | 12 | ||||
-rw-r--r-- | modules/i3/default.nix | 8 | ||||
-rw-r--r-- | overrides/default.nix | 4 | ||||
-rw-r--r-- | pkgs/default.nix | 4 |
5 files changed, 21 insertions, 21 deletions
diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix index ad385001..f620307a 100644 --- a/machines/dnyarri.nix +++ b/machines/dnyarri.nix @@ -44,12 +44,12 @@ with import ../lib; "radeon/RV730_smc.bin" ]; - linuxAszlig = pkgs.buildLinux { - inherit (pkgs.kernelSourceAszlig) version src; + linuxVuizvui = pkgs.buildLinux { + inherit (pkgs.kernelSourceVuizvui) version src; - kernelPatches = singleton pkgs.aszligKernelPatches.bfqsched; + kernelPatches = singleton pkgs.vuizvuiKernelPatches.bfqsched; configfile = pkgs.substituteAll { - name = "aszlig-with-firmware.kconf"; + name = "vuizvui-with-firmware.kconf"; src = generateKConf (import ./dnyarri-kconf.nix); extra_firmware = concatStringsSep " " (radeonFW ++ [ @@ -74,7 +74,7 @@ with import ../lib; }; in rec { kernelPackages = let - kpkgs = pkgs.linuxPackagesFor linuxAszlig kernelPackages; + kpkgs = pkgs.linuxPackagesFor linuxVuizvui kernelPackages; virtualbox = kpkgs.virtualbox.override { enableExtensionPack = true; }; @@ -133,8 +133,8 @@ with import ../lib; services.xserver.videoDrivers = [ "ati" ]; services.xserver.xrandrHeads = [ "HDMI-0" "DVI-0" ]; - aszlig.i3.reverseHeads = true; - aszlig.i3.workspaces."6" = { + vuizvui.i3.reverseHeads = true; + vuizvui.i3.workspaces."6" = { label = "Chromium"; assign = singleton { class = "^Chromium(?:-browser)?\$"; }; }; diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix index e52cfd4d..29b72699 100644 --- a/machines/mmrnmhrm.nix +++ b/machines/mmrnmhrm.nix @@ -9,16 +9,16 @@ with import ../lib; nix.maxJobs = 2; boot = let - linuxAszlig = pkgs.buildLinux { - inherit (pkgs.kernelSourceAszlig) version src; + linuxVuizvui = pkgs.buildLinux { + inherit (pkgs.kernelSourceVuizvui) version src; - kernelPatches = singleton pkgs.aszligKernelPatches.bfqsched; + kernelPatches = singleton pkgs.vuizvuiKernelPatches.bfqsched; configfile = generateKConf (import ./mmrnmhrm-kconf.nix); allowImportFromDerivation = true; }; in rec { kernelPackages = pkgs.recurseIntoAttrs - (pkgs.linuxPackagesFor linuxAszlig kernelPackages); + (pkgs.linuxPackagesFor linuxVuizvui kernelPackages); loader.grub.devices = map (i: "/dev/disk/by-id/${i}") [ "ata-WDC_WD10EZEX-00BN5A0_WD-WCC3F5756955" @@ -53,12 +53,12 @@ with import ../lib; services.xserver.videoDrivers = [ "nouveau" ]; services.xserver.xrandrHeads = [ "DVI-I-1" "VGA-1" ]; - aszlig.i3.workspaces."1" = { + vuizvui.i3.workspaces."1" = { label = "XMPP"; assign = singleton { class = "^(?:Tkabber|Gajim)\$"; }; }; - aszlig.i3.workspaces."3" = { + vuizvui.i3.workspaces."3" = { label = "Chromium"; assign = singleton { class = "^Chromium(?:-browser)?\$"; }; }; diff --git a/modules/i3/default.nix b/modules/i3/default.nix index 25121fa3..1d88a6e7 100644 --- a/modules/i3/default.nix +++ b/modules/i3/default.nix @@ -14,7 +14,7 @@ let headCount = length config.services.xserver.xrandrHeads; wsPerHead = wsCount / headCount; excessWs = wsCount - (headCount * wsPerHead); - headModifier = if config.aszlig.i3.reverseHeads then reverseList else id; + headModifier = if config.vuizvui.i3.reverseHeads then reverseList else id; getHeadAt = elemAt (headModifier config.services.xserver.xrandrHeads); mkDefaultWorkspace = number: numberSymbol: { @@ -29,12 +29,12 @@ let }; }; - wsCfgList = mapAttrsToList (_: getAttr "config") config.aszlig.i3.workspaces; + wsCfgList = mapAttrsToList (_: getAttr "config") config.vuizvui.i3.workspaces; wsConfig = concatStrings wsCfgList; defaultWorkspaces = listToAttrs (imap mkDefaultWorkspace wsNumberSymbols); in { - options.aszlig.i3 = { + options.vuizvui.i3 = { workspaces = mkOption { type = types.attrsOf (types.submodule ./workspace.nix); default = listToAttrs (imap mkDefaultWorkspace wsNumberSymbols); @@ -60,7 +60,7 @@ in }; }; - config.aszlig.i3.workspaces = defaultWorkspaces; + config.vuizvui.i3.workspaces = defaultWorkspaces; config.services.xserver.windowManager = { default = "i3"; diff --git a/overrides/default.nix b/overrides/default.nix index 38064bf8..458b5e27 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -3,7 +3,7 @@ pkgs: with pkgs.lib; let - allPackages = (import ../pkgs { pkgs = everything; }).aszlig // misc; + allPackages = (import ../pkgs { pkgs = everything; }).vuizvui // misc; everything = pkgs // allPackages // drvOverrides // argOverrides; mapOverride = overrideFun: includePackages: let @@ -83,7 +83,7 @@ let # misc misc = { - kernelSourceAszlig = { + kernelSourceVuizvui = { version = "3.16.0-rc7"; src = everything.fetchgit { url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git; diff --git a/pkgs/default.nix b/pkgs/default.nix index 8c0ebd2e..83ab814e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -16,8 +16,8 @@ let tkabber_urgent_plugin = callPackage ./tkabber-urgent-plugin { }; twitchstream = callPackage ./twitchstream { }; - aszligKernelPatches = { + vuizvuiKernelPatches = { bfqsched = callPackage ./kpatches/bfqsched.nix { }; }; }; -in { aszlig = self; } +in { vuizvui = self; } |